diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 0f735eb52557e4de1a1ea10fd6eb3647600d122d..c706c2004f33ff504e7e72a8b03d54abc19442c1 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
 #This file is generated by ADITO designer. Do NOT delete or modify!
-#Fri May 17 13:18:10 CEST 2019
+#Tue May 14 15:19:29 CEST 2019
 version=5.1.14
diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb786527e4b9ae046d8e63dce9123e8ad696779f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/extendKeywordOrganisationType.xml
@@ -0,0 +1,40 @@
+<?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.goderbauer" id="26ab4f8b-edbf-49c3-a7a3-1e48ca369119">
+    <update tableName="AB_KEYWORD_ENTRY">
+        <column name="SORTING" valueNumeric="6"/>
+        <where>AB_KEYWORD_ENTRY.CONTAINER = ? and SORTING = ?</where>
+        <whereParams>
+            <param value="OrganisationType" />
+            <param valueNumeric="3" />
+        </whereParams>
+    </update>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7ac75d3d-243c-49d2-9f50-25403fab003a"/>
+      <column name="KEYID" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+      <column name="TITLE" value="Manufacturer"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="1"/><!-- e.g. used in Product -->
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="2b9c1bdf-b0bb-447d-a57d-e369cf475fca"/>
+      <column name="KEYID" value="eccaf9de-5c7b-4b6e-ab77-0b33d8486f29"/>
+      <column name="TITLE" value="Competitor"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="1"/><!-- e.g. used in SalesprojectMember -->
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="45438bcf-74cf-408f-bc4d-5d70595369c8"/>
+      <column name="KEYID" value="e9f133a7-27b4-4ce1-ab93-03876ec3de61"/>
+      <column name="TITLE" value="Partner"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a758e72cef065e43d8e2957e10d8cb1c0751fa31
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/removeAttributeKeywordTargetGroup.xml
@@ -0,0 +1,29 @@
+<?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.goderbauer" id="26f320dcd1-9e9d-4a35-a399-ce98c7aa2e11">
+    <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRY.CONTAINER = ?</where>
+        <whereParams>
+            <param value="TargetGroup" />
+        </whereParams>
+    </delete>
+    <delete tableName="AB_ATTRIBUTE">
+        <where>AB_ATTRIBUTE.AB_ATTRIBUTEID = ?</where>
+        <whereParams>
+            <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53" />
+        </whereParams>
+    </delete>
+    <delete tableName="AB_ATTRIBUTERELATION">
+        <where>AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = ?</where>
+        <whereParams>
+            <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53" />
+        </whereParams>
+    </delete>
+    <delete tableName="AB_ATTRIBUTEUSAGE">
+        <where>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = ?</where>
+        <whereParams>
+            <param value="5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53" />
+        </whereParams>
+    </delete>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignParticipantLog.xml b/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignParticipantLog.xml
index 212177427d1d4d21f63b6496354f07fd816b0b21..feb64016d7fa3df9cf99212167dde3c277fadf7e 100644
--- a/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignParticipantLog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignParticipantLog.xml
@@ -1,27 +1,27 @@
-<?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="d.lechner" id="campaign_004">
-        <createTable tableName="CAMPAIGNPARTICIPANTLOG">
-            <column name="CAMPAIGNPARTICIPANTLOGID" type="CHAR(36)">
-                <constraints primaryKey="true" primaryKeyName="PK_CAMPAIGNPARTICIPANTLOG_CAMPAIGNPARTICIPANTLOGID"/>
-            </column>
-            <column name="CAMPAIGNPARTICIPANT_ID" type="CHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="CAMPAIGN_ID" type="CHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="CAMPAIGNSTEP_ID" type="CHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="USER_NEW" type="NVARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="DATE_NEW" type="DATE">
-                <constraints nullable="false"/>
-            </column>
-            <column name="USER_EDIT" type="NVARCHAR(50)" />
-            <column name="DATE_EDIT" type="DATE" />
-        </createTable>
-    </changeSet>
+<?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="d.lechner" id="campaign_004">
+        <createTable tableName="CAMPAIGNPARTICIPANTLOG">
+            <column name="CAMPAIGNPARTICIPANTLOGID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CAMPAIGNPARTICIPANTLOG_CAMPAIGNPARTICIPANTLOGID"/>
+            </column>
+            <column name="CAMPAIGNPARTICIPANT_ID" type="CHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="CAMPAIGN_ID" type="CHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="CAMPAIGNSTEP_ID" type="CHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_NEW" type="NVARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_NEW" type="DATETIME">
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_EDIT" type="NVARCHAR(50)" />
+            <column name="DATE_EDIT" type="DATETIME" />
+        </createTable>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml b/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40c738cbad5282b932f5cbe281615e7790055164
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
@@ -0,0 +1,41 @@
+<?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.hoermann" id="85efe5d3-8032-4277-9177-3daa11951bb0">
+        <createTable tableName="CLASSIFICATION">
+            <column name="CLASSIFICATIONID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATION_CLASSIFICATIONID"/>
+            </column>   
+            <column name="CLASSIFICATIONSCORE_ID" type="CHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="CLASSIFICATIONTYPE_ID" type="CHAR(36)"> 
+                <constraints nullable="false"/>
+            </column>
+            <column name="OBJECT_TYPE" type="VARCHAR(50)"> 
+                <constraints nullable="false"/>
+            </column>
+            <column name="OBJECT_ROWID" type="CHAR(36)"> 
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+        
+        <createTable tableName="CLASSIFICATIONSCORE">
+            <column name="CLASSIFICATIONSCOREID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONSCORE_CLASSIFICATIONSCOREID"/>
+            </column>
+            <column name="SCORETYPE" type="VARCHAR(80)"/>
+            <column name="TITLE" type="NVARCHAR(50)"/>
+            <column name="SCORE" type="NUMERIC(10,2)"/>
+            <column name="SORT" type="INTEGER"/>
+        </createTable>
+        
+        <createTable tableName="CLASSIFICATIONTYPE">
+            <column name="CLASSIFICATIONTYPEID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONTYPE_CLASSIFICATIONTYPEID"/>
+            </column>
+            <column name="CLASSIFICATIONTYPE" type="CHAR(36)"/>
+            <column name="SCORETYPE" type="VARCHAR(80)"/>
+            <column name="CLASSIFICATIONNUMBER" type="INTEGER"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/delete_salesprocejctClassification.xml b/.liquibase/Data_alias/basic/2019.2/Classification/delete_salesprocejctClassification.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7172aed01313dfc654025867864ffcc59fe101bb
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/delete_salesprocejctClassification.xml
@@ -0,0 +1,6 @@
+<?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.hoermann" id="85efe5d3-8032-4277-9177-3daa11951bb0">
+        <dropTable tableName="SALESPROJECT_CLASSIFICATION"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c3fa2cdbcd1404e081c526b55da6e299b01a8d7e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
@@ -0,0 +1,417 @@
+<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.hoermann" id="286d5a05-7618-414b-9e96-81b1c407b473">
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="01840c9d-2856-4882-a12a-303e58fd9d30"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="TITLE" value="Purchasing"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="50"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="0803779b-73d8-47b3-9705-f5771c01e6a3"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Automotive"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="140"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="10419ecc-335b-43c3-a1e3-8ecfbeda6f2b"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="TITLE" value="Project management"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="60"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="11418754-1667-437b-816b-adec4b9291f3"/>
+      <column name="SCORETYPE" value="ScoreProjectStart"/>
+      <column name="TITLE" value="No project planned"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="1bc2b2aa-2582-4b0c-a2f8-04125b82ba33"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="TITLE" value="Service"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Consultation"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="70"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2a516661-537d-473e-864a-c2f721b96a42"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Service"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="180"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2f3b6088-d78f-4fba-998d-b18a6b981485"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Environment"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="170"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="SCORETYPE" value="ScoreBudget"/>
+      <column name="TITLE" value="0 to 49T"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="50"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="SCORETYPE" value="ScoreBased"/>
+      <column name="TITLE" value="Germany"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="3035e36e-ee6a-45d1-9d68-920cd3666362"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="Student/Internship"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="70"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Food"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="80"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
+      <column name="SCORETYPE" value="ScoreUsers"/>
+      <column name="TITLE" value="0 to 49"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="50"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="SCORETYPE" value="ScoreUsers"/>
+      <column name="TITLE" value="251 to 1,000"/>
+      <column name="SCORE" valueNumeric="30.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="SCORETYPE" value="ScoreCustomizing"/>
+      <column name="TITLE" value="Yes"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="SCORETYPE" value="ScoreStandard"/>
+      <column name="TITLE" value="Standard"/>
+      <column name="SCORE" valueNumeric="12.50"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Public"/>
+      <column name="SCORE" valueNumeric="50.00"/>
+      <column name="SORT" valueNumeric="190"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="41300a6c-8dc7-4b5a-9fb1-cecd3d5cbb8c"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Electric"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="160"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="41d43723-7d19-4a7e-936a-df9013db7dfb"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Logistics"/>
+      <column name="SCORE" valueNumeric="50.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="TITLE" value="Sales"/>
+      <column name="SCORE" valueNumeric="7.50"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="56a56ec0-34c1-419f-81c2-1c1310d685d2"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Education"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="120"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="5ca391a5-9de8-41e6-9792-17cf8deaa7e7"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Energy"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="90"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
+      <column name="SCORETYPE" value="ScoreStandard"/>
+      <column name="TITLE" value="Individual"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
+      <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+      <column name="TITLE" value="Choice"/>
+      <column name="SCORE" valueNumeric="30.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="Management/Sales Manager"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="6d6653ae-024e-444c-aeae-561874d55569"/>
+      <column name="SCORETYPE" value="ScoreBudget"/>
+      <column name="TITLE" value="50 to 99T"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="77a0088c-a665-4feb-9f60-99c1eb710015"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Lifesience"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="50"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
+      <column name="SCORETYPE" value="ScoreBased"/>
+      <column name="TITLE" value="Other"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="7e569319-5885-452e-9331-a507f3365236"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="TITLE" value="Overarching"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
+      <column name="SCORETYPE" value="ScoreUsers"/>
+      <column name="TITLE" value="101 to 250"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="9a3183db-8a38-4cf1-a234-3e2cf20a4f77"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="IT"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="SCORETYPE" value="ScoreCloud"/>
+      <column name="TITLE" value="OnPremise"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="a0fcd2e2-40c8-40b8-8a5b-e591154c248a"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Lottery"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="110"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
+      <column name="SCORETYPE" value="ScoreBased"/>
+      <column name="TITLE" value="Switzerland"/>
+      <column name="SCORE" valueNumeric="7.50"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="a61e3451-296b-4812-a7b2-425963176f80"/>
+      <column name="SCORETYPE" value="ScoreCloud"/>
+      <column name="TITLE" value="Cloud"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="a7e70abc-4d98-467d-a475-66bbd101de1d"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="Head of IT"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
+      <column name="SCORETYPE" value="ScoreUsers"/>
+      <column name="TITLE" value="from 1,000"/>
+      <column name="SCORE" valueNumeric="30.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+      <column name="SCORETYPE" value="ScoreProjectStart"/>
+      <column name="TITLE" value="Within 6 months"/>
+      <column name="SCORE" valueNumeric="30.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="SCORETYPE" value="ScoreBudget"/>
+      <column name="TITLE" value="200 to 349T"/>
+      <column name="SCORE" valueNumeric="30.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="bf44ae05-a4c4-4ee9-ad6e-7d64474afeff"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Finance"/>
+      <column name="SCORE" valueNumeric="16.60"/>
+      <column name="SORT" valueNumeric="60"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="Service Manager"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="SCORETYPE" value="ScoreProjectStart"/>
+      <column name="TITLE" value="No date yet"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="c6300eeb-0494-4eba-89b1-23afdbb397e9"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Publishing house"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="150"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="CRM Manager"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="d032f425-5739-4f0c-8103-e102fe0d3ccf"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="Skilled workers"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="50"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+      <column name="TITLE" value="Rate"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="d7d807a2-8a97-4a0e-9d1c-fb8c7a703599"/>
+      <column name="SCORETYPE" value="ScoreUsers"/>
+      <column name="TITLE" value="50 to 100"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="SORT" valueNumeric="40"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="e6ab210e-6a26-4a12-9d50-ff8bd392c590"/>
+      <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+      <column name="TITLE" value="Search"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
+      <column name="SCORETYPE" value="ScoreCustomizing"/>
+      <column name="TITLE" value="No"/>
+      <column name="SCORE" valueNumeric="12.50"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="e824d7e3-dfbe-4f34-a5c7-8f2226aade7e"/>
+      <column name="SCORETYPE" value="ScoreBudget"/>
+      <column name="TITLE" value="100 to 199T"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="e8741cb0-9ada-48dd-89d1-f00a1a755c38"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="TITLE" value="Counsellor"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="60"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Building and construction suppliers"/>
+      <column name="SCORE" valueNumeric="50.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="ecf421ef-66b2-4f9f-98c6-ee8a73e753da"/>
+      <column name="SCORETYPE" value="ScoreBased"/>
+      <column name="TITLE" value="Austria"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
+      <column name="SCORETYPE" value="ScoreBudget"/>
+      <column name="TITLE" value="from 350T"/>
+      <column name="SCORE" valueNumeric="50.00"/>
+      <column name="SORT" valueNumeric="10"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="efec90bd-c99f-49d9-bd52-df0ae6f938a3"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Machinery and equipment"/>
+      <column name="SCORE" valueNumeric="50.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="TITLE" value="Marketing"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="SORT" valueNumeric="30"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="f678b3e0-72c4-4b48-90c0-054bf3612dc2"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Trade"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="130"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="fae1ef0a-5d07-4725-907f-4b2ac5814328"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="TITLE" value="Industry"/>
+      <column name="SCORE" valueNumeric="33.30"/>
+      <column name="SORT" valueNumeric="100"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONSCORE">
+      <column name="CLASSIFICATIONSCOREID" value="fb8cb769-d95b-468a-ac64-7ee0cefd46a7"/>
+      <column name="SCORETYPE" value="ScoreProjectStart"/>
+      <column name="TITLE" value="Within 12 months"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="SORT" valueNumeric="20"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_types.xml b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_types.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9b41f5b635a4aaf4e9f9d2b5c99f4b0d3d9dab7e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_types.xml
@@ -0,0 +1,81 @@
+<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.hoermann" id="f904e9fd-d5e1-4f9b-b334-5621132449ce">
+      
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="789667fe-519f-4dea-b691-62c14447d694"/>
+        <column name="KEYID" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+        <column name="TITLE" value="Salesproject"/>
+        <column name="CONTAINER" value="ClassificationType"/>
+        <column name="SORTING" valueNumeric="1"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="1"/>
+    </insert>
+      
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="1"/>
+      <column name="SCORETYPE" value="ScoreBased"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="1"/>
+      <column name="SCORETYPE" value="ScoreBranch"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="1"/>
+      <column name="SCORETYPE" value="ScoreUsers"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="2"/>
+      <column name="SCORETYPE" value="ScoreBudget"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="2"/>
+      <column name="SCORETYPE" value="ScoreCustomizing"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="2"/>
+      <column name="SCORETYPE" value="ScoreStandard"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+      <column name="SCORETYPE" value="ScoreCloud"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+      <column name="SCORETYPE" value="ScoreDepartment"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+      <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+      <column name="SCORETYPE" value="ScorePosition"/>
+    </insert>
+    <insert tableName="CLASSIFICATIONTYPE">
+      <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONNUMBER" valueNumeric="3"/>
+      <column name="SCORETYPE" value="ScoreProjectStart"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 0ce02e48bdc0b5dde241cb9854c889352e980efb..afd617ba0b4f3e9ed51ab4185c9b0d4dc90bb8bb 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -1,166 +1,174 @@
-<?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">
-    <include relativeToChangelogFile="true" file="data/ORGANISATION_private.xml"/>
-    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_kaeltetechnik.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_pichelmaier.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_pfiffig.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_sommer.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_muller.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_leicht.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_kanzler.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_gruener.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_obermeier.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_smith.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_lustig.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1000.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1001.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1000.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
-
-    <include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
-
-    <include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
-
-    <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"/>
-
-    <!--References to the Keyword Values-->
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/OfferProbability.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/ActivityCategory.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/CommunicationMedium.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/AddressType.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectStrength.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectPhase.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectState.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectWeakness.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/TaskPriority.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml"/>
-    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml"/>
-
-    <!--References to the reference files-->
-    <include relativeToChangelogFile="true" file="AditoBasic/init_OfferProbability.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_ActivityCategory.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_CommunicationMedium.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_AddressType.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectState.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectPhase.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_TaskPriority.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_TaskProgress.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectCompetitionState.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeType.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_PaymentTerm.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_DeliveryTerm.xml"/>
-    <include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
-    <include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
-    <include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
-    <include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
-
-    <include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
-
-    <include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
-
-    <include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
-
-    <include relativeToChangelogFile="true" file="drop_pricePolitics-weakness-strength.xml"/>
-
-    <include relativeToChangelogFile="true" file="update_pricelist_keyword.xml"/>
-
-    <include relativeToChangelogFile="true" file="create_taskLink.xml"/>
-
-    <include relativeToChangelogFile="true" file="Offer_terms.xml"/>
-
-    <include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
-    <include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
-
-    <include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
-
-    <include relativeToChangelogFile="true" file="AditoBasic/update_Strength_Weakness.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/>
-
-    <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/>
-    <include relativeToChangelogFile="true" file="AditoBasic/insert_salesproject_state_keyword.xml"/>
-
-
-    <include relativeToChangelogFile="true" file="organisation_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="person_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="address_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="contact_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="activity_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="activitylink_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="product_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
-    <include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
-
-    <include relativeToChangelogFile="true" file="indicesRefactor/ContactManagement.xml"/>
-    <include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
-    <include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
-    <include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
-
-    <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
-    <include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
-	
-    <include relativeToChangelogFile="true" file="alter_activityLink.xml" />
-    
-    <include relativeToChangelogFile="true" file="renameCycle_to_Milestone.xml" />
-    <include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic.xml" />
-    <include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
-
-    <include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
-    
-    <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>  
-    <include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
-    
-    <include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
-
-    <include relativeToChangelogFile="true" file="create_documenttemplate.xml" />
-    <include relativeToChangelogFile="true" file="create_documenttemplatelink.xml" />
-    <include relativeToChangelogFile="true" file="data/init_DocumentTemplateType.xml" />
-    <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
-    <include relativeToChangelogFile="true" file="miscellaneous/Contact_additionalColumns.xml" />
-
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaign.xml"/>
-    <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStep.xml"/>
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipant.xml"/>
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipantLog.xml"/>
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignState.xml"/>
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStepState.xml"/>
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCost.xml"/>
-    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCostCategory.xml"/>
-    
-    <include relativeToChangelogFile="true" file="AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml"/>
-</databaseChangeLog>
+<?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">
+    <include relativeToChangelogFile="true" file="data/ORGANISATION_private.xml"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_kaeltetechnik.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_pichelmaier.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_pfiffig.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_sommer.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_muller.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_leicht.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_kanzler.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_gruener.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_obermeier.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_smith.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_lustig.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1000.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1001.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1000.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
+
+    <include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
+
+    <include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
+
+    <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"/>
+
+    <!--References to the Keyword Values-->
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/OfferProbability.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/ActivityCategory.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/CommunicationMedium.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/AddressType.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectStrength.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectPhase.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectState.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectWeakness.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/TaskPriority.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml"/>
+
+    <!--References to the reference files-->
+    <include relativeToChangelogFile="true" file="AditoBasic/init_OfferProbability.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_ActivityCategory.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_CommunicationMedium.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_AddressType.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectState.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectPhase.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_TaskPriority.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_TaskProgress.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectCompetitionState.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeType.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_PaymentTerm.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_DeliveryTerm.xml"/>
+    <include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
+    <include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
+    <include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
+
+    <include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
+
+    <include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
+
+    <include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
+
+    <include relativeToChangelogFile="true" file="drop_pricePolitics-weakness-strength.xml"/>
+
+    <include relativeToChangelogFile="true" file="update_pricelist_keyword.xml"/>
+
+    <include relativeToChangelogFile="true" file="create_taskLink.xml"/>
+
+    <include relativeToChangelogFile="true" file="Offer_terms.xml"/>
+
+    <include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
+    <include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
+
+    <include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
+
+    <include relativeToChangelogFile="true" file="AditoBasic/update_Strength_Weakness.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/>
+
+    <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/insert_salesproject_state_keyword.xml"/>
+
+
+    <include relativeToChangelogFile="true" file="organisation_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="person_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="address_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="contact_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="activity_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="activitylink_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="product_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
+    <include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
+
+    <include relativeToChangelogFile="true" file="indicesRefactor/ContactManagement.xml"/>
+    <include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
+    <include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
+    <include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
+
+    <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
+    <include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
+	
+    <include relativeToChangelogFile="true" file="alter_activityLink.xml" />
+    
+    <include relativeToChangelogFile="true" file="renameCycle_to_Milestone.xml" />
+    <include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic.xml" />
+    <include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
+
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
+    
+    <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
+    
+    <include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
+
+    <include relativeToChangelogFile="true" file="create_documenttemplate.xml" />
+    <include relativeToChangelogFile="true" file="create_documenttemplatelink.xml" />
+    <include relativeToChangelogFile="true" file="data/init_DocumentTemplateType.xml" />
+    <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
+    <include relativeToChangelogFile="true" file="miscellaneous/Contact_additionalColumns.xml" />
+
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaign.xml"/>
+    <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStep.xml"/>
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipant.xml"/>
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipantLog.xml"/>
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignState.xml"/>
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStepState.xml"/>
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCost.xml"/>
+    <include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCostCategory.xml"/>
+    
+    <include relativeToChangelogFile="true" file="AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml"/>
+
+    <include relativeToChangelogFile="true" file="Classification/create_classification_tables.xml"/>
+    <include relativeToChangelogFile="true" file="Classification/insert_classification_scores.xml"/>
+    <include relativeToChangelogFile="true" file="Classification/insert_classification_types.xml"/>
+    <include relativeToChangelogFile="true" file="Classification/delete_salesprocejctClassification.xml"/>
+
+    <include relativeToChangelogFile="true" file="AditoBasic/extendKeywordOrganisationType.xml"/>
+    <include relativeToChangelogFile="true" file="AditoBasic/removeAttributeKeywordTargetGroup.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index 446e360ba0bf937b7413aefcfbb25802d1dcdb2c..ed487a5a71bc2f197a7f18edcbd66389faf0b7a9 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -1,1211 +1,1211 @@
-<?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="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="48e9320b-b2b4-4523-bb34-e68749fe1465"/>
-    <column name="AB_ATTRIBUTE_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="1d34b5e6-44ca-4577-925e-5b93e96be40a"/>
-    <column name="AB_ATTRIBUTE_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b70e6047-c8d9-4be0-99a9-e8a6b4a07c9b"/>
-    <column name="AB_ATTRIBUTE_ID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="6fb3f5c0-177e-41ad-88c1-44d096ead1de"/>
-    <column name="AB_ATTRIBUTE_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="022f3b98-f716-47ca-aaa1-7db53f86b821"/>
-    <column name="AB_ATTRIBUTE_ID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="aeb00c8d-dbee-4657-b5da-4e7aaa494120"/>
-    <column name="AB_ATTRIBUTE_ID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="3ea3348e-bffa-47d9-ac58-cfb9fb7c21e7"/>
-    <column name="AB_ATTRIBUTE_ID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="570f695f-5fd1-4f5a-b21d-62ab721db1ef"/>
-    <column name="AB_ATTRIBUTE_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="c6bb63b2-afdb-4dde-a22a-0022926425d8"/>
-    <column name="AB_ATTRIBUTE_ID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="924782ab-fc54-432e-aa19-d04a986fb3da"/>
-    <column name="AB_ATTRIBUTE_ID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="247a2d0b-dd07-4799-89fc-e85d3ef10947"/>
-    <column name="AB_ATTRIBUTE_ID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="d890f5d6-0330-457a-8650-9261f494fe9c"/>
-    <column name="AB_ATTRIBUTE_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="440250fb-033a-4db2-84ec-1f05e90b5d1d"/>
-    <column name="AB_ATTRIBUTE_ID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b405df7f-07e3-43c6-b067-c29a083489db"/>
-    <column name="AB_ATTRIBUTE_ID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="85d90ab9-8b2c-4759-b730-14bdc21bdf0c"/>
-    <column name="AB_ATTRIBUTE_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="d1c81512-9e0c-45ae-bf58-7fc025ecbe12"/>
-    <column name="AB_ATTRIBUTE_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b327f51d-1d52-4db0-96e1-3b1a02af603d"/>
-    <column name="AB_ATTRIBUTE_ID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="745b9d55-4402-4b0d-95c1-60cc86d753c0"/>
-    <column name="AB_ATTRIBUTE_ID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="fb175158-9a11-49df-9d2d-c5149826db0f"/>
-    <column name="AB_ATTRIBUTE_ID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="a4c52b1c-2a9d-480f-9ed2-266ef94102f2"/>
-    <column name="AB_ATTRIBUTE_ID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b358d1b5-e3be-4b81-8f68-8b8bfe6084c2"/>
-    <column name="AB_ATTRIBUTE_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="7aece23a-c0d2-432c-86da-f6b766752062"/>
-    <column name="AB_ATTRIBUTE_ID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="0a32ee8c-3fc7-4412-ab4a-e17668396954"/>
-    <column name="AB_ATTRIBUTE_ID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="79133e7e-fd63-4d71-90a2-96a487e5ab42"/>
-    <column name="AB_ATTRIBUTE_ID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="fdd04439-6302-41ec-bbf1-5b63e2142cbc"/>
-    <column name="AB_ATTRIBUTE_ID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="5f8563c1-5467-4655-a42f-72dcf43d184b"/>
-    <column name="AB_ATTRIBUTE_ID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="24f74162-380a-4f9e-bf71-1e8a51275118"/>
-    <column name="AB_ATTRIBUTE_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="ddee95f8-21f9-4b6b-850f-79e9f12d3c4c"/>
-    <column name="AB_ATTRIBUTE_ID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="4704a3a1-7762-4863-8dca-6e3ce8b4ba9f"/>
-    <column name="AB_ATTRIBUTE_ID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="c37d0b13-468b-4018-802e-a290ccd239b7"/>
-    <column name="AB_ATTRIBUTE_ID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b1df815f-535f-46c6-9df5-0c43bbcc8c47"/>
-    <column name="AB_ATTRIBUTE_ID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="f049d2f7-bacf-4b57-b40a-779111a0b944"/>
-    <column name="AB_ATTRIBUTE_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="33b8e55d-227c-4a5c-8e92-89e429dc1157"/>
-    <column name="AB_ATTRIBUTE_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="2057fae3-bea6-4a90-8dcc-b795f677c7ac"/>
-    <column name="AB_ATTRIBUTE_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="c43230d6-984b-4b47-8c39-3fceb126641b"/>
-    <column name="AB_ATTRIBUTE_ID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b3f6e18e-8bdc-4679-aaa5-895c08430532"/>
-    <column name="AB_ATTRIBUTE_ID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b78f182a-bade-428a-9b12-fd40f52414a9"/>
-    <column name="AB_ATTRIBUTE_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="27a518a0-0456-4494-8d9e-a62afb70fd68"/>
-    <column name="AB_ATTRIBUTE_ID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="3c0a29b2-e98f-4aae-902d-e5ae691537f5"/>
-    <column name="AB_ATTRIBUTE_ID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="7593fe50-00be-42fc-9e75-8eae49fb2b25"/>
-    <column name="AB_ATTRIBUTE_ID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="202789a8-4d69-43b2-ab38-708938081d68"/>
-    <column name="AB_ATTRIBUTE_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="642ee10a-b516-4fa3-95fc-f402992a0158"/>
-    <column name="AB_ATTRIBUTE_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="6c6651b6-a8a5-4f89-82a1-3f1c22a8d9b6"/>
-    <column name="AB_ATTRIBUTE_ID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="b55dd353-cb6b-48a1-8cad-c3e90f63a8b0"/>
-    <column name="AB_ATTRIBUTE_ID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="d546bc42-e452-4446-a85e-557f6c0bc88b"/>
-    <column name="AB_ATTRIBUTE_ID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="504487e9-86f8-4ff1-91a2-b364829fa86b"/>
-    <column name="AB_ATTRIBUTE_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="33d64ce6-e8b4-4acf-ac75-0d99d0092c6c"/>
-    <column name="AB_ATTRIBUTE_ID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="07704049-9ae8-4d07-86e3-1042ed104035"/>
-    <column name="AB_ATTRIBUTE_ID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="4757e926-3059-4969-b07a-f04479f6d723"/>
-    <column name="AB_ATTRIBUTE_ID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="22a31ed9-be4d-45db-ad2a-5777e9a785bf"/>
-    <column name="AB_ATTRIBUTE_ID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="d8352147-7866-40c2-8f1a-063ccc4b0c04"/>
-    <column name="AB_ATTRIBUTE_ID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="55879930-2f90-44ec-a9b6-fdfe2226a7b0"/>
-    <column name="AB_ATTRIBUTE_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="cc03ab69-248a-4ee0-9219-120fcc8c69da"/>
-    <column name="AB_ATTRIBUTE_ID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="925a2fe7-2d7d-425b-b55d-71c3d6cfe554"/>
-    <column name="AB_ATTRIBUTE_ID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="55eed1d2-086c-4e25-a59e-ec3d1e8c3283"/>
-    <column name="AB_ATTRIBUTE_ID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="c0f1778b-595f-4e76-831e-0df4b323f711"/>
-    <column name="AB_ATTRIBUTE_ID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="a22a9765-637e-4ca4-818a-e3acb8306776"/>
-    <column name="AB_ATTRIBUTE_ID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="7e5726f4-16f4-4b18-ae95-a6ad24e49d40"/>
-    <column name="AB_ATTRIBUTE_ID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="1310d547-f5d2-4e30-8e30-0deeba7de746"/>
-    <column name="AB_ATTRIBUTE_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="6462a324-535a-4978-86f2-e439f581571a"/>
-    <column name="AB_ATTRIBUTE_ID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="8c380566-bab2-4397-a7f7-a88f2c728388"/>
-    <column name="AB_ATTRIBUTE_ID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="f6d3a5f3-04bd-4cf1-8057-11a1af4352a4"/>
-    <column name="AB_ATTRIBUTE_ID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="607b45dc-2a97-4005-9d38-488640665aa1"/>
-    <column name="AB_ATTRIBUTE_ID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="63801bc2-a0a2-4a3c-a531-1949ff3041a6"/>
-    <column name="AB_ATTRIBUTE_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="5bdf8396-30bb-4fbc-bdbe-304fa7d73fb2"/>
-    <column name="AB_ATTRIBUTE_ID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="f71f995d-0022-4144-95a9-88e33468b835"/>
-    <column name="AB_ATTRIBUTE_ID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="d6982ee5-616a-4eb9-adf9-e571658851ea"/>
-    <column name="AB_ATTRIBUTE_ID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-    <column name="AB_ATTRIBUTEUSAGEID" value="717abaf4-3ed3-4754-ba01-3192677ac399"/>
-    <column name="AB_ATTRIBUTE_ID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
-    <column name="MAX_COUNT" valueNumeric="1"/>
-    <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
-	<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
-	<column name="AB_ATTRIBUTE_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
-	<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
-	<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
-	<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
-	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="OBJECT_TYPE" value="Salesproject"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
-	<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="MIN_COUNT" valueNumeric="1"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
-	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
-	<column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="MIN_COUNT" valueNumeric="1"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
-	<column name="AB_ATTRIBUTE_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="f06dd320-4757-4261-aace-cb827a313d28"/>
-	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
-	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="OBJECT_TYPE" value="Contract"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
-	<column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
-	<column name="AB_ATTRIBUTE_ID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
-	<column name="AB_ATTRIBUTE_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
-	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
-	<column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
-	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="OBJECT_TYPE" value="Salesproject"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
-	<column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="MIN_COUNT" valueNumeric="1"/>
-	<column name="OBJECT_TYPE" value="Salesproject"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
-	<column name="AB_ATTRIBUTE_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
-	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="MIN_COUNT" valueNumeric="1"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
-	<column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
-	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
-	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
-	<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="MIN_COUNT" valueNumeric="2"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
-	<column name="AB_ATTRIBUTE_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
-	<column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
-	<column name="MIN_COUNT" valueNumeric="1"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
-	<column name="AB_ATTRIBUTE_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
-	<column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="755239d0-7fe3-46bc-8ec4-923977148455"/>
-	<column name="AB_ATTRIBUTE_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
-	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
-	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="MIN_COUNT" valueNumeric="1"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
-	<column name="AB_ATTRIBUTE_ID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
-	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
-	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
-	<column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
-	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
-	<column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
-	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
-	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
-	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
-	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
-	<column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
-	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
-	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="5fcdb4a4-5b63-4379-a839-319701612438"/>
-	<column name="AB_ATTRIBUTE_ID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
-	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
-	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
-	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
-	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
-	<column name="AB_ATTRIBUTE_ID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
-	<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
-	<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
-	<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
-	<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
-	<column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="1f269307-9900-44e7-b575-0412f0ac2908"/>
-	<column name="AB_ATTRIBUTE_ID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
-	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
-	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
-	<column name="AB_ATTRIBUTE_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
-	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
-	<column name="AB_ATTRIBUTE_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
-	<column name="AB_ATTRIBUTE_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
-	<column name="AB_ATTRIBUTE_ID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="931958f6-efaf-4da2-89b1-92f844787094"/>
-	<column name="AB_ATTRIBUTE_ID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
-	<column name="AB_ATTRIBUTE_ID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
-	<column name="AB_ATTRIBUTE_ID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
-	<column name="AB_ATTRIBUTE_ID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
-	<column name="AB_ATTRIBUTE_ID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="404278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
-	<column name="AB_ATTRIBUTE_ID" value="3f119858-9d69-4903-a572-d286be151f73"/>
-	<column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="7889748c-8a13-49d9-b996-b828146bdac8"/>
-	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="cae53196-4987-4f53-a45c-babca1997a48"/>
-	<column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="59d93c4b-e338-497c-9da2-47b4c45444c9"/>
-	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="0498ae18-bae6-44e4-8944-1e756e9d4a8e"/>
-	<column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
-	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="90618350-89e6-4e13-8f28-d22de81fea45"/>
-	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
-	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
-	<column name="AB_ATTRIBUTEUSAGEID" value="b6b323a2-9c8c-49c0-89c1-08ca1bb06c29"/>
-	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
-	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<rollback>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="f06dd320-4757-4261-aace-cb827a313d28"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="0766ff88-304d-41a7-8224-642a0aee5587"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="05576033-1bee-4547-ab82-fdfcdd039642"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="755239d0-7fe3-46bc-8ec4-923977148455"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="5fcdb4a4-5b63-4379-a839-319701612438"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="1f269307-9900-44e7-b575-0412f0ac2908"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="931958f6-efaf-4da2-89b1-92f844787094"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="04278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
-	</whereParams>
-</delete>
-</rollback>
-    </changeSet>
-</databaseChangeLog>
+<?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="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="48e9320b-b2b4-4523-bb34-e68749fe1465"/>
+    <column name="AB_ATTRIBUTE_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="1d34b5e6-44ca-4577-925e-5b93e96be40a"/>
+    <column name="AB_ATTRIBUTE_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b70e6047-c8d9-4be0-99a9-e8a6b4a07c9b"/>
+    <column name="AB_ATTRIBUTE_ID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="6fb3f5c0-177e-41ad-88c1-44d096ead1de"/>
+    <column name="AB_ATTRIBUTE_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="022f3b98-f716-47ca-aaa1-7db53f86b821"/>
+    <column name="AB_ATTRIBUTE_ID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="aeb00c8d-dbee-4657-b5da-4e7aaa494120"/>
+    <column name="AB_ATTRIBUTE_ID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="3ea3348e-bffa-47d9-ac58-cfb9fb7c21e7"/>
+    <column name="AB_ATTRIBUTE_ID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="570f695f-5fd1-4f5a-b21d-62ab721db1ef"/>
+    <column name="AB_ATTRIBUTE_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="c6bb63b2-afdb-4dde-a22a-0022926425d8"/>
+    <column name="AB_ATTRIBUTE_ID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="924782ab-fc54-432e-aa19-d04a986fb3da"/>
+    <column name="AB_ATTRIBUTE_ID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="247a2d0b-dd07-4799-89fc-e85d3ef10947"/>
+    <column name="AB_ATTRIBUTE_ID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="d890f5d6-0330-457a-8650-9261f494fe9c"/>
+    <column name="AB_ATTRIBUTE_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="440250fb-033a-4db2-84ec-1f05e90b5d1d"/>
+    <column name="AB_ATTRIBUTE_ID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b405df7f-07e3-43c6-b067-c29a083489db"/>
+    <column name="AB_ATTRIBUTE_ID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="85d90ab9-8b2c-4759-b730-14bdc21bdf0c"/>
+    <column name="AB_ATTRIBUTE_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="d1c81512-9e0c-45ae-bf58-7fc025ecbe12"/>
+    <column name="AB_ATTRIBUTE_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b327f51d-1d52-4db0-96e1-3b1a02af603d"/>
+    <column name="AB_ATTRIBUTE_ID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="745b9d55-4402-4b0d-95c1-60cc86d753c0"/>
+    <column name="AB_ATTRIBUTE_ID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="fb175158-9a11-49df-9d2d-c5149826db0f"/>
+    <column name="AB_ATTRIBUTE_ID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="a4c52b1c-2a9d-480f-9ed2-266ef94102f2"/>
+    <column name="AB_ATTRIBUTE_ID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b358d1b5-e3be-4b81-8f68-8b8bfe6084c2"/>
+    <column name="AB_ATTRIBUTE_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="7aece23a-c0d2-432c-86da-f6b766752062"/>
+    <column name="AB_ATTRIBUTE_ID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="0a32ee8c-3fc7-4412-ab4a-e17668396954"/>
+    <column name="AB_ATTRIBUTE_ID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="79133e7e-fd63-4d71-90a2-96a487e5ab42"/>
+    <column name="AB_ATTRIBUTE_ID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="fdd04439-6302-41ec-bbf1-5b63e2142cbc"/>
+    <column name="AB_ATTRIBUTE_ID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="5f8563c1-5467-4655-a42f-72dcf43d184b"/>
+    <column name="AB_ATTRIBUTE_ID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="24f74162-380a-4f9e-bf71-1e8a51275118"/>
+    <column name="AB_ATTRIBUTE_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="ddee95f8-21f9-4b6b-850f-79e9f12d3c4c"/>
+    <column name="AB_ATTRIBUTE_ID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="4704a3a1-7762-4863-8dca-6e3ce8b4ba9f"/>
+    <column name="AB_ATTRIBUTE_ID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="c37d0b13-468b-4018-802e-a290ccd239b7"/>
+    <column name="AB_ATTRIBUTE_ID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b1df815f-535f-46c6-9df5-0c43bbcc8c47"/>
+    <column name="AB_ATTRIBUTE_ID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="f049d2f7-bacf-4b57-b40a-779111a0b944"/>
+    <column name="AB_ATTRIBUTE_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="33b8e55d-227c-4a5c-8e92-89e429dc1157"/>
+    <column name="AB_ATTRIBUTE_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="2057fae3-bea6-4a90-8dcc-b795f677c7ac"/>
+    <column name="AB_ATTRIBUTE_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="c43230d6-984b-4b47-8c39-3fceb126641b"/>
+    <column name="AB_ATTRIBUTE_ID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b3f6e18e-8bdc-4679-aaa5-895c08430532"/>
+    <column name="AB_ATTRIBUTE_ID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b78f182a-bade-428a-9b12-fd40f52414a9"/>
+    <column name="AB_ATTRIBUTE_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="27a518a0-0456-4494-8d9e-a62afb70fd68"/>
+    <column name="AB_ATTRIBUTE_ID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="3c0a29b2-e98f-4aae-902d-e5ae691537f5"/>
+    <column name="AB_ATTRIBUTE_ID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="7593fe50-00be-42fc-9e75-8eae49fb2b25"/>
+    <column name="AB_ATTRIBUTE_ID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="202789a8-4d69-43b2-ab38-708938081d68"/>
+    <column name="AB_ATTRIBUTE_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="642ee10a-b516-4fa3-95fc-f402992a0158"/>
+    <column name="AB_ATTRIBUTE_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="6c6651b6-a8a5-4f89-82a1-3f1c22a8d9b6"/>
+    <column name="AB_ATTRIBUTE_ID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="b55dd353-cb6b-48a1-8cad-c3e90f63a8b0"/>
+    <column name="AB_ATTRIBUTE_ID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="d546bc42-e452-4446-a85e-557f6c0bc88b"/>
+    <column name="AB_ATTRIBUTE_ID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="504487e9-86f8-4ff1-91a2-b364829fa86b"/>
+    <column name="AB_ATTRIBUTE_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="33d64ce6-e8b4-4acf-ac75-0d99d0092c6c"/>
+    <column name="AB_ATTRIBUTE_ID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="07704049-9ae8-4d07-86e3-1042ed104035"/>
+    <column name="AB_ATTRIBUTE_ID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="4757e926-3059-4969-b07a-f04479f6d723"/>
+    <column name="AB_ATTRIBUTE_ID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="22a31ed9-be4d-45db-ad2a-5777e9a785bf"/>
+    <column name="AB_ATTRIBUTE_ID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="d8352147-7866-40c2-8f1a-063ccc4b0c04"/>
+    <column name="AB_ATTRIBUTE_ID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="55879930-2f90-44ec-a9b6-fdfe2226a7b0"/>
+    <column name="AB_ATTRIBUTE_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="cc03ab69-248a-4ee0-9219-120fcc8c69da"/>
+    <column name="AB_ATTRIBUTE_ID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="925a2fe7-2d7d-425b-b55d-71c3d6cfe554"/>
+    <column name="AB_ATTRIBUTE_ID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="55eed1d2-086c-4e25-a59e-ec3d1e8c3283"/>
+    <column name="AB_ATTRIBUTE_ID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="c0f1778b-595f-4e76-831e-0df4b323f711"/>
+    <column name="AB_ATTRIBUTE_ID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="a22a9765-637e-4ca4-818a-e3acb8306776"/>
+    <column name="AB_ATTRIBUTE_ID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="7e5726f4-16f4-4b18-ae95-a6ad24e49d40"/>
+    <column name="AB_ATTRIBUTE_ID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="1310d547-f5d2-4e30-8e30-0deeba7de746"/>
+    <column name="AB_ATTRIBUTE_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="6462a324-535a-4978-86f2-e439f581571a"/>
+    <column name="AB_ATTRIBUTE_ID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="8c380566-bab2-4397-a7f7-a88f2c728388"/>
+    <column name="AB_ATTRIBUTE_ID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="f6d3a5f3-04bd-4cf1-8057-11a1af4352a4"/>
+    <column name="AB_ATTRIBUTE_ID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="607b45dc-2a97-4005-9d38-488640665aa1"/>
+    <column name="AB_ATTRIBUTE_ID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="63801bc2-a0a2-4a3c-a531-1949ff3041a6"/>
+    <column name="AB_ATTRIBUTE_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="5bdf8396-30bb-4fbc-bdbe-304fa7d73fb2"/>
+    <column name="AB_ATTRIBUTE_ID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="f71f995d-0022-4144-95a9-88e33468b835"/>
+    <column name="AB_ATTRIBUTE_ID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="d6982ee5-616a-4eb9-adf9-e571658851ea"/>
+    <column name="AB_ATTRIBUTE_ID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+    <column name="AB_ATTRIBUTEUSAGEID" value="717abaf4-3ed3-4754-ba01-3192677ac399"/>
+    <column name="AB_ATTRIBUTE_ID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
+    <column name="MAX_COUNT" valueNumeric="1"/>
+    <column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
+	<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
+	<column name="AB_ATTRIBUTE_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
+	<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
+	<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
+	<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
+	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Salesproject"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
+	<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="MIN_COUNT" valueNumeric="0"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
+	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
+	<column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="MIN_COUNT" valueNumeric="0"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
+	<column name="AB_ATTRIBUTE_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="f06dd320-4757-4261-aace-cb827a313d28"/>
+	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
+	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Contract"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
+	<column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
+	<column name="AB_ATTRIBUTE_ID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
+	<column name="AB_ATTRIBUTE_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
+	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
+	<column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
+	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="OBJECT_TYPE" value="Salesproject"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
+	<column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Salesproject"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
+	<column name="AB_ATTRIBUTE_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
+	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
+	<column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
+	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
+	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
+	<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
+	<column name="AB_ATTRIBUTE_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
+	<column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
+	<column name="MIN_COUNT" valueNumeric="0"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
+	<column name="AB_ATTRIBUTE_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
+	<column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="755239d0-7fe3-46bc-8ec4-923977148455"/>
+	<column name="AB_ATTRIBUTE_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
+	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
+	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
+	<column name="AB_ATTRIBUTE_ID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
+	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Product"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
+	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
+	<column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
+	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
+	<column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
+	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
+	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
+	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
+	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
+	<column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
+	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
+	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="5fcdb4a4-5b63-4379-a839-319701612438"/>
+	<column name="AB_ATTRIBUTE_ID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
+	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
+	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
+	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
+	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
+	<column name="AB_ATTRIBUTE_ID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
+	<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
+	<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
+	<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
+	<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+	<column name="OBJECT_TYPE" value="Person"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="1f269307-9900-44e7-b575-0412f0ac2908"/>
+	<column name="AB_ATTRIBUTE_ID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
+	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
+	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
+	<column name="AB_ATTRIBUTE_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
+	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
+	<column name="AB_ATTRIBUTE_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
+	<column name="AB_ATTRIBUTE_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
+	<column name="AB_ATTRIBUTE_ID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="931958f6-efaf-4da2-89b1-92f844787094"/>
+	<column name="AB_ATTRIBUTE_ID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
+	<column name="AB_ATTRIBUTE_ID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
+	<column name="AB_ATTRIBUTE_ID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
+	<column name="AB_ATTRIBUTE_ID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
+	<column name="AB_ATTRIBUTE_ID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="404278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
+	<column name="AB_ATTRIBUTE_ID" value="3f119858-9d69-4903-a572-d286be151f73"/>
+	<column name="OBJECT_TYPE" value="Employee"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="7889748c-8a13-49d9-b996-b828146bdac8"/>
+	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="cae53196-4987-4f53-a45c-babca1997a48"/>
+	<column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="59d93c4b-e338-497c-9da2-47b4c45444c9"/>
+	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="0498ae18-bae6-44e4-8944-1e756e9d4a8e"/>
+	<column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="90618350-89e6-4e13-8f28-d22de81fea45"/>
+	<column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+	<column name="AB_ATTRIBUTEUSAGEID" value="b6b323a2-9c8c-49c0-89c1-08ca1bb06c29"/>
+	<column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	<column name="OBJECT_TYPE" value="DocumentTemplate"/>
+</insert>
+<rollback>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="f06dd320-4757-4261-aace-cb827a313d28"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="0766ff88-304d-41a7-8224-642a0aee5587"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="05576033-1bee-4547-ab82-fdfcdd039642"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="755239d0-7fe3-46bc-8ec4-923977148455"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="5fcdb4a4-5b63-4379-a839-319701612438"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="1f269307-9900-44e7-b575-0412f0ac2908"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="931958f6-efaf-4da2-89b1-92f844787094"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="04278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
+	</whereParams>
+</delete>
+</rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
index 263bf76d5d876fa69aaabaef1f06f01b5e4e1c01..ff598ae4e91c965763db722428b044ad9cfef8ad 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sysDbVersion 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/sysDbVersion/1.2.0">
   <name>_____SYSTEM_SYSDB_VERSION</name>
-  <systemDbVersion>2.6.0</systemDbVersion>
+  <systemDbVersion>2.7.0</systemDbVersion>
 </sysDbVersion>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
index 38d99e05952657760911852cb369a4853b78e69e..ae1ca17581144adecfa0ba8a2043589a187d6063 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
@@ -7,7 +7,7 @@
         <column name="DATE_NEW" valueDate="2018-05-24T14:53:57.763"/>
         <column name="KIND" valueNumeric="600"/>
         <column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
-        <column name="TITLE" value="2.6.0"/>
+        <column name="TITLE" value="2.7.0"/>
         <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
         <column name="USER_NEW" value="_____DESIGNERANONYM"/>
         <column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 16125dbb1e92aece3bb37ac760d7d463213a5866..7f8d378183aea50feb63acbf4e90f2e036c3e059 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4315,123 +4315,6 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
-          <entityDb>
-            <name>SALESPROJECT_CLASSIFICATION</name>
-            <dbName></dbName>
-            <idColumn>SALESPROJECT_CLASSIFICATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="1" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>SALESPROJECT_CLASSIFICATIONID</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>Salesproject classification Id</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CLASS</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>Class</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>VALUE</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>Value</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Salesproject Id</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>TYPE</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>Type</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
           <entityDb>
             <name>TIMETRACKING</name>
             <dbName></dbName>
@@ -9286,9 +9169,9 @@
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9314,9 +9197,9 @@
                 <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9528,6 +9411,262 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
+          <entityDb>
+            <name>CLASSIFICATIONTYPE</name>
+            <dbName></dbName>
+            <idColumn>CLASSIFICATIONTYPEID</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>SCORETYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="80" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONTYPEID</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>CLASSIFICATIONNUMBER</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>CLASSIFICATIONTYPE</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>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CLASSIFICATION</name>
+            <dbName></dbName>
+            <idColumn>CLASSIFICATIONID</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>CLASSIFICATIONTYPE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_ROWID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONSCORE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONID</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>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CLASSIFICATIONSCORE</name>
+            <dbName></dbName>
+            <idColumn>CLASSIFICATIONSCOREID</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>SCORETYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="80" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SCORE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2" />
+                <size v="10" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLASSIFICATIONSCOREID</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>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>TITLE</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 c7885b16e578bdd48701e7afa944bb89b8ce06e1..7420d80e88ee0aa739f925f0d14e63495dc6a08f 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -43,6 +43,7 @@
         <node name="KeywordEntry" kind="10077" />
         <node name="KeywordAttribute" kind="10077" />
         <node name="ObjectRelationType" kind="10077" />
+        <node name="ClassificationAdmin" kind="10077" />
         <node name="PermissionMetaData" kind="10077" />
         <node name="Role" kind="10077" />
         <node name="INTERNAL_ADMINISTRATOR" kind="159" />
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 1bfb382e765e8697b0746d6c10f435c84db4497b..822a1c1fc6d0782a90454284b3f975f058a70ce4 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,166 +1,166 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>360Degree_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>360 Degree</title>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-      <linkedContextProcess>%aditoprj%/entity/360Degree_entity/entityfields/title/linkedContextProcess.js</linkedContextProcess>
-      <searchable v="false" />
-    </entityField>
-    <entityParameter>
-      <name>ObjectType_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectRowId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>OrganisationObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>TARGET_CONTEXT</targetContextField>
-      <targetIdField>TARGET_ID</targetIdField>
-      <dependencies>
-        <entityDependency>
-          <name>15488007-165c-4630-828a-447cf2c27899</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>360DegreeObjects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>TARGET_CONTEXT</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>TARGET_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>CONTEXT_NAME</name>
-      <title>Module</title>
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/context_name/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-    </entityField>
-    <entityProvider>
-      <name>PersonObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>TARGET_CONTEXT</targetContextField>
-      <targetIdField>TARGET_ID</targetIdField>
-      <dependencies>
-        <entityDependency>
-          <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>360DegreeObjects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>YEAR</name>
-      <title>Year</title>
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/year/valueProcess.js</valueProcess>
-    </entityField>
-    <entityActionGroup>
-      <name>newModule</name>
-      <title>New module</title>
-      <iconId>VAADIN:PLUS_CIRCLE</iconId>
-      <children>
-        <entityActionField>
-          <name>newOffer</name>
-          <fieldType>ACTION</fieldType>
-          <title>Offer</title>
-          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js</onActionProcess>
-          <iconId>VAADIN:CART</iconId>
-          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js</stateProcess>
-        </entityActionField>
-        <entityActionField>
-          <name>newSalesproject</name>
-          <fieldType>ACTION</fieldType>
-          <title>Salesproject</title>
-          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js</onActionProcess>
-          <iconId>VAADIN:BOOK_DOLLAR</iconId>
-          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js</stateProcess>
-        </entityActionField>
-        <entityActionField>
-          <name>newContract</name>
-          <fieldType>ACTION</fieldType>
-          <title>Contract</title>
-          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
-          <iconId>VAADIN:FILE_TEXT</iconId>
-          <iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
-          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js</stateProcess>
-        </entityActionField>
-        <entityActionField>
-          <name>newCampaignParticipant</name>
-          <fieldType>ACTION</fieldType>
-          <title>Add to Campaign</title>
-          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js</onActionProcess>
-          <iconId>NEON:GROUP_APPOINTMENT</iconId>
-          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js</stateProcess>
-          <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityField>
-      <name>ICON</name>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ACTIVE</name>
-      <title>Active</title>
-      <contentType>TEXT</contentType>
-      <dropDownProcess>%aditoprj%/entity/360Degree_entity/entityfields/active/dropDownProcess.js</dropDownProcess>
-      <searchable v="true" />
-      <groupable v="true" />
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TARGET_ID.value</element>
-        <element>TARGET_CONTEXT.value</element>
-        <element>TITLE.value</element>
-        <element>DATE.value</element>
-        <element>ACTIVE.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>360Degree_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>360 Degree</title>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <linkedContextProcess>%aditoprj%/entity/360Degree_entity/entityfields/title/linkedContextProcess.js</linkedContextProcess>
+      <searchable v="false" />
+    </entityField>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>OrganisationObjects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TARGET_CONTEXT</targetContextField>
+      <targetIdField>TARGET_ID</targetIdField>
+      <dependencies>
+        <entityDependency>
+          <name>15488007-165c-4630-828a-447cf2c27899</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>360DegreeObjects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>TARGET_CONTEXT</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>TARGET_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CONTEXT_NAME</name>
+      <title>Module</title>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/context_name/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+    </entityField>
+    <entityProvider>
+      <name>PersonObjects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TARGET_CONTEXT</targetContextField>
+      <targetIdField>TARGET_ID</targetIdField>
+      <dependencies>
+        <entityDependency>
+          <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>360DegreeObjects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>YEAR</name>
+      <title>Year</title>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/year/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionGroup>
+      <name>newModule</name>
+      <title>New module</title>
+      <iconId>VAADIN:PLUS_CIRCLE</iconId>
+      <children>
+        <entityActionField>
+          <name>newOffer</name>
+          <fieldType>ACTION</fieldType>
+          <title>Offer</title>
+          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:CART</iconId>
+          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js</stateProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>newSalesproject</name>
+          <fieldType>ACTION</fieldType>
+          <title>Salesproject</title>
+          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:BOOK_DOLLAR</iconId>
+          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js</stateProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>newContract</name>
+          <fieldType>ACTION</fieldType>
+          <title>Contract</title>
+          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:FILE_TEXT</iconId>
+          <iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
+          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js</stateProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>newCampaignParticipant</name>
+          <fieldType>ACTION</fieldType>
+          <title>Add to Campaign</title>
+          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js</onActionProcess>
+          <iconId>NEON:GROUP_APPOINTMENT</iconId>
+          <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js</stateProcess>
+          <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ACTIVE</name>
+      <title>Active</title>
+      <contentType>TEXT</contentType>
+      <dropDownProcess>%aditoprj%/entity/360Degree_entity/entityfields/active/dropDownProcess.js</dropDownProcess>
+      <searchable v="true" />
+      <groupable v="true" />
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TARGET_ID.value</element>
+        <element>TARGET_CONTEXT.value</element>
+        <element>TITLE.value</element>
+        <element>DATE.value</element>
+        <element>ACTIVE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js
index 83a23444c64cd55ac459e838a7b5f8a3cadac3f7..353aa9f3676bc0c8d4a823b2944a5794acbb4677 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js
@@ -1,15 +1,23 @@
-import("system.vars");
-import("system.neon");
-import("system.result");
-
-var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
-var found = false;
-contextList.forEach(function (context) 
-{
-    if(context == "Campaign")
-        found = true;        
-});
-if(found)
-    result.string(neon.COMPONENTSTATE_AUTO);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+if (contextList)
+{
+    var found = false;
+
+    contextList.forEach(function (context) 
+    {
+        if(context == "Campaign")
+            found = true;        
+    });
+    if(found)
+        result.string(neon.COMPONENTSTATE_AUTO);
+    else
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
index fc6fedaff886e1b4b13e066605063f5c595b795b..f1cfb310581815a99377b7da0152c0483f24d9d5 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
@@ -3,13 +3,20 @@ import("system.vars");
 import("system.neon");
     
 var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
-var found = false;
-contextList.forEach(function (context) 
+if (contextList)
 {
-    if(context == "Contract")
-        found = true;        
-});
-if(found)
-    result.string(neon.COMPONENTSTATE_AUTO);
+    var found = false;
+    contextList.forEach(function (context) 
+    {
+        if(context == "Contract")
+            found = true;        
+    });
+    if(found)
+        result.string(neon.COMPONENTSTATE_AUTO);
+    else
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
 else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
index 43eff24495608393dc02b1e5d9bfd2c0cae8e116..02a2b07b699e399fed77114a8841d76b2d0d35b1 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newoffer/stateProcess.js
@@ -3,13 +3,20 @@ import("system.neon");
 import("system.result");
 
 var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
-var found = false;
-contextList.forEach(function (context) 
+if (contextList)
 {
-    if(context == "Offer")
-        found = true;        
-});
-if(found)
-    result.string(neon.COMPONENTSTATE_AUTO);
+    var found = false;
+    contextList.forEach(function (context) 
+    {
+        if(context == "Offer")
+            found = true;        
+    });
+    if(found)
+        result.string(neon.COMPONENTSTATE_AUTO);
+    else
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
 else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
index faec2ba794559373ea139bc95e18d782c01164d0..f23023f7d177f0f5d7eec62b42371db2b0289173 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/stateProcess.js
@@ -3,13 +3,21 @@ import("system.neon");
 import("system.result");
 
 var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
-var found = false;
-contextList.forEach(function (context) 
+if (contextList)
 {
-    if(context == "Salesproject")
-        found = true;        
-});
-if(found)
-    result.string(neon.COMPONENTSTATE_AUTO);
+    var found = false;
+    
+    contextList.forEach(function (context) 
+    {
+        if(context == "Salesproject")
+            found = true;        
+    });
+    if(found)
+        result.string(neon.COMPONENTSTATE_AUTO);
+    else
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
 else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 5f91637c836c317480dc04958cdc4563b0da8611..545b0cad0f767f9840e56bcda691232e22976cf0 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
 import("system.util");
 import("system.db");
 import("system.vars");
@@ -19,7 +20,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
             filter.childs.forEach(function(child)
             {
                 if(child.name === "ACTIVE")
-                    active = JSON.parse(child.key);
+                    active = child.key;
             });  
         }  
     }
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 14a5939ff76c8063b9d390cc50b7cfda70758fac..3b33eefbbd0ea5c5c9060e829f79f8d2db2ada13 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,159 +1,159 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>ActivityLink_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Connection</title>
-  <titlePlural>Connections</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>ACTIVITYLINKID</name>
-      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OBJECT_TYPE</name>
-      <title>{$OBJECTLINK_TYPE}</title>
-      <consumer>Context</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>OBJECT_ROWID</name>
-      <title>{$OBJECTLINK_OBJECT}</title>
-      <consumer>Objects</consumer>
-      <linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>ACTIVITY_ID</name>
-      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>Links</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>OBJECT_TYPE</targetContextField>
-      <targetIdField>OBJECT_ROWID</targetIdField>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>148c98ea-a24b-453a-afe9-975555486b2c</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>Links</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ActivityId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Objects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Object_entity</entityName>
-        <fieldName>AllObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Context</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>ActivityLinkable</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>ActivityId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
-          <tableName>ACTIVITYLINK</tableName>
-          <primaryKey>ACTIVITYLINKID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ACTIVITY_ID.value</name>
-          <recordfield>ACTIVITYLINK.ACTIVITY_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ACTIVITYLINKID.value</name>
-          <recordfield>ACTIVITYLINK.ACTIVITYLINKID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ROWID.value</name>
-          <recordfield>ACTIVITYLINK.OBJECT_ROWID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_TYPE.value</name>
-          <recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ROWID.displayValue</name>
-          <expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>ACTIVITYLINK.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ActivityLink_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Connection</title>
+  <titlePlural>Connections</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>ACTIVITYLINKID</name>
+      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <title>{$OBJECTLINK_TYPE}</title>
+      <consumer>Context</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <title>{$OBJECTLINK_OBJECT}</title>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ACTIVITY_ID</name>
+      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Links</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>OBJECT_TYPE</targetContextField>
+      <targetIdField>OBJECT_ROWID</targetIdField>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>148c98ea-a24b-453a-afe9-975555486b2c</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>Links</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ActivityId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Objects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Context</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>ActivityLinkable</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>ActivityId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
+          <tableName>ACTIVITYLINK</tableName>
+          <primaryKey>ACTIVITYLINKID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ACTIVITY_ID.value</name>
+          <recordfield>ACTIVITYLINK.ACTIVITY_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ACTIVITYLINKID.value</name>
+          <recordfield>ACTIVITYLINK.ACTIVITYLINKID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+          <recordfield>ACTIVITYLINK.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.displayValue</name>
+          <expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>ACTIVITYLINK.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 0ce5e3fe3fc1e26d4b86578adefddb295831debd..46af89c06179dc6ee05b1ce09c35fd435a223786 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,532 +1,533 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Activity_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
-  <title>Activity</title>
-  <afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
-  <iconId>NEON:ACTIVITY</iconId>
-  <image>VAADIN:SHOP</image>
-  <imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
-  <titlePlural>Activities</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>DIRECTION</name>
-      <title>Direction</title>
-      <consumer>KeywordDirections</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>ENTRYDATE</name>
-      <title>Entrydate</title>
-      <contentType>DATE</contentType>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ACTIVITYID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Description</title>
-      <contentType>HTML</contentType>
-      <mandatory v="false" />
-    </entityField>
-    <entityField>
-      <name>CATEGORY</name>
-      <title>Category</title>
-      <consumer>KeywordCategories</consumer>
-      <mandatory v="false" />
-      <groupable v="true" />
-      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>SUBJECT</name>
-      <title>Subject</title>
-      <mandatory v="true" />
-      <groupable v="false" />
-    </entityField>
-    <entityParameter>
-      <name>RowId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>SUBJECT_DETAILS</name>
-      <linkedContext>Activity</linkedContext>
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/subject_details/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DIRECTION_ICON</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction_icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>ICON</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>OnlyInnate_param</name>
-      <title>Nur Eigene anzeigen</title>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc</documentation>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
-    </entityParameter>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>MainDocuments</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ENTRYMONTH</name>
-      <title>Entrydate (Month)</title>
-      <contentType>TEXT</contentType>
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>Links</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ActivityLink_entity</entityName>
-        <fieldName>Links</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ActivityId_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordDirections</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>LinkedObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>49a91b21-f24e-45c6-9b2c-5bb15d808d43</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>207920cd-b4b8-4f40-b6c4-6e25d4df9947</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b086fbf7-aa94-441f-a33c-e2ca8eda5dcd</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>00b4f354-5b82-4071-b70c-acab4780a2de</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>9b416661-628d-4f8d-b8dc-9543cf5bbb1c</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>4869a849-8717-48ec-9dbd-73df96992042</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>Activities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>OnlyInnate_param</name>
-          <expose v="false" />
-          <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc</documentation>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ParentContext_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ParentId_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>RESPONSIBLE</name>
-      <title>Responsible</title>
-      <consumer>Employees</consumer>
-      <linkedContext>Person</linkedContext>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>ModuleTrees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ModuleTree_entity</entityName>
-        <fieldName>TreeProviders</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContextName_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ID_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <mandatory v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <actionOrder v="1" />
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityParameter>
-      <name>ParentId_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentid_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ParentContext_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>PARENT_ID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PARENT_CONTEXT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_context/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordCategories</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keywordcategories/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ENTRYDAY</name>
-      <title>Entrydate (Day)</title>
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newOffer</name>
-      <fieldType>ACTION</fieldType>
-      <title>New offer</title>
-      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
-      <actionOrder v="0" />
-      <iconId>VAADIN:CART</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Employees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>PresetLinks_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Activity_entity/entityfields/presetlinks_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBDelete>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>4d4e82f5-fd0d-48e0-805a-c713d73dfae0</name>
-          <tableName>ACTIVITY</tableName>
-          <primaryKey>ACTIVITYID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ACTIVITYID.value</name>
-          <recordfield>ACTIVITY.ACTIVITYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DIRECTION.value</name>
-          <recordfield>ACTIVITY.DIRECTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>ACTIVITY.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SUBJECT.value</name>
-          <recordfield>ACTIVITY.SUBJECT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ENTRYDATE.value</name>
-          <recordfield>ACTIVITY.ENTRYDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CATEGORY.value</name>
-          <recordfield>ACTIVITY.CATEGORY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DIRECTION.displayValue</name>
-          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PARENT_CONTEXT.value</name>
-          <recordfield>ACTIVITY.PARENT_CONTEXT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PARENT_ID.value</name>
-          <recordfield>ACTIVITY.PARENT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CATEGORY.displayValue</name>
-          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>ACTIVITY.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>ACTIVITY.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>ACTIVITY.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>ACTIVITY.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RESPONSIBLE.displayValue</name>
-          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RESPONSIBLE.value</name>
-          <recordfield>ACTIVITY.RESPONSIBLE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Activity_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
+  <title>Activity</title>
+  <afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
+  <iconId>VAADIN:HOURGLASS_END</iconId>
+  <image>VAADIN:SHOP</image>
+  <imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
+  <titlePlural>Activities</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>DIRECTION</name>
+      <title>Direction</title>
+      <consumer>KeywordDirections</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ENTRYDATE</name>
+      <title>Entrydate</title>
+      <contentType>DATE</contentType>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ACTIVITYID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Description</title>
+      <contentType>HTML</contentType>
+      <mandatory v="false" />
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+      <title>Category</title>
+      <consumer>KeywordCategories</consumer>
+      <mandatory v="false" />
+      <groupable v="true" />
+      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SUBJECT</name>
+      <title>Subject</title>
+      <mandatory v="true" />
+      <groupable v="false" />
+    </entityField>
+    <entityParameter>
+      <name>RowId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>SUBJECT_DETAILS</name>
+      <linkedContext>Activity</linkedContext>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/subject_details/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DIRECTION_ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction_icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>OnlyInnate_param</name>
+      <title>Nur Eigene anzeigen</title>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>MainDocuments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ENTRYMONTH</name>
+      <title>Entrydate (Month)</title>
+      <contentType>TEXT</contentType>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>Links</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ActivityLink_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ActivityId_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordDirections</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>LinkedObjects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>49a91b21-f24e-45c6-9b2c-5bb15d808d43</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>207920cd-b4b8-4f40-b6c4-6e25d4df9947</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b086fbf7-aa94-441f-a33c-e2ca8eda5dcd</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>00b4f354-5b82-4071-b70c-acab4780a2de</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>9b416661-628d-4f8d-b8dc-9543cf5bbb1c</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4869a849-8717-48ec-9dbd-73df96992042</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>OnlyInnate_param</name>
+          <expose v="false" />
+          <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc</documentation>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>RESPONSIBLE</name>
+      <title>Responsible</title>
+      <consumer>Employees</consumer>
+      <linkedContext>Person</linkedContext>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ModuleTrees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ModuleTree_entity</entityName>
+        <fieldName>TreeProviders</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContextName_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ID_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <mandatory v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <actionOrder v="1" />
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>ParentId_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentid_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ParentContext_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>PARENT_ID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordCategories</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/keywordcategories/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ENTRYDAY</name>
+      <title>Entrydate (Day)</title>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Activity_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOffer</name>
+      <fieldType>ACTION</fieldType>
+      <title>New offer</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+      <actionOrder v="0" />
+      <iconId>VAADIN:CART</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Employees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>PresetLinks_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/presetlinks_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBDelete>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>4d4e82f5-fd0d-48e0-805a-c713d73dfae0</name>
+          <tableName>ACTIVITY</tableName>
+          <primaryKey>ACTIVITYID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ACTIVITYID.value</name>
+          <recordfield>ACTIVITY.ACTIVITYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DIRECTION.value</name>
+          <recordfield>ACTIVITY.DIRECTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>ACTIVITY.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SUBJECT.value</name>
+          <recordfield>ACTIVITY.SUBJECT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ENTRYDATE.value</name>
+          <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CATEGORY.value</name>
+          <recordfield>ACTIVITY.CATEGORY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DIRECTION.displayValue</name>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+          <recordfield>ACTIVITY.PARENT_CONTEXT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+          <recordfield>ACTIVITY.PARENT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CATEGORY.displayValue</name>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>ACTIVITY.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>ACTIVITY.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>ACTIVITY.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>ACTIVITY.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RESPONSIBLE.displayValue</name>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RESPONSIBLE.value</name>
+          <recordfield>ACTIVITY.RESPONSIBLE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Activity_entity/entityfields/attributes/onValidation.js b/entity/Activity_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Activity_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index e544dc90a67090c9ed357e49d7274d4d0dd7df99..fbd7ee5519750bf1febcafc93eb0212f44158e10 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,77 +1,77 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>AddressType_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>KEYID</name>
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-    </entityField>
-    <entityField>
-      <name>AB_KEYWORD_ENTRYID</name>
-    </entityField>
-    <entityProvider>
-      <name>ByCategory</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <lookupIdfield>KEYID</lookupIdfield>
-      <dependencies>
-        <entityDependency>
-          <name>0956b1f3-8b67-4f82-b04a-70be88aff19f</name>
-          <entityName>Address_entity</entityName>
-          <fieldName>KeywordAddressTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>UsageFilter_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>UsageFilter_param</name>
-      <title></title>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/AddressType_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>a4614347-7edb-4101-9e79-40971acfd79e</name>
-          <tableName>AB_KEYWORD_ENTRY</tableName>
-          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ENTRYID.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>KEYID.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TITLE.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>AddressType_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>KEYID</name>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+    </entityField>
+    <entityField>
+      <name>AB_KEYWORD_ENTRYID</name>
+    </entityField>
+    <entityProvider>
+      <name>ByCategory</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>KEYID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>0956b1f3-8b67-4f82-b04a-70be88aff19f</name>
+          <entityName>Address_entity</entityName>
+          <fieldName>KeywordAddressTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>UsageFilter_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>UsageFilter_param</name>
+      <title></title>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/AddressType_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>a4614347-7edb-4101-9e79-40971acfd79e</name>
+          <tableName>AB_KEYWORD_ENTRY</tableName>
+          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ENTRYID.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>KEYID.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index df36ce023d1ab18360559bbfa8654028fa97e481..668513e6fbb3ba3510525522d5ab583c5f841261 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,116 +1,165 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>AddressValidation_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <title>Address</title>
-      <description>UID consists of all fields as JSON. </description>
-    </entityField>
-    <entityProvider>
-      <name>ZipValidaton</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
-          <entityName>Address_entity</entityName>
-          <fieldName>ZipValidation</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>Type_param</name>
-          <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>Type_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>Country_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>COUNTRY</name>
-      <title>Country</title>
-    </entityField>
-    <entityField>
-      <name>ZIP</name>
-      <title>Zip</title>
-    </entityField>
-    <entityField>
-      <name>CITY</name>
-      <title>City</title>
-    </entityField>
-    <entityField>
-      <name>DISTRICT</name>
-      <title>District</title>
-    </entityField>
-    <entityField>
-      <name>REGION</name>
-      <title>Region</title>
-    </entityField>
-    <entityField>
-      <name>STATE</name>
-      <title>State</title>
-    </entityField>
-    <entityField>
-      <name>VALUE</name>
-      <description>Final value returned</description>
-    </entityField>
-    <entityProvider>
-      <name>CityValidation</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
-          <entityName>Address_entity</entityName>
-          <fieldName>CityValidation</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>Type_param</name>
-          <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>CurrentValue_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>UID.displayValue</element>
-        <element>ZIP.value</element>
-        <element>CITY.value</element>
-        <element>COUNTRY.value</element>
-        <element>DISTRICT.value</element>
-        <element>REGION.value</element>
-        <element>STATE.value</element>
-        <element>VALUE.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>AddressValidation_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <title>Address</title>
+      <description>UID consists of all fields as JSON. </description>
+    </entityField>
+    <entityProvider>
+      <name>ZipValidaton</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
+          <entityName>Address_entity</entityName>
+          <fieldName>ZipValidation</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Type_param</name>
+          <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>Type_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>Country_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>COUNTRY</name>
+      <title>Country</title>
+    </entityField>
+    <entityField>
+      <name>ZIP</name>
+      <title>Zip</title>
+    </entityField>
+    <entityField>
+      <name>CITY</name>
+      <title>City</title>
+    </entityField>
+    <entityField>
+      <name>DISTRICT</name>
+      <title>District</title>
+    </entityField>
+    <entityField>
+      <name>REGION</name>
+      <title>Region</title>
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>${ADDRESS_STATE}</title>
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+      <description>Final value returned</description>
+    </entityField>
+    <entityProvider>
+      <name>CityValidation</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
+          <entityName>Address_entity</entityName>
+          <fieldName>CityValidation</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Type_param</name>
+          <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>CurrentValue_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>FullAddressValidation</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
+          <entityName>Address_entity</entityName>
+          <fieldName>FullAddressValidation</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Type_param</name>
+          <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>STREET</name>
+      <title>Street</title>
+    </entityField>
+    <entityField>
+      <name>FROM_BN</name>
+      <title>From buildingnumber</title>
+    </entityField>
+    <entityField>
+      <name>TO_BN</name>
+      <title>To buildingnumber</title>
+    </entityField>
+    <entityField>
+      <name>LON</name>
+    </entityField>
+    <entityField>
+      <name>LAT</name>
+    </entityField>
+    <entityField>
+      <name>CITYEXT</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <isRequireContainerFiltering v="true" />
+      <contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>UID.displayValue</element>
+        <element>ZIP.value</element>
+        <element>CITY.value</element>
+        <element>CITYEXT.value</element>
+        <element>COUNTRY.value</element>
+        <element>DISTRICT.value</element>
+        <element>REGION.value</element>
+        <element>STATE.value</element>
+        <element>STREET.value</element>
+        <element>FROM_BN.value</element>
+        <element>TO_BN.value</element>
+        <element>LON.value</element>
+        <element>LAT.value</element>
+        <element>VALUE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6cfed5664099791a5129bacf8e86b3949a9a2db
--- /dev/null
+++ b/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("WsValidation_lib");
+import("system.result");
+
+result.string(WsValidationType.get().TYPE_ADDRESS.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index b7912238023978182ef6205d5413e8e082a7b7e6..f842ab3000c8d9cc56e7f0545246cf5ba2707797 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -1,25 +1,26 @@
-import("system.result");
-import("WsValidation_lib");
-import("system.vars");
-
-var type = "";
-if (vars.exists("$param.Type_param") && vars.get("$param.Type_param"))
-    type = vars.get("$param.Type_param");
-
-var country = "";
-if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
-    country = vars.get("$param.Country_param");
-
-// get the value typed by the user
-var filter = "";
-var sysFilter = vars.get("$sys.filter");
-if(sysFilter.filter != null) {
-    filter = JSON.parse(sysFilter.filter).childs[0].value;
-}
-
-if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
-    filter = vars.get("$param.CurrentValue_param");
-
-var foundAddresses = WsValidationUtils.validate(filter, type, country);
-
+import("system.logging");
+import("system.result");
+import("WsValidation_lib");
+import("system.vars");
+
+var type = "";
+if (vars.exists("$param.Type_param") && vars.get("$param.Type_param"))
+    type = vars.get("$param.Type_param");
+
+var country = "";
+if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
+    country = vars.get("$param.Country_param");
+
+// get the value typed by the user
+var filter = "";
+var sysFilter = vars.get("$sys.filter");
+if(sysFilter.filter != null) {
+    filter = sysFilter.filter.childs[0].value;
+}
+
+if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
+    filter = vars.get("$param.CurrentValue_param");
+
+var foundAddresses = WsValidationUtils.validate(filter, type, country);
+logging.log("result " + foundAddresses.toSource())
 result.object(foundAddresses);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index af35886b27accdf9e6cc3ee69d93ae1b2df68095..760160b48633a0d5ba60e3d1ed1362c3df29645a 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,435 +1,469 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Address_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
-  <title>Address</title>
-  <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
-  <titlePlural>Addresses</titlePlural>
-  <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>
-      <title>{$ADDRESS_IDENTIFIER}</title>
-    </entityField>
-    <entityField>
-      <name>ADDR_TYPE</name>
-      <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
-      <title>Addresstype</title>
-      <consumer>KeywordAddressTypes</consumer>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/displayValueProcess.js</displayValueProcess>
-    </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>
-      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/city/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>COUNTRY</name>
-      <title>Country</title>
-      <consumer>Countries</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
-      <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>
-      <consumer></consumer>
-      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
-      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-      <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
-    </entityField>
-    <entityProvider>
-      <name>OrganisationAddresses</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <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>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <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>
-        <entityParameter>
-          <name>OrganisationId_param</name>
-          <expose v="false" />
-        </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>
-      <dependencies>
-        <entityDependency>
-          <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>PersAddresses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
-          <entityName>Contact_entity</entityName>
-          <fieldName>ContactAddresses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactType_param</name>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <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>
-        <entityParameter>
-          <name>OrganisationId_param</name>
-          <expose v="false" />
-        </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>ISO2Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityProvider>
-      <name>OrganisationAddressesByContact</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
-      <titlePlural>Company Addresses</titlePlural>
-      <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>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
-        </entityParameter>
-        <entityParameter>
-          <name>OrganisationId_param</name>
-          <expose v="false" />
-        </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>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js</valueProcess>
-      <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>
-    <entityProvider>
-      <name>OrganisationAndContactAddresses</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>ContactAndOrganisationAddresses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>PossibleAddresses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>DefaultAddressId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContactType_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrganisationId_param</name>
-          <title></title>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
-        </entityParameter>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>OrganisationId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordAddressTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AddressType_entity</entityName>
-        <fieldName>ByCategory</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>UsageFilter_param</name>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>IS_STANDARD_ICON</name>
-      <title>Standard</title>
-      <contentType>IMAGE</contentType>
-      <contentTypeProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js</contentTypeProcess>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>ZipValidation</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AddressValidation_entity</entityName>
-        <fieldName>ZipValidaton</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>Country_param</name>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>CurrentValue_param</name>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CityValidation</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AddressValidation_entity</entityName>
-        <fieldName>CityValidation</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CurrentValue_param</name>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>Country_param</name>
-          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <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>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>ADDRESS.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>ADDRESS.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>ADDRESS.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>ADDRESS.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Address_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
+  <title>Address</title>
+  <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
+  <titlePlural>Addresses</titlePlural>
+  <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>
+      <title>{$ADDRESS_IDENTIFIER}</title>
+    </entityField>
+    <entityField>
+      <name>ADDR_TYPE</name>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
+      <title>Addresstype</title>
+      <consumer>KeywordAddressTypes</consumer>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>BUILDINGNO</name>
+      <title>House number</title>
+    </entityField>
+    <entityField>
+      <name>CITY</name>
+      <title>City</title>
+      <consumer>CityValidation</consumer>
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
+      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/city/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>COUNTRY</name>
+      <title>Country</title>
+      <consumer>Countries</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
+      <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>
+      <consumer>ZipValidation</consumer>
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
+      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
+      <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
+    </entityField>
+    <entityProvider>
+      <name>OrganisationAddresses</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <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>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <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>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <expose v="false" />
+        </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>
+      <dependencies>
+        <entityDependency>
+          <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>PersAddresses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
+          <entityName>Contact_entity</entityName>
+          <fieldName>ContactAddresses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactType_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <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>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <expose v="false" />
+        </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>ISO2Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>OrganisationAddressesByContact</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
+      <titlePlural>Company Addresses</titlePlural>
+      <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>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <expose v="false" />
+        </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>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js</valueProcess>
+      <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>
+    <entityProvider>
+      <name>OrganisationAndContactAddresses</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>ContactAndOrganisationAddresses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>PossibleAddresses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DefaultAddressId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>OrganisationId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordAddressTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AddressType_entity</entityName>
+        <fieldName>ByCategory</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>UsageFilter_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IS_STANDARD_ICON</name>
+      <title>Standard</title>
+      <contentType>IMAGE</contentType>
+      <contentTypeProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js</contentTypeProcess>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ZipValidation</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AddressValidation_entity</entityName>
+        <fieldName>ZipValidaton</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Country_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>CurrentValue_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CityValidation</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AddressValidation_entity</entityName>
+        <fieldName>CityValidation</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CurrentValue_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>Country_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>AddressSearch</name>
+      <title>Search</title>
+      <consumer>FullAddressValidation</consumer>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/addresssearch/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>FullAddressValidation</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AddressValidation_entity</entityName>
+        <fieldName>FullAddressValidation</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CurrentValue_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>Country_param</name>
+          <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <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>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>ADDRESS.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>ADDRESS.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>ADDRESS.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>ADDRESS.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js b/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..de2c5e835eaf4fe6dd8b3521b3e17a39c9ac23c1
--- /dev/null
+++ b/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+// needed for instant display name change if value set by neon.setFieldValue
+result.string(vars.get("$this.value"))
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/addresssearch/onValueChange.js b/entity/Address_entity/entityfields/addresssearch/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..57c7beb53f9d1efaedb15b20b93902ed878cb750
--- /dev/null
+++ b/entity/Address_entity/entityfields/addresssearch/onValueChange.js
@@ -0,0 +1,3 @@
+import("WsValidation_lib");
+
+WsValidationUtils.setAddressFields("$field.AddressSearch");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/addresssearch/stateProcess.js b/entity/Address_entity/entityfields/addresssearch/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1621c646b2fd3b8d04bb908a08c7c27acf34421e
--- /dev/null
+++ b/entity/Address_entity/entityfields/addresssearch/stateProcess.js
@@ -0,0 +1,14 @@
+import("WsValidation_lib");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (WsValidationUtils.isWsEnabled(WsValidationType.get().TYPE_ADDRESS) && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js b/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
index 4db75aafc1b03c78866839c135db56f1127c94c1..41f3b8dc1a9b50c6ae934a4fae1402d699cc87b8 100644
--- a/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.COUNTRY"))
\ No newline at end of file
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js b/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js
similarity index 52%
rename from entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
rename to entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js
index a5632992f1eb801942517498616c86a95f49b737..41f3b8dc1a9b50c6ae934a4fae1402d699cc87b8 100644
--- a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("system.vars");
 
-result.string(vars.getString("$field.UID"));
\ No newline at end of file
+result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js b/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b51e1bdca25fd6259183417a6a823361750f2188
--- /dev/null
+++ b/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+    result.string(vars.get("$field.AddressSearch"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js b/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js
index 4db75aafc1b03c78866839c135db56f1127c94c1..41f3b8dc1a9b50c6ae934a4fae1402d699cc87b8 100644
--- a/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.COUNTRY"))
\ No newline at end of file
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 8d590f49b3b7469443505b4a6117349c68e03106..0eba48bd5a06f77bef1a8455cbf27314d11d55da 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,37 +1,37 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Analyses_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:GRID_BIG_O</icon>
-  <title>Analyses</title>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>NEW_TASKS</name>
-      <title>New tasks</title>
-      <contentType>NUMBER</contentType>
-      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OVERDUE_TASKS</name>
-      <title>Overdue tasks</title>
-      <contentType>NUMBER</contentType>
-      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>IMMINENT_APPOINTMENTS</name>
-      <title>Imminent appointments for today</title>
-      <contentType>NUMBER</contentType>
-      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Analyses_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GRID_BIG_O</icon>
+  <title>Analyses</title>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>NEW_TASKS</name>
+      <title>New tasks</title>
+      <contentType>NUMBER</contentType>
+      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OVERDUE_TASKS</name>
+      <title>Overdue tasks</title>
+      <contentType>NUMBER</contentType>
+      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IMMINENT_APPOINTMENTS</name>
+      <title>Imminent appointments for today</title>
+      <contentType>NUMBER</contentType>
+      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index c97d2deae69417398b1a960227749fe7c041dac5..0f9531202abff613ff8fcc392175176df8e44c10 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,220 +1,220 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>AnyContact_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>Relations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Relations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Relations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>336fdc6b-05f8-40bc-89ba-d4ab98bd6948</name>
-          <entityName>CampaignParticipant_entity</entityName>
-          <fieldName>AnyContacts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>ADDRESS_ID</name>
-      <title>standard address</title>
-      <searchable v="false" />
-      <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>LANGUAGE</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ORGANISATION_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>PERSON_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>CONTACTID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>contactType</name>
-      <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
-See ContactUtils.getRelationTypeByPersOrg for possible values</description>
-      <contentType>NUMBER</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ORGANISATION_NAME</name>
-      <title>Organisation name</title>
-    </entityField>
-    <entityField>
-      <name>PERSON_FIRSTNAME</name>
-      <title>Firstname</title>
-    </entityField>
-    <entityField>
-      <name>PERSON_LASTNAME</name>
-      <title>Lastname</title>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STANDARD_EMAIL_COMMUNICATION</name>
-      <title>standard email</title>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>STANDARD_PHONE_COMMUNICATION</name>
-      <title>Phone</title>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>RELATIONSHIP</name>
-      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>PERSON_MIDDLENAME</name>
-    </entityField>
-    <entityField>
-      <name>PERSON_TITLE</name>
-    </entityField>
-    <entityField>
-      <name>PERSON_SALUTATION</name>
-    </entityField>
-    <entityField>
-      <name>PERSON_FULL_NAME</name>
-      <title>Person</title>
-      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>6786a204-2cea-42ae-857d-4335bad6b5e4</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>b778622f-449a-4185-b7cb-9b373ba4024f</name>
-          <tableName>ADDRESS</tableName>
-          <primaryKey>ADDRESSID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ADDRESS_ID.value</name>
-          <recordfield>CONTACT.ADDRESS_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>CONTACT.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACTID.value</name>
-          <recordfield>CONTACT.CONTACTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>CONTACT.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_FIRSTNAME.value</name>
-          <recordfield>PERSON.FIRSTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_LASTNAME.value</name>
-          <recordfield>PERSON.LASTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD_EMAIL_COMMUNICATION.value</name>
-          <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD_PHONE_COMMUNICATION.value</name>
-          <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RELATIONSHIP.value</name>
-          <recordfield>CONTACT.RELATIONSHIP</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_MIDDLENAME.value</name>
-          <recordfield>PERSON.MIDDLENAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_TITLE.value</name>
-          <recordfield>PERSON.TITLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_SALUTATION.value</name>
-          <recordfield>PERSON.SALUTATION</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>AnyContact_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>Relations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Relations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Relations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>336fdc6b-05f8-40bc-89ba-d4ab98bd6948</name>
+          <entityName>CampaignParticipant_entity</entityName>
+          <fieldName>AnyContacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>ADDRESS_ID</name>
+      <title>standard address</title>
+      <searchable v="false" />
+      <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>LANGUAGE</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>PERSON_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CONTACTID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>contactType</name>
+      <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
+See ContactUtils.getRelationTypeByPersOrg for possible values</description>
+      <contentType>NUMBER</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_NAME</name>
+      <title>Organisation name</title>
+    </entityField>
+    <entityField>
+      <name>PERSON_FIRSTNAME</name>
+      <title>Firstname</title>
+    </entityField>
+    <entityField>
+      <name>PERSON_LASTNAME</name>
+      <title>Lastname</title>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STANDARD_EMAIL_COMMUNICATION</name>
+      <title>standard email</title>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>STANDARD_PHONE_COMMUNICATION</name>
+      <title>Phone</title>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>RELATIONSHIP</name>
+      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>PERSON_MIDDLENAME</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_TITLE</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_SALUTATION</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_FULL_NAME</name>
+      <title>Person</title>
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>6786a204-2cea-42ae-857d-4335bad6b5e4</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>b778622f-449a-4185-b7cb-9b373ba4024f</name>
+          <tableName>ADDRESS</tableName>
+          <primaryKey>ADDRESSID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADDRESS_ID.value</name>
+          <recordfield>CONTACT.ADDRESS_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>CONTACT.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_ID.value</name>
+          <recordfield>CONTACT.PERSON_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTID.value</name>
+          <recordfield>CONTACT.CONTACTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>CONTACT.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_FIRSTNAME.value</name>
+          <recordfield>PERSON.FIRSTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_LASTNAME.value</name>
+          <recordfield>PERSON.LASTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_EMAIL_COMMUNICATION.value</name>
+          <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_PHONE_COMMUNICATION.value</name>
+          <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RELATIONSHIP.value</name>
+          <recordfield>CONTACT.RELATIONSHIP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_MIDDLENAME.value</name>
+          <recordfield>PERSON.MIDDLENAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_TITLE.value</name>
+          <recordfield>PERSON.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_SALUTATION.value</name>
+          <recordfield>PERSON.SALUTATION</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 0603503f085654f1262e2188c88ce02da7f51b3a..fd8f221beb3d1444f060e8b4b05520e1e6466444 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,135 +1,135 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>AppointmentLink_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>AB_APPOINTMENTLINKID</name>
-      <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>APPOINTMENT_ID</name>
-      <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OBJECTID</name>
-      <title>{$OBJECTLINK_OBJECT}</title>
-      <consumer>Objects</consumer>
-      <linkedContext>Object</linkedContext>
-      <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>OBJECTTYPE</name>
-      <title>{$OBJECTLINK_TYPE}</title>
-      <consumer>Context</consumer>
-      <linkedContext>Context</linkedContext>
-      <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>AppointmentId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>Links</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>OBJECTTYPE</targetContextField>
-      <targetIdField>OBJECTID</targetIdField>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>3dde1745-18a1-4499-83d0-61e414086997</name>
-          <entityName>Appointment_entity</entityName>
-          <fieldName>AppointmentLinks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>AppointmentId_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Context</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Objects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Object_entity</entityName>
-        <fieldName>AllObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>opencontext</name>
-      <fieldType>ACTION</fieldType>
-      <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
-    </entityActionField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
-          <tableName>AB_APPOINTMENTLINK</tableName>
-          <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>APPOINTMENT_ID.value</name>
-          <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECTID.value</name>
-          <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECTTYPE.value</name>
-          <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECTID.displayValue</name>
-          <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_APPOINTMENTLINKID.value</name>
-          <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>AppointmentLink_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>AB_APPOINTMENTLINKID</name>
+      <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>APPOINTMENT_ID</name>
+      <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECTID</name>
+      <title>{$OBJECTLINK_OBJECT}</title>
+      <consumer>Objects</consumer>
+      <linkedContext>Object</linkedContext>
+      <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>OBJECTTYPE</name>
+      <title>{$OBJECTLINK_TYPE}</title>
+      <consumer>Context</consumer>
+      <linkedContext>Context</linkedContext>
+      <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>AppointmentId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>Links</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>OBJECTTYPE</targetContextField>
+      <targetIdField>OBJECTID</targetIdField>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>3dde1745-18a1-4499-83d0-61e414086997</name>
+          <entityName>Appointment_entity</entityName>
+          <fieldName>AppointmentLinks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>AppointmentId_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Context</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Objects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>opencontext</name>
+      <fieldType>ACTION</fieldType>
+      <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
+          <tableName>AB_APPOINTMENTLINK</tableName>
+          <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>APPOINTMENT_ID.value</name>
+          <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECTID.value</name>
+          <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECTTYPE.value</name>
+          <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECTID.displayValue</name>
+          <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AB_APPOINTMENTLINKID.value</name>
+          <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 4a7e8772d3a9aea9aa8b4fa4049aa9e6cc9fa062..dbccf3013bacd5ce505988c6c308597e6449380d 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,207 +1,207 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Appointment_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
-  <title>Termin</title>
-  <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>SUMMARY</name>
-      <title>Betreff</title>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-    </entityField>
-    <entityField>
-      <name>CLASSIFICATION</name>
-      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>BEGIN</name>
-      <selectionMode>SINGLE</selectionMode>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>END</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
-    </entityField>
-    <entityFieldGroup>
-      <name>STARTEND</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>BEGIN</element>
-        <element>END</element>
-      </fields>
-    </entityFieldGroup>
-    <entityField>
-      <name>STATUS</name>
-      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
-    </entityField>
-    <entityField>
-      <name>LOCATION</name>
-    </entityField>
-    <entityField>
-      <name>REMINDER_CHECK</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>REMINDER</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CATEGORIES</name>
-      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/dropDownProcess.js</dropDownProcess>
-    </entityField>
-    <entityField>
-      <name>ATTENDEES</name>
-      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TRANSPARENCY</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
-    </entityField>
-    <entityActionGroup>
-      <name>PartStatActionGroup</name>
-      <children>
-        <entityActionField>
-          <name>accept</name>
-          <fieldType>ACTION</fieldType>
-          <title>accept</title>
-          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
-          <actionOrder v="0" />
-          <iconId>VAADIN:CHECK</iconId>
-        </entityActionField>
-        <entityActionField>
-          <name>decline</name>
-          <fieldType>ACTION</fieldType>
-          <title>decline</title>
-          <description></description>
-          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
-          <iconId>VAADIN:CLOSE</iconId>
-        </entityActionField>
-        <entityActionField>
-          <name>tentative</name>
-          <fieldType>ACTION</fieldType>
-          <title>tentative</title>
-          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
-          <iconId>VAADIN:QUESTION</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>jdito</recordContainer>
-    </entityProvider>
-    <entityParameter>
-      <name>MasterEntry_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>ORGANIZER</name>
-    </entityField>
-    <entityField>
-      <name>RRULE</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>RECURRENCEID</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SAFESCOPEFIELD</name>
-    </entityField>
-    <entityField>
-      <name>MASTERBEGIN</name>
-    </entityField>
-    <entityField>
-      <name>MASTEREND</name>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ATTENDEESLENGTH</name>
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-    </entityField>
-    <entityParameter>
-      <name>Entry_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>AnyObjectRowid_param</name>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>AnyObjectType_param</name>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>AppointmentLinks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AppointmentLink_entity</entityName>
-        <fieldName>Links</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AppointmentId_param</name>
-          <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <title>jdito</title>
-      <description></description>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ATTENDEESLENGTH.value</element>
-        <element>BEGIN.value</element>
-        <element>END.value</element>
-        <element>SUMMARY.value</element>
-        <element>ORGANIZER.value</element>
-        <element>ATTENDEES.value</element>
-        <element>STATUS.value</element>
-        <element>LINKS.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>LOCATION.value</element>
-        <element>ICON.value</element>
-        <element>CLASSIFICATION.value</element>
-        <element>TRANSPARENCY.value</element>
-        <element>CATEGORIES.value</element>
-        <element>REMINDER.value</element>
-        <element>REMINDER_CHECK.value</element>
-        <element>RRULE.value</element>
-        <element>RECURRENCEID.value</element>
-        <element>SAFESCOPEFIELD.value</element>
-        <element>MASTERBEGIN.value</element>
-        <element>MASTEREND.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Appointment_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
+  <title>Termin</title>
+  <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>SUMMARY</name>
+      <title>Betreff</title>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATION</name>
+      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>BEGIN</name>
+      <selectionMode>SINGLE</selectionMode>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>END</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
+    </entityField>
+    <entityFieldGroup>
+      <name>STARTEND</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
+      <description>FIELDGROUP</description>
+      <fields>
+        <element>BEGIN</element>
+        <element>END</element>
+      </fields>
+    </entityFieldGroup>
+    <entityField>
+      <name>STATUS</name>
+      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>LOCATION</name>
+    </entityField>
+    <entityField>
+      <name>REMINDER_CHECK</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>REMINDER</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CATEGORIES</name>
+      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>ATTENDEES</name>
+      <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TRANSPARENCY</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionGroup>
+      <name>PartStatActionGroup</name>
+      <children>
+        <entityActionField>
+          <name>accept</name>
+          <fieldType>ACTION</fieldType>
+          <title>accept</title>
+          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
+          <actionOrder v="0" />
+          <iconId>VAADIN:CHECK</iconId>
+        </entityActionField>
+        <entityActionField>
+          <name>decline</name>
+          <fieldType>ACTION</fieldType>
+          <title>decline</title>
+          <description></description>
+          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:CLOSE</iconId>
+        </entityActionField>
+        <entityActionField>
+          <name>tentative</name>
+          <fieldType>ACTION</fieldType>
+          <title>tentative</title>
+          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:QUESTION</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityParameter>
+      <name>MasterEntry_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>ORGANIZER</name>
+    </entityField>
+    <entityField>
+      <name>RRULE</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>RECURRENCEID</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SAFESCOPEFIELD</name>
+    </entityField>
+    <entityField>
+      <name>MASTERBEGIN</name>
+    </entityField>
+    <entityField>
+      <name>MASTEREND</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ATTENDEESLENGTH</name>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+    </entityField>
+    <entityParameter>
+      <name>Entry_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AnyObjectRowid_param</name>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AnyObjectType_param</name>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>AppointmentLinks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AppointmentLink_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AppointmentId_param</name>
+          <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <title>jdito</title>
+      <description></description>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>ATTENDEESLENGTH.value</element>
+        <element>BEGIN.value</element>
+        <element>END.value</element>
+        <element>SUMMARY.value</element>
+        <element>ORGANIZER.value</element>
+        <element>ATTENDEES.value</element>
+        <element>STATUS.value</element>
+        <element>LINKS.value</element>
+        <element>DESCRIPTION.value</element>
+        <element>LOCATION.value</element>
+        <element>ICON.value</element>
+        <element>CLASSIFICATION.value</element>
+        <element>TRANSPARENCY.value</element>
+        <element>CATEGORIES.value</element>
+        <element>REMINDER.value</element>
+        <element>REMINDER_CHECK.value</element>
+        <element>RRULE.value</element>
+        <element>RECURRENCEID.value</element>
+        <element>SAFESCOPEFIELD.value</element>
+        <element>MASTERBEGIN.value</element>
+        <element>MASTEREND.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Appointment_entity/afterUiInit.js b/entity/Appointment_entity/afterUiInit.js
index ff820041585dae3d53605e36ae685231246f94a7..6bd26fb74cd72a11a7e9b3debe430b4e70e14a44 100644
--- a/entity/Appointment_entity/afterUiInit.js
+++ b/entity/Appointment_entity/afterUiInit.js
@@ -1,22 +1,19 @@
-import("system.util");
-import("system.neon");
-import("system.logging");
-import("system.vars");
-
-
-
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-    var entry = JSON.parse(vars.getString("$param.Entry_param"));
-   
-    if(entry["AppLinkContext"] && entry["AppLinkId"])
-    {
-        neon.addRecord("AppointmentLinks",
-        {
-            "AB_APPOINTMENTLINKID" : util.getNewUUID(),
-            "OBJECTID" : entry["AppLinkId"],
-            "OBJECTTYPE" : entry["AppLinkContext"]
-        });
-    }
+import("system.util");
+import("system.neon");
+import("system.logging");
+import("system.vars");
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+    var entry = JSON.parse(vars.getString("$param.Entry_param"));
+   
+    if(entry["AppLinkContext"] && entry["AppLinkId"])
+    {
+        neon.addRecord("AppointmentLinks",
+        {
+            "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+            "OBJECTID" : entry["AppLinkId"],
+            "OBJECTTYPE" : entry["AppLinkContext"]
+        });
+    }
 }
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js b/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js
index 4a51b835e05caa4e2b01b7e49748f9bf2236d577..dfd62b94a1176ede906519a489deb05f5aeb06d1 100644
--- a/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js
+++ b/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js
@@ -12,7 +12,7 @@ var newState = "ACCEPTED";
 
 if(calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
 {   
-    AppointmentUtils.sendExchangedAction(vars.get("$param.Entry_param"), newState);
+    AppointmentUtils.sendExchangedAction(vars.getString("$param.Entry_param"), newState);
 }
 else
 {
diff --git a/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js b/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js
index d57b79198259c1bfe5068fd8ab4715e3cce5cc59..a6828aaf7a079d04060e1f8c8efe3c5d7a9b6830 100644
--- a/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js
+++ b/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js
@@ -12,7 +12,7 @@ var newState = "DECLINED";
 
 if(calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
 {   
-    AppointmentUtils.sendExchangedAction(vars.get("$param.Entry_param"), newState);
+    AppointmentUtils.sendExchangedAction(vars.getString("$param.Entry_param"), newState);
 }
 else
 {
diff --git a/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js b/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js
index 7b599ae380648630da1b3191b71e9bb8344ad8aa..2915c893e54f1a06974956e6cc9ad3fd6fa70d71 100644
--- a/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js
+++ b/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js
@@ -12,7 +12,7 @@ var newState = "TENTATIVE";
 
 if(calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
 {   
-    AppointmentUtils.sendExchangedAction(vars.get("$param.Entry_param"), newState);
+    AppointmentUtils.sendExchangedAction(vars.getString("$param.Entry_param"), newState);
 }
 else
 {
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 1324b2e522300c3c3c17d780c2feed0282f9ae98..ae84c4565054abc7f4bc589d1c1033627fd86d8a 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -1,87 +1,87 @@
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.datetime");
-import("system.eMath");
-import("system.util");
-import("system.neon");
-
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
-{
-
-    var entry = JSON.parse(vars.getString("$param.Entry_param"));
-
-    var masterEntry = null;
-    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
-        masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
-    }
-
-    var uid = entry[calendars.ID];    
-    var summary = entry[calendars.SUMMARY];
-    var attendees = entry[calendars.AFFECTEDUSERS];
-    var startdate = entry[calendars.DTSTART];
-    var enddate = entry[calendars.DTEND];
-    var links = entry[calendars.LINKS];
-    var description = entry[calendars.DESCRIPTION];
-    if(entry[calendars.ORGANIZER2] != undefined)
-        var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
-    var status = entry[calendars.STATUS];
-    var location = entry[calendars.LOCATION];
-    var reminder = entry[calendars.REMINDER_DURATION];
-    var remindercheck = entry[calendars.HASREMINDER]
-    var classification = entry[calendars.CLASSIFICATION];
-    var transparency = entry[calendars.TRANSPARENCY];
-    var categories = entry[calendars.CATEGORIES];
-    
-    var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
-    var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
-    
-    // Recurrence
-    var recurrenceID = entry[calendars.RECURRENCEID];
-    var rrule = null;
-    if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
-        rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
-    } else {
-        rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
-    }
-    
-//    if(entry["AppLinkContext"] && entry["AppLinkId"])
-//    {
-//        logging.log("hier geht lohos... " + uid + " id");
-//        neon.addRecord("AppointmentLinks",
-//        {
-//            "AB_APPOINTMENTLINKID" : util.getNewUUID(),
-//            "APPOINTMENT_ID" : vars.get("$field.UID"),
-//            "OBJECTID" : entry["AppLinkId"],
-//            "OBJECTTYPE" : entry["AppLinkContext"]
-//        });
-//    }
-   
-    //@TODO Icon 
-    result.object([
-        [
-            uid, 
-            attendees.length, 
-            startdate, 
-            enddate, 
-            summary, 
-            organizer,
-            attendees, 
-            status, 
-            links, 
-            description, 
-            location, 
-            '', 
-            classification,
-            transparency, 
-            categories, 
-            reminder, 
-            remindercheck, 
-            rrule, 
-            recurrenceID, 
-            null, 
-            masterBegin, 
-            masterEnd
-        ]
-    ]);
-}
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.datetime");
+import("system.eMath");
+import("system.util");
+import("system.neon");
+
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
+
+    var entry = JSON.parse(vars.getString("$param.Entry_param"));
+
+    var masterEntry = null;
+    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
+        masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
+    }
+
+    var uid = entry[calendars.ID];    
+    var summary = entry[calendars.SUMMARY];
+    var attendees = entry[calendars.AFFECTEDUSERS];
+    var startdate = entry[calendars.DTSTART];
+    var enddate = entry[calendars.DTEND];
+    var links = entry[calendars.LINKS];
+    var description = entry[calendars.DESCRIPTION];
+    if(entry[calendars.ORGANIZER2] != undefined)
+        var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
+    var status = entry[calendars.STATUS];
+    var location = entry[calendars.LOCATION];
+    var reminder = entry[calendars.REMINDER_DURATION];
+    var remindercheck = entry[calendars.HASREMINDER]
+    var classification = entry[calendars.CLASSIFICATION];
+    var transparency = entry[calendars.TRANSPARENCY];
+    var categories = entry[calendars.CATEGORIES];
+    
+    var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
+    var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
+    
+    // Recurrence
+    var recurrenceID = entry[calendars.RECURRENCEID];
+    var rrule = null;
+    if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
+        rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
+    } else {
+        rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
+    }
+    
+//    if(entry["AppLinkContext"] && entry["AppLinkId"])
+//    {
+//        logging.log("hier geht lohos... " + uid + " id");
+//        neon.addRecord("AppointmentLinks",
+//        {
+//            "AB_APPOINTMENTLINKID" : util.getNewUUID(),
+//            "APPOINTMENT_ID" : vars.get("$field.UID"),
+//            "OBJECTID" : entry["AppLinkId"],
+//            "OBJECTTYPE" : entry["AppLinkContext"]
+//        });
+//    }
+   
+    //@TODO Icon 
+    result.object([
+        [
+            uid, 
+            attendees.length, 
+            startdate, 
+            enddate, 
+            summary, 
+            organizer,
+            attendees, 
+            status, 
+            links, 
+            description, 
+            location, 
+            '', 
+            classification,
+            transparency, 
+            categories, 
+            reminder, 
+            remindercheck, 
+            rrule, 
+            recurrenceID, 
+            null, 
+            masterBegin, 
+            masterEnd
+        ]
+    ]);
+}
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 716412e9a80f9396996eaec8853ecffeb8d0ce7a..8a38580c344c0f8a12c5da0cd3a688929344896a 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,263 +1,264 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>AttributeRelation_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Attribute</title>
-  <titlePlural>Attributes</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>PARENT_ID</name>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>ObjectType_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectRowId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>TreeProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
-          <entityName>Employee_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>AttributeTree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>GetTree_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>AB_ATTRIBUTE_ID</name>
-      <title>Attribute</title>
-      <consumer>SpecificAttribute</consumer>
-      <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes />
-    </entityField>
-    <entityField>
-      <name>VALUE</name>
-      <title>Value</title>
-      <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
-      <resolution>DAY</resolution>
-      <mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js</mandatoryProcess>
-      <dropDownProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
-      <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>SpecificAttribute</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Attribute_entity</entityName>
-        <fieldName>SpecificAttribute</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeCount_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>edit</name>
-          <fieldType>ACTION</fieldType>
-          <onActionProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
-          <iconId>NEON:PENCIL</iconId>
-          <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityParameter>
-      <name>GetTree_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>AttributeRelations</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>34f24d10-7312-4b03-8d6f-2918c8cb9eb8</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3cb1014d-a6c8-4b4a-83ba-a099d4488ab2</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>2662f513-6498-40c2-bed6-031087857e82</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>be336d6c-c550-4ae5-9f78-0f2ee56a2a6c</name>
-          <entityName>Employee_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8488da81-0f98-4c4b-811f-ccda64c8624b</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>7df4a57a-646d-4b5a-802b-f1e2bf93d09b</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>40a4c698-d34f-4c5a-bee8-239ee9d71f20</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>99bc7ec8-195e-483f-923e-763c6f28a29c</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>9d2f08b1-065c-45c3-9922-a5fc443684e8</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>Attributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>GetTree_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>FilteredAttributes_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>DisplaySimpleName_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT_ID.value</element>
-        <element>VALUE.value</element>
-        <element>VALUE.displayValue</element>
-        <element>AB_ATTRIBUTE_ID.value</element>
-        <element>AB_ATTRIBUTE_ID.displayValue</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>AttributeRelation_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Attribute</title>
+  <onValidation>%aditoprj%/entity/AttributeRelation_entity/onValidation.js</onValidation>
+  <titlePlural>Attributes</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>PARENT_ID</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>TreeProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
+          <entityName>Employee_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>AttributeTree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>GetTree_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>AB_ATTRIBUTE_ID</name>
+      <title>Attribute</title>
+      <consumer>SpecificAttribute</consumer>
+      <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes />
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+      <title>Value</title>
+      <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
+      <resolution>DAY</resolution>
+      <mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js</mandatoryProcess>
+      <dropDownProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
+      <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>SpecificAttribute</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>SpecificAttribute</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeCount_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionGroup>
+      <name>alter</name>
+      <children>
+        <entityActionField>
+          <name>edit</name>
+          <fieldType>ACTION</fieldType>
+          <onActionProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+          <iconId>NEON:PENCIL</iconId>
+          <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityParameter>
+      <name>GetTree_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>AttributeRelations</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>34f24d10-7312-4b03-8d6f-2918c8cb9eb8</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3cb1014d-a6c8-4b4a-83ba-a099d4488ab2</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2662f513-6498-40c2-bed6-031087857e82</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>be336d6c-c550-4ae5-9f78-0f2ee56a2a6c</name>
+          <entityName>Employee_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8488da81-0f98-4c4b-811f-ccda64c8624b</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7df4a57a-646d-4b5a-802b-f1e2bf93d09b</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>40a4c698-d34f-4c5a-bee8-239ee9d71f20</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>99bc7ec8-195e-483f-923e-763c6f28a29c</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>9d2f08b1-065c-45c3-9922-a5fc443684e8</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>GetTree_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>FilteredAttributes_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>DisplaySimpleName_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>PARENT_ID.value</element>
+        <element>VALUE.value</element>
+        <element>VALUE.displayValue</element>
+        <element>AB_ATTRIBUTE_ID.value</element>
+        <element>AB_ATTRIBUTE_ID.displayValue</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
index 9b5db15911c19107137f909b325905320a4a5b73..5a62467c584de90657c0987d95ece473df50637d 100644
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -1,13 +1,16 @@
-import("ObjectRelation_lib");
-import("system.neon");
-import("system.vars");
-
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
-{    
-    var selectedRows = JSON.parse(vars.get("$sys.selection"));
-    var params = {
-        "ObjectType_param" : vars.get("$param.ObjectType_param"),
-        "ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
-    };
-    neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
+import("system.logging");
+import("ObjectRelation_lib");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{    
+    var selectedRows = vars.get("$sys.selection");
+    logging.log("rows: " + selectedRows)
+    logging.log("rows: " + selectedRows[0])
+    var params = {
+        "ObjectType_param" : vars.get("$param.ObjectType_param"),
+        "ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
+    };
+    neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
 }
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
index ce3a4115fcb5118ace18a27ff4a6880a0958693b..b8964feb97367ccf63fcc2b86696cf8009e08e4f 100644
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
@@ -1,13 +1,13 @@
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("Attribute_lib");
-
-var state = neon.COMPONENTSTATE_DISABLED;
-if (vars.exists("$local.rows"))
-{
-    var row = JSON.parse(vars.get("$local.rows"))[0];
-    if (row.AB_ATTRIBUTE_ID)
-        state = neon.COMPONENTSTATE_EDITABLE;
-}
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Attribute_lib");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+if (vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows").length > 0)
+{
+    var row = vars.get("$sys.selectionRows")[0];
+    if (row.AB_ATTRIBUTE_ID)
+        state = neon.COMPONENTSTATE_EDITABLE;
+}
 result.string(state);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
index 2454dee000a5d40b378d440248c84789ae5c361c..069564215deafe58fe6dd3db05b8f5e05a1fb73b 100644
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
@@ -1,25 +1,8 @@
-import("system.result");
-import("system.db");
-import("Sql_lib");
-import("system.vars");
-
-var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
-var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
-if (rowId)
-{
-    var condition = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
-    if (objectType)
-        condition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
-    var relationCounts = db.table(condition.buildSql(
-        "select AB_ATTRIBUTE_ID, count(AB_ATTRIBUTE_ID) from AB_ATTRIBUTERELATION",
-        "1=2",
-        "group by AB_ATTRIBUTE_ID"
-    ));
-    var countObj = {};
-    relationCounts.forEach(function (row)
-    {
-        this[row[0]] = row[1];
-    }, countObj);
-    result.object(countObj);
-}
\ No newline at end of file
+import("Attribute_lib");
+import("system.result");
+import("system.vars");
+
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
+if (rowId)
+    result.object(AttributeRelationUtils.countAttributeRelations(rowId, objectType));
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml b/entity/AttributeRelation_entity/onValidation.js
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
rename to entity/AttributeRelation_entity/onValidation.js
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index f0077e5b8e05cca55caa3c7eb84e84ad790219b7..cb203ce2ec22694a9223045fb2ac996b421501bf 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -1,110 +1,110 @@
-import("Util_lib");
-import("system.vars");
-import("system.result");
-import("system.db");
-import("Attribute_lib");
-import("Sql_lib");
-
-var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
-var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
-var getTree = vars.exists("$param.GetTree_param") && vars.getString("$param.GetTree_param") == "true";
-var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
-var allAttributes = [];
-var attributeObj = {};
-var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', '', ATTRIBUTE_NAME from AB_ATTRIBUTE";
-
-var attrCond = SqlCondition.begin();
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
-{
-    var idVals = vars.get("$local.idvalues");
-    var idCond = SqlCondition.begin();
-    idVals.forEach(function (id)
-    {
-        idCond.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
-    });
-    attrCond.andSqlCondition(idCond);
-    getTree = false;
-}
-else if (rowId)
-{
-    attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
-    if (objectType != null)
-        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
-    
-    if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
-    {
-        var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
-        var filteredIdsCondition = new SqlCondition();
-
-        filteredIds.forEach(function(id) 
-        {
-            this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
-        }, filteredIdsCondition);
-
-        attrCond.andSqlCondition(filteredIdsCondition);
-    }
-}
-var defaultFields = [
-    "AB_ATTRIBUTERELATIONID",
-    "AB_ATTRIBUTE.AB_ATTRIBUTEID", 
-    "AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", 
-    "AB_ATTRIBUTE.ATTRIBUTE_TYPE", 
-    "AB_ATTRIBUTE.ATTRIBUTE_NAME", 
-    "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
-    "COMBOVAL.ATTRIBUTE_NAME"
-];
-var valueFields = AttributeTypeUtil.getAllDatabaseFields();
-var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
-    + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
-    + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID", "1=2");
-
-var attributeNameMap = {};
-var attributeValues = db.table(attributeSql).map(function (row) 
-{
-    let attributeId = row[1];
-    let attributeName = row[4];
-    if (!getTree && !displaySimpleName && row[2])
-    {
-        let parentName = AttributeUtil.getFullAttributeName(row[2]);
-        attributeName = (parentName ? parentName + " / " : "") + attributeName;
-    }
-    let value = row[AttributeTypeUtil.getTypeColumnIndex(row[3]) + defaultFields.length];
-    let viewValue;
-    if (row[3].trim() == $AttributeTypes.COMBO)
-        viewValue = row[6];
-    else
-        viewValue = AttributeTypeUtil.getAttributeViewValue(row[3].trim(), value, row[5]);
-
-    return [row[0], row[2], value, viewValue, attributeId, attributeName];
-});
-
-if (getTree)
-    _fetchAttributes(attributeValues.map(function (row) {return row[1]}));
-
-allAttributes = TreeUtils.sortArrayForTree(allAttributes, 0, 1).concat(attributeValues);
-
-result.object(allAttributes);
-
-function _fetchAttributes (pAttributeIds)
-{
-    var condition = SqlCondition.begin();
-    var nextIds = [];
-    pAttributeIds.forEach(function (id)
-    {
-        if (!(id in this))
-            condition.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
-    }, attributeObj);
-    db.table(condition.buildSql(sqlSelect, "1=2"))
-        .forEach(function (row)
-            {
-                this[row[0]] = true;
-                if (row[1])
-                    nextIds.push(row[1]);
-                else
-                    row[1] = null;
-                allAttributes.push(row);
-            }, attributeObj);
-    if (nextIds.length)
-        _fetchAttributes(nextIds);
+import("Util_lib");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Attribute_lib");
+import("Sql_lib");
+
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
+var getTree = vars.exists("$param.GetTree_param") && vars.getString("$param.GetTree_param") == "true";
+var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
+var allAttributes = [];
+var attributeObj = {};
+var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', '', ATTRIBUTE_NAME from AB_ATTRIBUTE";
+
+var attrCond = SqlCondition.begin();
+
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+    var idVals = vars.get("$local.idvalues");
+    var idCond = SqlCondition.begin();
+    idVals.forEach(function (id)
+    {
+        idCond.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
+    });
+    attrCond.andSqlCondition(idCond);
+    getTree = false;
+}
+else if (rowId)
+{
+    attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
+    if (objectType != null)
+        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+    
+    if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+    {
+        var filteredIds = JSON.parse(vars.getString("$param.FilteredAttributeIds_param"));
+        var filteredIdsCondition = new SqlCondition();
+
+        filteredIds.forEach(function(id) 
+        {
+            this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
+        }, filteredIdsCondition);
+
+        attrCond.andSqlCondition(filteredIdsCondition);
+    }
+}
+var defaultFields = [
+    "AB_ATTRIBUTERELATIONID",
+    "AB_ATTRIBUTE.AB_ATTRIBUTEID", 
+    "AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", 
+    "AB_ATTRIBUTE.ATTRIBUTE_TYPE", 
+    "AB_ATTRIBUTE.ATTRIBUTE_NAME", 
+    "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
+    "COMBOVAL.ATTRIBUTE_NAME"
+];
+var valueFields = AttributeTypeUtil.getAllDatabaseFields();
+var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+    + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
+    + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID", "1=2");
+
+var attributeNameMap = {};
+var attributeValues = db.table(attributeSql).map(function (row) 
+{
+    let attributeId = row[1];
+    let attributeName = row[4];
+    if (!getTree && !displaySimpleName && row[2])
+    {
+        let parentName = AttributeUtil.getFullAttributeName(row[2]);
+        attributeName = (parentName ? parentName + " / " : "") + attributeName;
+    }
+    let value = row[AttributeTypeUtil.getTypeColumnIndex(row[3]) + defaultFields.length];
+    let viewValue;
+    if (row[3].trim() == $AttributeTypes.COMBO)
+        viewValue = row[6];
+    else
+        viewValue = AttributeTypeUtil.getAttributeViewValue(row[3].trim(), value, row[5]);
+
+    return [row[0], row[2], value, viewValue, attributeId, attributeName];
+});
+
+if (getTree)
+    _fetchAttributes(attributeValues.map(function (row) {return row[1]}));
+
+allAttributes = TreeUtils.sortArrayForTree(allAttributes, 0, 1).concat(attributeValues);
+
+result.object(allAttributes);
+
+function _fetchAttributes (pAttributeIds)
+{
+    var condition = SqlCondition.begin();
+    var nextIds = [];
+    pAttributeIds.forEach(function (id)
+    {
+        if (!(id in this))
+            condition.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+    }, attributeObj);
+    db.table(condition.buildSql(sqlSelect, "1=2"))
+        .forEach(function (row)
+            {
+                this[row[0]] = true;
+                if (row[1])
+                    nextIds.push(row[1]);
+                else
+                    row[1] = null;
+                allAttributes.push(row);
+            }, attributeObj);
+    if (nextIds.length)
+        _fetchAttributes(nextIds);
 }
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index da120d60e6733fb1d9892597d1dcd56565c8a970..df2d1fc0a9aa3a767016e5c5630eb0e6dad15ac3 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,147 +1,147 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>AttributeUsage_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
-  <title>Usage</title>
-  <onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>OBJECT_TYPE</name>
-      <title>Module</title>
-      <consumer>Context</consumer>
-      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>AB_ATTRIBUTEUSAGEID</name>
-      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attributeusageid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>AB_ATTRIBUTE_ID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>SpecificAttribute</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
-          <entityName>Attribute_entity</entityName>
-          <fieldName>AttributeUsages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>AttributeId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>MIN_COUNT</name>
-      <title>Minimal Count</title>
-      <contentType>NUMBER</contentType>
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>MAX_COUNT</name>
-      <title>Maximal Count</title>
-      <contentType>NUMBER</contentType>
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
-    </entityField>
-    <entityConsumer>
-      <name>Context</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>GetAllContexts_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>UseExclusives_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/useexclusives_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ExclusiveContexts_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>SingleSelection_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>DisableMinCount_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <onDBInsert>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <onDBDelete>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
-          <tableName>AB_ATTRIBUTEUSAGE</tableName>
-          <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_ATTRIBUTE_ID.value</name>
-          <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_ATTRIBUTEUSAGEID.value</name>
-          <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_TYPE.value</name>
-          <recordfield>AB_ATTRIBUTEUSAGE.OBJECT_TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MAX_COUNT.value</name>
-          <recordfield>AB_ATTRIBUTEUSAGE.MAX_COUNT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MIN_COUNT.value</name>
-          <recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>AttributeUsage_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
+  <title>Usage</title>
+  <onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <title>Module</title>
+      <consumer>Context</consumer>
+      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>AB_ATTRIBUTEUSAGEID</name>
+      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attributeusageid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>AB_ATTRIBUTE_ID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>SpecificAttribute</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
+          <entityName>Attribute_entity</entityName>
+          <fieldName>AttributeUsages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>AttributeId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>MIN_COUNT</name>
+      <title>Minimal Count</title>
+      <contentType>NUMBER</contentType>
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>MAX_COUNT</name>
+      <title>Maximal Count</title>
+      <contentType>NUMBER</contentType>
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
+    </entityField>
+    <entityConsumer>
+      <name>Context</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>GetAllContexts_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>UseExclusives_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/useexclusives_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ExclusiveContexts_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>SingleSelection_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>DisableMinCount_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <onDBInsert>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
+          <tableName>AB_ATTRIBUTEUSAGE</tableName>
+          <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>AB_ATTRIBUTE_ID.value</name>
+          <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AB_ATTRIBUTEUSAGEID.value</name>
+          <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>AB_ATTRIBUTEUSAGE.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAX_COUNT.value</name>
+          <recordfield>AB_ATTRIBUTEUSAGE.MAX_COUNT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MIN_COUNT.value</name>
+          <recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 3461f96fcff474ad38fe9762b53fb04ece6b4a54..0159ec31d776ccf1f7645911d163d000907fcee4 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,342 +1,342 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Attribute_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
-  <title>Attribute</title>
-  <contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
-  <onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:TAG</iconId>
-  <titlePlural>Attributes</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>ATTRIBUTE_NAME</name>
-      <title>Name</title>
-      <mandatory v="true" />
-      <state>EDITABLE</state>
-    </entityField>
-    <entityField>
-      <name>ATTRIBUTE_TYPE</name>
-      <title>Type</title>
-      <consumer>KeywordAttributeTypes</consumer>
-      <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js</onValueChange>
-    </entityField>
-    <entityField>
-      <name>ATTRIBUTE_PARENT_ID</name>
-      <title>Superordinate Attribute</title>
-      <consumer>AttributeGroup</consumer>
-      <linkedContext>Attribute</linkedContext>
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>AttributeChildren</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Attribute_entity</entityName>
-        <fieldName>AttributeParent</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AttrParentId_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentType_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>AttributeParent</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>18bd148d-bed3-429f-ba54-c5eac76c5083</name>
-          <entityName>Attribute_entity</entityName>
-          <fieldName>AttributeChildren</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>9fb3569c-7c75-48b1-9dc0-3f707940813a</name>
-          <entityName>Employee_entity</entityName>
-          <fieldName>Departments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>AttrParentType_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeCount_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>AttrParentId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>AttributeUsages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeUsage_entity</entityName>
-        <fieldName>SpecificAttribute</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>SingleSelection_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/singleselection_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>DisableMinCount_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ATTRIBUTE_ACTIVE</name>
-      <title>Active</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/dropDownProcess.js</dropDownProcess>
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordAttributeTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>KEYWORD_CONTAINER</name>
-      <title>Keyword</title>
-      <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/dropDownProcess.js</dropDownProcess>
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
-    </entityField>
-    <entityParameter>
-      <name>AttrParentType_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectType_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>SpecificAttribute</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <lookupIdfield>UID</lookupIdfield>
-      <dependencies>
-        <entityDependency>
-          <name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
-          <entityName>AttributeRelation_entity</entityName>
-          <fieldName>SpecificAttribute</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>FilteredAttributeIds_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>DisplaySimpleName_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentType_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>GetGroups_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>FULL_ATTRIBUTE_NAME</name>
-      <title>Name</title>
-      <searchable v="false" />
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>FilteredAttributeIds_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionGroup>
-      <name>AttributeActions</name>
-      <children>
-        <entityActionField>
-          <name>newChildAttribute</name>
-          <fieldType>ACTION</fieldType>
-          <title>New attribute</title>
-          <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
-          <isMenuAction v="true" />
-          <isObjectAction v="false" />
-          <isSelectionAction v="true" />
-          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
-          <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityParameter>
-      <name>GetGroups_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>DisplaySimpleName_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>USAGELIST</name>
-      <title>Usage</title>
-      <searchable v="false" />
-      <state>READONLY</state>
-    </entityField>
-    <entityProvider>
-      <name>AttributeGroups</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <children>
-        <entityParameter>
-          <name>GetGroups_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeCount_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>AttributeGroup</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Attribute_entity</entityName>
-        <fieldName>AttributeGroups</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AttrParentId_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentType_param</name>
-          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparenttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ICON</name>
-      <colorProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/colorProcess.js</colorProcess>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>SORTING</name>
-      <title>Sorting</title>
-      <searchable v="false" />
-    </entityField>
-    <entityParameter>
-      <name>AttributeCount_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <isSortable v="true" />
-      <contentProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ATTRIBUTE_PARENT_ID.value</element>
-        <element>ATTRIBUTE_ACTIVE.value</element>
-        <element>KEYWORD_CONTAINER.value</element>
-        <element>SORTING.value</element>
-        <element>ATTRIBUTE_TYPE.value</element>
-        <element>ATTRIBUTE_TYPE.displayValue</element>
-        <element>USAGELIST.value</element>
-        <element>ATTRIBUTE_NAME.value</element>
-        <element>FULL_ATTRIBUTE_NAME.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Attribute_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
+  <title>Attribute</title>
+  <contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
+  <iconId>VAADIN:TAG</iconId>
+  <titlePlural>Attributes</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>ATTRIBUTE_NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+      <state>EDITABLE</state>
+    </entityField>
+    <entityField>
+      <name>ATTRIBUTE_TYPE</name>
+      <title>Type</title>
+      <consumer>KeywordAttributeTypes</consumer>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>ATTRIBUTE_PARENT_ID</name>
+      <title>Superordinate Attribute</title>
+      <consumer>AttributeGroup</consumer>
+      <linkedContext>Attribute</linkedContext>
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>AttributeChildren</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>AttributeParent</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AttrParentId_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentType_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>AttributeParent</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>18bd148d-bed3-429f-ba54-c5eac76c5083</name>
+          <entityName>Attribute_entity</entityName>
+          <fieldName>AttributeChildren</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>9fb3569c-7c75-48b1-9dc0-3f707940813a</name>
+          <entityName>Employee_entity</entityName>
+          <fieldName>Departments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>AttrParentType_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeCount_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>AttrParentId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>AttributeUsages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeUsage_entity</entityName>
+        <fieldName>SpecificAttribute</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>SingleSelection_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/singleselection_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DisableMinCount_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ATTRIBUTE_ACTIVE</name>
+      <title>Active</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/dropDownProcess.js</dropDownProcess>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordAttributeTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>KEYWORD_CONTAINER</name>
+      <title>Keyword</title>
+      <dropDownProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/dropDownProcess.js</dropDownProcess>
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
+    </entityField>
+    <entityParameter>
+      <name>AttrParentType_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>SpecificAttribute</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>UID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
+          <entityName>AttributeRelation_entity</entityName>
+          <fieldName>SpecificAttribute</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilteredAttributeIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>GetGroups_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>FULL_ATTRIBUTE_NAME</name>
+      <title>Name</title>
+      <searchable v="false" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>FilteredAttributeIds_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionGroup>
+      <name>AttributeActions</name>
+      <children>
+        <entityActionField>
+          <name>newChildAttribute</name>
+          <fieldType>ACTION</fieldType>
+          <title>New attribute</title>
+          <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
+          <isMenuAction v="true" />
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+          <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityParameter>
+      <name>GetGroups_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>DisplaySimpleName_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>USAGELIST</name>
+      <title>Usage</title>
+      <searchable v="false" />
+      <state>READONLY</state>
+    </entityField>
+    <entityProvider>
+      <name>AttributeGroups</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <children>
+        <entityParameter>
+          <name>GetGroups_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroups/children/getgroups_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeCount_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>AttributeGroup</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>AttributeGroups</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AttrParentId_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparentid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentType_param</name>
+          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/attrparenttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ICON</name>
+      <colorProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/colorProcess.js</colorProcess>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>SORTING</name>
+      <title>Sorting</title>
+      <searchable v="false" />
+    </entityField>
+    <entityParameter>
+      <name>AttributeCount_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isSortable v="true" />
+      <contentProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>ATTRIBUTE_PARENT_ID.value</element>
+        <element>ATTRIBUTE_ACTIVE.value</element>
+        <element>KEYWORD_CONTAINER.value</element>
+        <element>SORTING.value</element>
+        <element>ATTRIBUTE_TYPE.value</element>
+        <element>ATTRIBUTE_TYPE.displayValue</element>
+        <element>USAGELIST.value</element>
+        <element>ATTRIBUTE_NAME.value</element>
+        <element>FULL_ATTRIBUTE_NAME.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
index 0ccfa2e4bf15531b52a7d33d316b14af3d0c1819..a7e3d7f4e6d495822ad0e6acf44b2fa757c2e3b1 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
@@ -5,8 +5,7 @@ import("Attribute_lib");
 var params = {};
 if (vars.exists("$local.rows"))
 {
-    var row = JSON.parse(vars.get("$local.rows"));
-    
+    var row = vars.get("$local.rows");
     var type = row[0].ATTRIBUTE_TYPE.trim();
     if (AttributeTypeUtil.isGroupType(type))
         params["AttrParentId_param"] = row[0].UID;
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 43b3a9d236239aafc8074b5b80767392c98da793..43b6453431cae1c6b0fa6f91acbaf4c576896fdb 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -1,137 +1,137 @@
-import("Util_lib");
-import("JditoFilter_lib");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
-import("system.db");
-import("system.vars");
-import("system.result");
-import("Sql_lib");
-import("Attribute_lib");
-
-var uidTableAlias = "SELF";
-var sqlSelect = "select SELF.AB_ATTRIBUTEID, SELF.ATTRIBUTE_PARENT_ID, SELF.ATTRIBUTE_ACTIVE, SELF.KEYWORD_CONTAINER, SELF.SORTING, SELF.ATTRIBUTE_TYPE, " 
-    + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "SELF.ATTRIBUTE_TYPE") //3
-    + ", '', SELF.ATTRIBUTE_NAME, PARENT1.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_PARENT_ID " 
-    + "from AB_ATTRIBUTE SELF "
-    + "left join AB_ATTRIBUTE PARENT1 on SELF.ATTRIBUTE_PARENT_ID = PARENT1.AB_ATTRIBUTEID "    //always select the names of the next 2 parents so that less queries
-    + "left join AB_ATTRIBUTE PARENT2 ON PARENT1.ATTRIBUTE_PARENT_ID = PARENT2.AB_ATTRIBUTEID"; //are required later when buildung the full name
-
-var condition = SqlCondition.begin();
-var sqlOrder = " order by SELF.ATTRIBUTE_PARENT_ID asc, SELF.SORTING asc";
-
-var getGroups = vars.exists("$param.GetGroups_param") && vars.get("$param.GetGroups_param");
-var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
-var parentType = vars.exists("$param.AttrParentType_param") && vars.get("$param.AttrParentType_param");
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
-{
-    condition.and("SELF.AB_ATTRIBUTEID in ('" + vars.get("$local.idvalues").join("','") + "')");
-}
-else if (getGroups) //if getGroups == true, it is the lookup for selecting the superordinate attribute
-{
-    //this condition filters out the own id and the children to prevent loops
-    
-    var isGroupCondition = SqlCondition.begin();
-    for (let type in $AttributeTypes)
-        if ($AttributeTypes[type].isGroup && $AttributeTypes[type] != $AttributeTypes.COMBO 
-            && (parentType == $AttributeTypes.VOID || $AttributeTypes[type] != $AttributeTypes.VOID))
-        {
-            isGroupCondition.orPrepare(["AB_ATTRIBUTE", "ATTRIBUTE_TYPE", uidTableAlias], $AttributeTypes[type]);
-        }
-    
-    condition.andSqlCondition(SqlCondition.begin()
-        .andSqlCondition(isGroupCondition)
-        .andPrepareVars(["AB_ATTRIBUTE", "AB_ATTRIBUTEID", uidTableAlias], "$param.AttrParentId_param", "# != ?")
-        .and("SELF.AB_ATTRIBUTEID not in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')")
-    );
-}
-else if (objectType)  //if there's an objectType, it comes from the AttributeRelation entity
-{
-    var filteredAttributes = [];
-    if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
-        filteredAttributes = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
-    var attributeCount;
-    if (vars.exists("$param.AttributeCount_param") && vars.get("$param.AttributeCount_param"))
-        attributeCount = JSON.parse(vars.get("$param.AttributeCount_param"));
-    var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes, attributeCount);
-    condition.and("SELF.AB_ATTRIBUTEID in ('" + ids.join("','") + "')");
-} 
-else if (parentType)
-{
-    if (AttributeTypeUtil.isGroupType(parentType)) //condition for all subordinate attributes of an attribute
-    {
-        var parentId = vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param");
-        if (parentId)
-            condition.and("SELF.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')");
-    }
-    else
-        condition.and("1=2");
-}
-
-//when there are filters selected, add them to the conditon
-if (vars.exists("$local.filter") && vars.get("$local.filter"))
-{
-    var filter = vars.get("$local.filter");
-    condition.andSqlCondition(JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE", uidTableAlias));
-}
-
-var attributes = db.table(condition.buildSql(sqlSelect, "1=1", sqlOrder));
-
-result.object(_buildAttributeTable(attributes));
-
-
-//sorts the records in a way that a tree can be built and adds values
-function _buildAttributeTable (pAttributes) 
-{
-    var rows = {};
-    var allIds = {};
-    
-    //fills the allIds object, the object is used for checking if a parent exists in the array
-    pAttributes.forEach(function (row) {allIds[row[0]] = true;});
-    
-    var arrayIndex = 0;
-    
-    do {
-        var oldIndex = arrayIndex;
-        pAttributes.forEach(function (row)
-        {   
-            //item will be added if the id is not already in the object and
-            //the parent is already added (or the parent is not in the array)
-            if (!(row[0] in this) && (row[1] in this || !allIds[row[1]]))
-                this[row[0]] = {
-                    data : row,
-                    index : arrayIndex++
-                };
-        }, rows);
-    } while (oldIndex != arrayIndex); //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
-    
-    var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
-    var sortedArray = new Array(Object.keys(rows).length);
-    for (let i in rows)
-    {
-        let rowData = rows[i].data;
-        if (rowData[5].trim() != $AttributeTypes.COMBOVALUE)
-        {
-            let usages = db.array(db.COLUMN, SqlCondition.begin()
-                .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", rowData[0])
-                .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE")
-            );
-            rowData[7] = usages.join(", ");
-        }
-        var fullName = displaySimpleName 
-            ? rowData[8]
-            : _getFullName(rowData[8], rowData[9], rowData[10], rowData[11]);
-        rowData.splice(9, 3, fullName);
-        sortedArray[rows[i].index] = rowData;
-    }
-    
-    return sortedArray;
-}
-
-function _getFullName (pAttributeName, pParent1Name, pParent2Name, pParent3Id)
-{
-    var parent3FullName = pParent3Id ? AttributeUtil.getFullAttributeName(pParent3Id) : null;
-    pAttributeName = ArrayUtils.joinNonEmptyFields([parent3FullName, pParent2Name, pParent1Name, pAttributeName], " / ");
-    
-    return pAttributeName;
+import("Util_lib");
+import("JditoFilter_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+import("Attribute_lib");
+
+var uidTableAlias = "SELF";
+var sqlSelect = "select SELF.AB_ATTRIBUTEID, SELF.ATTRIBUTE_PARENT_ID, SELF.ATTRIBUTE_ACTIVE, SELF.KEYWORD_CONTAINER, SELF.SORTING, SELF.ATTRIBUTE_TYPE, " 
+    + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "SELF.ATTRIBUTE_TYPE") //3
+    + ", '', SELF.ATTRIBUTE_NAME, PARENT1.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_PARENT_ID " 
+    + "from AB_ATTRIBUTE SELF "
+    + "left join AB_ATTRIBUTE PARENT1 on SELF.ATTRIBUTE_PARENT_ID = PARENT1.AB_ATTRIBUTEID "    //always select the names of the next 2 parents so that less queries
+    + "left join AB_ATTRIBUTE PARENT2 ON PARENT1.ATTRIBUTE_PARENT_ID = PARENT2.AB_ATTRIBUTEID"; //are required later when buildung the full name
+
+var condition = SqlCondition.begin();
+var sqlOrder = " order by SELF.ATTRIBUTE_PARENT_ID asc, SELF.SORTING asc";
+
+var getGroups = vars.exists("$param.GetGroups_param") && vars.get("$param.GetGroups_param");
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+var parentType = vars.exists("$param.AttrParentType_param") && vars.get("$param.AttrParentType_param");
+
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+    condition.and("SELF.AB_ATTRIBUTEID in ('" + vars.get("$local.idvalues").join("','") + "')");
+}
+else if (getGroups) //if getGroups == true, it is the lookup for selecting the superordinate attribute
+{
+    //this condition filters out the own id and the children to prevent loops
+    
+    var isGroupCondition = SqlCondition.begin();
+    for (let type in $AttributeTypes)
+        if ($AttributeTypes[type].isGroup && $AttributeTypes[type] != $AttributeTypes.COMBO 
+            && (parentType == $AttributeTypes.VOID || $AttributeTypes[type] != $AttributeTypes.VOID))
+        {
+            isGroupCondition.orPrepare(["AB_ATTRIBUTE", "ATTRIBUTE_TYPE", uidTableAlias], $AttributeTypes[type]);
+        }
+    
+    condition.andSqlCondition(SqlCondition.begin()
+        .andSqlCondition(isGroupCondition)
+        .andPrepareVars(["AB_ATTRIBUTE", "AB_ATTRIBUTEID", uidTableAlias], "$param.AttrParentId_param", "# != ?")
+        .and("SELF.AB_ATTRIBUTEID not in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')")
+    );
+}
+else if (objectType)  //if there's an objectType, it comes from the AttributeRelation entity
+{
+    var filteredAttributes = [];
+    if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+        filteredAttributes = JSON.parse(vars.getString("$param.FilteredAttributeIds_param"));
+    var attributeCount;
+    if (vars.exists("$param.AttributeCount_param") && vars.get("$param.AttributeCount_param"))
+        attributeCount = JSON.parse(vars.getString("$param.AttributeCount_param"));
+    var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes, attributeCount);
+    condition.and("SELF.AB_ATTRIBUTEID in ('" + ids.join("','") + "')");
+} 
+else if (parentType)
+{
+    if (AttributeTypeUtil.isGroupType(parentType)) //condition for all subordinate attributes of an attribute
+    {
+        var parentId = vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param");
+        if (parentId)
+            condition.and("SELF.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')");
+    }
+    else
+        condition.and("1=2");
+}
+
+//when there are filters selected, add them to the conditon
+if (vars.exists("$local.filter") && vars.get("$local.filter"))
+{
+    var filter = vars.get("$local.filter");
+    condition.andSqlCondition(JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE", uidTableAlias));
+}
+
+var attributes = db.table(condition.buildSql(sqlSelect, "1=1", sqlOrder));
+
+result.object(_buildAttributeTable(attributes));
+
+
+//sorts the records in a way that a tree can be built and adds values
+function _buildAttributeTable (pAttributes) 
+{
+    var rows = {};
+    var allIds = {};
+    
+    //fills the allIds object, the object is used for checking if a parent exists in the array
+    pAttributes.forEach(function (row) {allIds[row[0]] = true;});
+    
+    var arrayIndex = 0;
+    
+    do {
+        var oldIndex = arrayIndex;
+        pAttributes.forEach(function (row)
+        {   
+            //item will be added if the id is not already in the object and
+            //the parent is already added (or the parent is not in the array)
+            if (!(row[0] in this) && (row[1] in this || !allIds[row[1]]))
+                this[row[0]] = {
+                    data : row,
+                    index : arrayIndex++
+                };
+        }, rows);
+    } while (oldIndex != arrayIndex); //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
+    
+    var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
+    var sortedArray = new Array(Object.keys(rows).length);
+    for (let i in rows)
+    {
+        let rowData = rows[i].data;
+        if (rowData[5].trim() != $AttributeTypes.COMBOVALUE)
+        {
+            let usages = db.array(db.COLUMN, SqlCondition.begin()
+                .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", rowData[0])
+                .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE")
+            );
+            rowData[7] = usages.join(", ");
+        }
+        var fullName = displaySimpleName 
+            ? rowData[8]
+            : _getFullName(rowData[8], rowData[9], rowData[10], rowData[11]);
+        rowData.splice(9, 3, fullName);
+        sortedArray[rows[i].index] = rowData;
+    }
+    
+    return sortedArray;
+}
+
+function _getFullName (pAttributeName, pParent1Name, pParent2Name, pParent3Id)
+{
+    var parent3FullName = pParent3Id ? AttributeUtil.getFullAttributeName(pParent3Id) : null;
+    pAttributeName = ArrayUtils.joinNonEmptyFields([parent3FullName, pParent2Name, pParent1Name, pAttributeName], " / ");
+    
+    return pAttributeName;
 }
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 38f72e10eb66d8eb188ed8c94c9e535c5eecc66f..800873cd8c2a6da9e65f336d672115f08b7f65e8 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,136 +1,136 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignAddParticipants_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Add participants to Campaign</title>
-  <afterOperatingState>%aditoprj%/entity/CampaignAddParticipants_entity/afterOperatingState.js</afterOperatingState>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>CAMPAIGN_ID</name>
-      <title>Campaign</title>
-      <consumer>CampaignConsumer</consumer>
-      <mandatory v="true" />
-      <state>AUTO</state>
-      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-        <element>RECORD</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>CAMPAIGNSTEP_ID</name>
-      <title>Campaign Step</title>
-      <consumer>CampaignStepConsumer</consumer>
-      <mandatory v="true" />
-      <state>EDITABLE</state>
-      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>campaignParticipantMessage</name>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>campaignParticipants_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>CampaignConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>CampaignProvider</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignStepConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>CampaignSteps</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepconsumer/children/campaignid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityParameter>
-      <name>currentCampaignId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>currentCampaignStepId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>isUpdate_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>CampaignAnalyses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignAnalysis_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignParticipants_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>campaignStepId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>campaignStepCurrentParticipantCount</name>
-      <title>Current participants</title>
-      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>campaignStepMaxParticipantCount</name>
-      <title>Max participants</title>
-      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>isUpdate</name>
-      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/isupdate/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignAddParticipants_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Add participants to Campaign</title>
+  <afterOperatingState>%aditoprj%/entity/CampaignAddParticipants_entity/afterOperatingState.js</afterOperatingState>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CAMPAIGN_ID</name>
+      <title>Campaign</title>
+      <consumer>CampaignConsumer</consumer>
+      <mandatory v="true" />
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+        <element>RECORD</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>CAMPAIGNSTEP_ID</name>
+      <title>Campaign Step</title>
+      <consumer>CampaignStepConsumer</consumer>
+      <mandatory v="true" />
+      <state>EDITABLE</state>
+      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>campaignParticipantMessage</name>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>campaignParticipants_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>CampaignConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>CampaignProvider</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignStepConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>CampaignSteps</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>campaignId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepconsumer/children/campaignid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityParameter>
+      <name>currentCampaignId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>currentCampaignStepId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>isUpdate_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>CampaignAnalyses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignAnalysis_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>campaignParticipants_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>campaignStepId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>campaignStepCurrentParticipantCount</name>
+      <title>Current participants</title>
+      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepcurrentparticipantcount/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>campaignStepMaxParticipantCount</name>
+      <title>Max participants</title>
+      <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>isUpdate</name>
+      <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/isupdate/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFields>
+        <element>UID.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
index 3926dcb0179f61124af461c499916761f2e5d7d4..93144d421b59f8981e8f61e400ac6dc8b1937d85 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
@@ -1,8 +1,8 @@
-import("system.result");
-import("system.translate");
-import("system.vars");
-
-var campaignParticipantsAmount = JSON.parse(vars.get("$param.campaignParticipants_param")).length;
-var informationText = translate.text("participants will be added to the selected campaign step");
-
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+var campaignParticipantsAmount = JSON.parse(vars.getString("$param.campaignParticipants_param")).length;
+var informationText = translate.text("participants will be added to the selected campaign step");
+
 result.string(campaignParticipantsAmount + " " + informationText);
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index eb25ee5cd22dd07388f368dccd60026236322807..95e7de1bd2d5f7fa8af91d9eb519a982af7bfc62 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,70 +1,70 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignAnalysis_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>afaa52b1-6e5b-46be-adef-e50f1394fcf8</name>
-          <entityName>CampaignAddParticipants_entity</entityName>
-          <fieldName>CampaignAnalyses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>LABEL</name>
-      <title>Count</title>
-    </entityField>
-    <entityField>
-      <name>COUNT</name>
-    </entityField>
-    <entityField>
-      <name>SORTING</name>
-    </entityField>
-    <entityProvider>
-      <name>CampaignAnalysisProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <children>
-        <entityParameter>
-          <name>campaignParticipants_param</name>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>campaignStepId_param</name>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>campaignStepId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>campaignParticipants_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>LABEL.value</element>
-        <element>COUNT.value</element>
-        <element>SORTING.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignAnalysis_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>afaa52b1-6e5b-46be-adef-e50f1394fcf8</name>
+          <entityName>CampaignAddParticipants_entity</entityName>
+          <fieldName>CampaignAnalyses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>LABEL</name>
+      <title>Count</title>
+    </entityField>
+    <entityField>
+      <name>COUNT</name>
+    </entityField>
+    <entityField>
+      <name>SORTING</name>
+    </entityField>
+    <entityProvider>
+      <name>CampaignAnalysisProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <children>
+        <entityParameter>
+          <name>campaignParticipants_param</name>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>campaignStepId_param</name>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>campaignStepId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>campaignParticipants_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>LABEL.value</element>
+        <element>COUNT.value</element>
+        <element>SORTING.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js
index b69be76651663e00d26f206a8aaa64a9e146c7bc..07cafe16476dac3ea5a797a680c999aacddd0505 100644
--- a/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js
@@ -1,29 +1,29 @@
-import("system.vars");
-import("system.logging");
-import("system.result");
-import("system.util");
-import("system.db");
-
-logging.log("CampaignAnalysis_RecordContainer");
-var ret = [];
-
-var campaignstepid = "b80588dd-4287-4fd7-85c1-7b86118ac4ff";//TODO: Refresh problem - vars.get("$param.campaignStepId_param");
-var newParticipants = JSON.parse(vars.get("$param.campaignParticipants_param")).length;
-
-var query = "select MAXPARTICIPANTS, count(CAMPAIGNPARTICIPANTID) from CAMPAIGNSTEP "
-          + "join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID = CAMPAIGNSTEP.CAMPAIGNSTEPID "
-          + "where CAMPAIGNSTEP_ID = '" + campaignstepid + "' "
-          + "group by CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID, MAXPARTICIPANTS";
-
-var maxCurrentParticipants = db.table(query);
-
-if(maxCurrentParticipants.length > 0)
-{
-    logging.log("hallo2");
-    ret[0] = [util.getNewUUID(), "Current participants", maxCurrentParticipants[0][1], 0];
-    ret[1] = [util.getNewUUID(), "New participants", newParticipants, 1];
-    logging.log(maxCurrentParticipants[0][0]);
-    ret[2] = [util.getNewUUID(), "Free participant slots", Number(maxCurrentParticipants[0][0]) - (Number(maxCurrentParticipants[0][1]) + Number(newParticipants)), 2];
-}
-
+import("system.vars");
+import("system.logging");
+import("system.result");
+import("system.util");
+import("system.db");
+
+logging.log("CampaignAnalysis_RecordContainer");
+var ret = [];
+
+var campaignstepid = "b80588dd-4287-4fd7-85c1-7b86118ac4ff";//TODO: Refresh problem - vars.get("$param.campaignStepId_param");
+var newParticipants = JSON.parse(vars.getString("$param.campaignParticipants_param")).length;
+
+var query = "select MAXPARTICIPANTS, count(CAMPAIGNPARTICIPANTID) from CAMPAIGNSTEP "
+          + "join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID = CAMPAIGNSTEP.CAMPAIGNSTEPID "
+          + "where CAMPAIGNSTEP_ID = '" + campaignstepid + "' "
+          + "group by CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID, MAXPARTICIPANTS";
+
+var maxCurrentParticipants = db.table(query);
+
+if(maxCurrentParticipants.length > 0)
+{
+    logging.log("hallo2");
+    ret[0] = [util.getNewUUID(), "Current participants", maxCurrentParticipants[0][1], 0];
+    ret[1] = [util.getNewUUID(), "New participants", newParticipants, 1];
+    logging.log(maxCurrentParticipants[0][0]);
+    ret[2] = [util.getNewUUID(), "Free participant slots", Number(maxCurrentParticipants[0][0]) - (Number(maxCurrentParticipants[0][1]) + Number(newParticipants)), 2];
+}
+
 result.object(ret);
\ No newline at end of file
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index f8f7d3935e46c9f3e1f25fa1fed87fa45689f723..71b3acdcd4aa2a69e7248a78a5366463ce58584f 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,56 +1,56 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignCostChart_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>PARENT</name>
-    </entityField>
-    <entityField>
-      <name>X</name>
-      <title>Cost</title>
-    </entityField>
-    <entityField>
-      <name>Y</name>
-    </entityField>
-    <entityParameter>
-      <name>CampaignId_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>CostChart</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>e519262b-ff42-4c26-9d28-4d9566eafcdc</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignCostsChart</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT.value</element>
-        <element>X.value</element>
-        <element>X.displayValue</element>
-        <element>Y.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignCostChart_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+    </entityField>
+    <entityField>
+      <name>X</name>
+      <title>Cost</title>
+    </entityField>
+    <entityField>
+      <name>Y</name>
+    </entityField>
+    <entityParameter>
+      <name>CampaignId_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>CostChart</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>e519262b-ff42-4c26-9d28-4d9566eafcdc</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignCostsChart</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>PARENT.value</element>
+        <element>X.value</element>
+        <element>X.displayValue</element>
+        <element>Y.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
index b41e4f7595bd432b63e8fec27778932feef64eca..aeb86346941453fb5f0adb74ead4be18fa276011 100644
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
@@ -1,304 +1,304 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignCost_entitiy</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <afterOperatingState>%aditoprj%/entity/CampaignCost_entitiy/afterOperatingState.js</afterOperatingState>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>CAMPAIGNCOSTID</name>
-      <mandatory v="true" />
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CAMPAIGN_ID</name>
-      <title>Campaign</title>
-      <consumer>Campaigns</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CAMPAIGNSTEP_ID</name>
-      <title>Campaign Step</title>
-      <consumer>CampaignSteps</consumer>
-      <mandatoryProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js</mandatoryProcess>
-      <groupable v="true" />
-      <stateProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>CATEGORY</name>
-      <title>Category</title>
-      <consumer>KeywordCampaignManagementCostCategory</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>NET</name>
-      <title>Cost</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <mandatory v="true" />
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <mandatory v="true" />
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>CampaignCosts</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignCosts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>CampaignStepId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>Uid_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignSteps_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityProvider>
-      <name>StepCosts</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>CampaignStepCosts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignStepCosts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>CampaignStepId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Uid_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignSteps_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Campaigns</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>CampaignProvider</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>CampaignSteps</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordCampaignManagementCostCategory</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedKeyIdsSubquery_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>edit</name>
-          <fieldType>ACTION</fieldType>
-          <onActionProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>NEON:PENCIL</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityParameter>
-      <name>CampaignId_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>CampaignStepId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>Uid_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>netPerParticipant</name>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <titleProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>countParticipants</name>
-      <title>Participants</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#0</outputFormat>
-      <inputFormat>#0</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>CampaignSteps_param</name>
-      <title></title>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>70c2db20-0695-4189-92cb-7da585bff401</name>
-          <tableName>CAMPAIGNCOST</tableName>
-          <primaryKey>CAMPAIGNCOSTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>b97b7f67-86ea-4d0a-8303-abc05863ed66</name>
-          <tableName>CAMPAIGNSTEP</tableName>
-          <primaryKey>CAMPAIGNSTEPID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGN_ID.value</name>
-          <recordfield>CAMPAIGNCOST.CAMPAIGN_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNCOSTID.value</name>
-          <recordfield>CAMPAIGNCOST.CAMPAIGNCOSTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNSTEP_ID.value</name>
-          <recordfield>CAMPAIGNCOST.CAMPAIGNSTEP_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CATEGORY.value</name>
-          <recordfield>CAMPAIGNCOST.CATEGORY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>CAMPAIGNCOST.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>CAMPAIGNCOST.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NET.value</name>
-          <recordfield>CAMPAIGNCOST.NET</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>CAMPAIGNCOST.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>CAMPAIGNCOST.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CATEGORY.displayValue</name>
-          <expression>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignCost_entitiy</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <afterOperatingState>%aditoprj%/entity/CampaignCost_entitiy/afterOperatingState.js</afterOperatingState>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CAMPAIGNCOSTID</name>
+      <mandatory v="true" />
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CAMPAIGN_ID</name>
+      <title>Campaign</title>
+      <consumer>Campaigns</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CAMPAIGNSTEP_ID</name>
+      <title>Campaign Step</title>
+      <consumer>CampaignSteps</consumer>
+      <mandatoryProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js</mandatoryProcess>
+      <groupable v="true" />
+      <stateProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+      <title>Category</title>
+      <consumer>KeywordCampaignManagementCostCategory</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>NET</name>
+      <title>Cost</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <mandatory v="true" />
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <mandatory v="true" />
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>CampaignCosts</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignCosts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>CampaignStepId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Uid_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignSteps_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityProvider>
+      <name>StepCosts</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>CampaignStepCosts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignStepCosts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>CampaignStepId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Uid_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignSteps_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Campaigns</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>CampaignProvider</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>CampaignSteps</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordCampaignManagementCostCategory</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedKeyIdsSubquery_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionGroup>
+      <name>alter</name>
+      <children>
+        <entityActionField>
+          <name>edit</name>
+          <fieldType>ACTION</fieldType>
+          <onActionProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>NEON:PENCIL</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityParameter>
+      <name>CampaignId_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>CampaignStepId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>Uid_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>netPerParticipant</name>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <titleProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>countParticipants</name>
+      <title>Participants</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#0</outputFormat>
+      <inputFormat>#0</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>CampaignSteps_param</name>
+      <title></title>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>70c2db20-0695-4189-92cb-7da585bff401</name>
+          <tableName>CAMPAIGNCOST</tableName>
+          <primaryKey>CAMPAIGNCOSTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>b97b7f67-86ea-4d0a-8303-abc05863ed66</name>
+          <tableName>CAMPAIGNSTEP</tableName>
+          <primaryKey>CAMPAIGNSTEPID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGN_ID.value</name>
+          <recordfield>CAMPAIGNCOST.CAMPAIGN_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNCOSTID.value</name>
+          <recordfield>CAMPAIGNCOST.CAMPAIGNCOSTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNSTEP_ID.value</name>
+          <recordfield>CAMPAIGNCOST.CAMPAIGNSTEP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CATEGORY.value</name>
+          <recordfield>CAMPAIGNCOST.CATEGORY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CAMPAIGNCOST.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CAMPAIGNCOST.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NET.value</name>
+          <recordfield>CAMPAIGNCOST.NET</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CAMPAIGNCOST.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CAMPAIGNCOST.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CATEGORY.displayValue</name>
+          <expression>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 89163bc7bbca3088afad5b79b1204efbe4e69b3c..2232e4aad3d5a1395020aa48d404efc634da2caa 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,57 +1,57 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignParticipantChart_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>ParticipantChart</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>59e7c7ff-a649-4efe-89dd-8fdb7967261b</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignParticipantsChart</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>X</name>
-      <title>Step</title>
-    </entityField>
-    <entityField>
-      <name>Y</name>
-    </entityField>
-    <entityField>
-      <name>CATEGORY</name>
-    </entityField>
-    <entityParameter>
-      <name>CampaignId_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>CATEGORY.value</element>
-        <element>CATEGORY.displayValue</element>
-        <element>X.value</element>
-        <element>X.displayValue</element>
-        <element>Y.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignParticipantChart_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>ParticipantChart</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>59e7c7ff-a649-4efe-89dd-8fdb7967261b</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignParticipantsChart</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>X</name>
+      <title>Step</title>
+    </entityField>
+    <entityField>
+      <name>Y</name>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+    </entityField>
+    <entityParameter>
+      <name>CampaignId_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>CATEGORY.value</element>
+        <element>CATEGORY.displayValue</element>
+        <element>X.value</element>
+        <element>X.displayValue</element>
+        <element>Y.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
index be6086f888f198730a59efa2ec6b0773a89775d9..e91aa7f117f5d272e386e09c2227d153d5fdb793 100644
--- a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
@@ -1,55 +1,66 @@
-import("system.translate");
-import("system.result");
-import("system.db");
-import("Sql_lib");
-import("system.vars");
-
-var campaignId = vars.get("$param.CampaignId_param");
-
-var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOGID) "
-    + "from CAMPAIGNSTEP left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID "
-    + "left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID ";
-var sqlGroupOrderBy = "group by CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, MAXPARTICIPANTS, CAMPAIGNSTEP.SORTING order by CAMPAIGNSTEP.SORTING";
-
-var sqlQuery = SqlCondition.begin()
-    .andPrepare("CAMPAIGNSTEP.CAMPAIGN_ID", campaignId)
-    .buildSql(sqlSelect, "1=2", sqlGroupOrderBy);
-
-var stepData = db.table(sqlQuery);
-
-var categories = {
-    CURRENT : "CURRENT",
-    MAX : "MAX",
-    LOGGED : "LOGGED"
-};
-var records = [];
-
-stepData.forEach(function ([stepId, stepName, currentCount, maxCount, loggedCount]) 
-{
-    records.push([
-        stepId + categories.CURRENT,
-        categories.CURRENT,
-        translate.text("Current participants"),
-        stepId,
-        stepName,
-        currentCount || 0,
-    ]);
-    records.push([
-        stepId + categories.MAX,
-        categories.MAX,
-        translate.text("Max participants"),
-        stepId,
-        stepName,
-        maxCount || 0,
-    ]);
-    records.push([
-        stepId + categories.LOGGED,
-        categories.LOGGED,
-        translate.text("Participated"),
-        stepId,
-        stepName,
-        loggedCount || 0,
-    ]);
-});
-
+import("system.translate");
+import("system.result");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+
+var campaignId = vars.get("$param.CampaignId_param");
+
+var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOG.CAMPAIGNPARTICIPANT_ID) \n\
+    from CAMPAIGNSTEP \n\
+    left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID \n\
+    left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID \n\
+    and exists ( \n\
+		select 1 \n\
+		from CAMPAIGNPARTICIPANTLOG NEXTSTEPLOG \n\
+		join CAMPAIGNSTEP NEXTSTEP on NEXTSTEPLOG.CAMPAIGNSTEP_ID = NEXTSTEP.CAMPAIGNSTEPID \n\
+		where CAMPAIGNSTEP.CAMPAIGNSTEPID != NEXTSTEP.CAMPAIGNSTEPID \n\
+                        and NEXTSTEPLOG.CAMPAIGNPARTICIPANT_ID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNPARTICIPANT_ID \n\
+			and NEXTSTEP.CAMPAIGN_ID = CAMPAIGNSTEP.CAMPAIGN_ID \n\
+			and NEXTSTEP.SORTING > CAMPAIGNSTEP.SORTING \n\
+                        and NEXTSTEPLOG.DATE_NEW >= CAMPAIGNPARTICIPANTLOG.DATE_NEW \n\
+		)";
+var sqlGroupOrderBy = "group by CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, MAXPARTICIPANTS, CAMPAIGNSTEP.SORTING order by CAMPAIGNSTEP.SORTING";
+
+var sqlQuery = SqlCondition.begin()
+    .andPrepare("CAMPAIGNSTEP.CAMPAIGN_ID", campaignId)
+    .buildSql(sqlSelect, "1=2", sqlGroupOrderBy);
+
+var stepData = db.table(sqlQuery);
+
+var categories = {
+    CURRENT : "CURRENT",
+    MAX : "MAX",
+    LOGGED : "LOGGED"
+};
+var records = [];
+
+stepData.forEach(function ([stepId, stepName, currentCount, maxCount, loggedCount]) 
+{
+    records.push([
+        stepId + categories.CURRENT,
+        categories.CURRENT,
+        translate.text("Current participants"),
+        stepId,
+        stepName,
+        currentCount || 0,
+    ]);
+    records.push([
+        stepId + categories.MAX,
+        categories.MAX,
+        translate.text("Max participants"),
+        stepId,
+        stepName,
+        maxCount || 0,
+    ]);
+    records.push([
+        stepId + categories.LOGGED,
+        categories.LOGGED,
+        translate.text("Participated"),
+        stepId,
+        stepName,
+        loggedCount || 0,
+    ]);
+});
+
 result.object(records);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 7593a832cd53735bb66e720ab6e96de8d31c5722..879a6ba5af3625de37d13a8455606c69de92cb8d 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,244 +1,244 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignParticipant_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Participant</title>
-  <afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState>
-  <titlePlural>Participants</titlePlural>
-  <recordContainer>ParticipantsDbRecordContainer</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>CampaignParticipantsProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>CONTACTCONTEXT</targetContextField>
-      <targetIdField>CONTACT_ID</targetIdField>
-      <dependencies>
-        <entityDependency>
-          <name>f28945cd-4613-4dfa-91f7-a7d9d64cef58</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignParticipants</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>7ad08378-b36f-4512-8891-db727c6ddcd7</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>CampaignParticipantsConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignStepId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>CampaignStepId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>CampaignId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>CAMPAIGNPARTICIPANTID</name>
-      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignparticipantid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CAMPAIGN_ID</name>
-      <title>Campaign</title>
-      <consumer>CampaignsConsumer</consumer>
-      <mandatory v="true" />
-      <state>EDITABLE</state>
-      <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>CAMPAIGNSTEP_ID</name>
-      <title>Campaign Step</title>
-      <consumer>CampaignSteps</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <state>EDITABLE</state>
-      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>CampaignsConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>CampaignProvider</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Participant</title>
-      <consumer>AnyContacts</consumer>
-      <linkedContextProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <state>READONLY</state>
-      <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-    </entityField>
-    <entityConsumer>
-      <name>AnyContacts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>CampaignSteps</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>CONTACTCONTEXT</name>
-      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contactcontext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityActionGroup>
-      <name>FilterViewActionGroup</name>
-      <children>
-        <entityActionField>
-          <name>SetStepToParticipantSelection</name>
-          <fieldType>ACTION</fieldType>
-          <title>Set campaign step</title>
-          <onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js</onActionProcess>
-          <isObjectAction v="false" />
-          <isSelectionAction v="true" />
-          <iconId>NEON:GROUP_APPOINTMENT</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityField>
-      <name>campaignStepCurrentParticipantCount</name>
-      <title>Current participants</title>
-      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepcurrentparticipantcount/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>campaignStepMaxParticipantCount</name>
-      <title>Max participants</title>
-      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>ParticipantsDbRecordContainer</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js</conditionProcess>
-      <onDBInsert>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/onDBInsert.js</onDBInsert>
-      <linkInformation>
-        <linkInformation>
-          <name>12b5bf2e-e376-4c40-9799-fb07961a455d</name>
-          <tableName>CAMPAIGNPARTICIPANT</tableName>
-          <primaryKey>CAMPAIGNPARTICIPANTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNPARTICIPANT_ID.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGN_ID.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGN_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNPARTICIPANTID.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNSTEP_ID.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>CAMPAIGNPARTICIPANT.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignParticipant_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Participant</title>
+  <afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState>
+  <titlePlural>Participants</titlePlural>
+  <recordContainer>ParticipantsDbRecordContainer</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>CampaignParticipantsProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>CONTACTCONTEXT</targetContextField>
+      <targetIdField>CONTACT_ID</targetIdField>
+      <dependencies>
+        <entityDependency>
+          <name>f28945cd-4613-4dfa-91f7-a7d9d64cef58</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignParticipants</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7ad08378-b36f-4512-8891-db727c6ddcd7</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>CampaignParticipantsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignStepId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>CampaignStepId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>CampaignId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>CAMPAIGNPARTICIPANTID</name>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignparticipantid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CAMPAIGN_ID</name>
+      <title>Campaign</title>
+      <consumer>CampaignsConsumer</consumer>
+      <mandatory v="true" />
+      <state>EDITABLE</state>
+      <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>CAMPAIGNSTEP_ID</name>
+      <title>Campaign Step</title>
+      <consumer>CampaignSteps</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <state>EDITABLE</state>
+      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>CampaignsConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>CampaignProvider</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Participant</title>
+      <consumer>AnyContacts</consumer>
+      <linkedContextProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+    </entityField>
+    <entityConsumer>
+      <name>AnyContacts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>CampaignSteps</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>campaignId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CONTACTCONTEXT</name>
+      <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contactcontext/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionGroup>
+      <name>FilterViewActionGroup</name>
+      <children>
+        <entityActionField>
+          <name>SetStepToParticipantSelection</name>
+          <fieldType>ACTION</fieldType>
+          <title>Set campaign step</title>
+          <onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>NEON:GROUP_APPOINTMENT</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityField>
+      <name>campaignStepCurrentParticipantCount</name>
+      <title>Current participants</title>
+      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepcurrentparticipantcount/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>campaignStepMaxParticipantCount</name>
+      <title>Max participants</title>
+      <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstepmaxparticipantcount/displayValueProcess.js</displayValueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>ParticipantsDbRecordContainer</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js</conditionProcess>
+      <onDBInsert>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/onDBInsert.js</onDBInsert>
+      <linkInformation>
+        <linkInformation>
+          <name>12b5bf2e-e376-4c40-9799-fb07961a455d</name>
+          <tableName>CAMPAIGNPARTICIPANT</tableName>
+          <primaryKey>CAMPAIGNPARTICIPANTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNPARTICIPANT_ID.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGN_ID.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGN_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNPARTICIPANTID.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNSTEP_ID.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CAMPAIGNPARTICIPANT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
index e34d4045db71cb267f4bcce4feef3900ff2bfbab..5c0b77f8819d8c7ff522a3d6b911cd45bc6c54ce 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
@@ -1,14 +1,14 @@
-import("system.logging");
-import("system.vars");
-import("system.neon");
-import("Campaign_lib");
-logging.log("inOnAction -> ");
-    logging.log("sys selection -> " + vars.get("$sys.selection"));
-if(vars.exists("$sys.selection")) //selektierte IDs als Array
-{
-    logging.log("campaignid -> " + vars.get("$field.CAMPAIGN_ID"));
-    logging.log("campaignstepid -> " + vars.get("$field.CAMPAIGNSTEP_ID"));
-    logging.log("contact id -> " + vars.get("$field.CONTACT_ID"));
-    logging.log("sys selection -> " + vars.get("$sys.selection"));
-    CampaignUtils.openSetCampaignStepView(vars.get("$sys.selection"), vars.get("$field.CAMPAIGN_ID"), vars.get("$field.CAMPAIGNSTEP_ID"));
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("Campaign_lib");
+logging.log("inOnAction -> ");
+    logging.log("sys selection -> " + vars.getString("$sys.selection"));
+if(vars.exists("$sys.selection")) //selektierte IDs als Array
+{
+    logging.log("campaignid -> " + vars.get("$field.CAMPAIGN_ID"));
+    logging.log("campaignstepid -> " + vars.get("$field.CAMPAIGNSTEP_ID"));
+    logging.log("contact id -> " + vars.get("$field.CONTACT_ID"));
+    logging.log("sys selection -> " + vars.getString("$sys.selection"));
+    CampaignUtils.openSetCampaignStepView(vars.getString("$sys.selection"), vars.get("$field.CAMPAIGN_ID"), vars.get("$field.CAMPAIGNSTEP_ID"));
 }
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index b4d10e5625c43c688822a315c06391be43c72626..3deaac46c3725d3856c46406a4a3509d020c2dc9 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,403 +1,403 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>CampaignStep_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>NEON:GROUP_APPOINTMENT</icon>
-  <title>Campaign Step</title>
-  <contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
-  <imageProcess>%aditoprj%/entity/CampaignStep_entity/imageProcess.js</imageProcess>
-  <titlePlural>Steps</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>13f82959-7e04-449f-a657-c34f6b97f3be</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>CampaignSteps</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>CAMPAIGNSTEPID</name>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CAMPAIGN_ID</name>
-      <title>Campaign</title>
-      <consumer>CampaignConsumer</consumer>
-      <linkedContext>Campaign</linkedContext>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>EMPLOYEE_CONTACT_ID</name>
-      <title>Zuständiger</title>
-      <consumer>Employees</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>DATE_START</name>
-      <title>Beginn</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js</onValueChange>
-      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>DATE_END</name>
-      <title>Ende</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>STATE</name>
-      <title>Status</title>
-      <consumer>KeywordStates</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/state/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>SORTING</name>
-      <title>Reihenfolge</title>
-      <contentType>NUMBER</contentType>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/sorting/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>CampaignSteps</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>421e6cc2-f874-4834-b022-fe1b253d50af</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignSteps</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>7f1c046b-0e8f-429e-a0a6-3322382c61d4</name>
-          <entityName>CampaignParticipant_entity</entityName>
-          <fieldName>CampaignSteps</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>eedc7b17-af98-4ffb-b527-97835cf8f903</name>
-          <entityName>CampaignAddParticipants_entity</entityName>
-          <fieldName>CampaignStepConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>ad4ee503-95b9-4add-a0ef-e833db008349</name>
-          <entityName>CampaignCost_entitiy</entityName>
-          <fieldName>CampaignSteps</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3fde1e51-cc4c-4727-b4e7-fd30bed1ee04</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignStepsReadonly</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>campaignId_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="false" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>campaignId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>MAXPARTICIPANTS</name>
-      <title>Max participants</title>
-      <contentType>NUMBER</contentType>
-      <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/maxparticipants/onValidation.js</onValidation>
-    </entityField>
-    <entityConsumer>
-      <name>CampaignParticipantsConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignParticipant_entity</entityName>
-        <fieldName>CampaignParticipantsProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignStepId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>CurrentMaxParticipantsInfo</name>
-      <title>Participants</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/currentmaxparticipantsinfo/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CampaignStatus</name>
-      <title>Campaign status</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstatus/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityConsumer>
-      <name>Employees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignStepCosts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignCost_entitiy</entityName>
-        <fieldName>StepCosts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepcosts/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignStepId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepcosts/children/campaignstepid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>COST</name>
-      <title>Cost</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-    </entityField>
-    <entityConsumer>
-      <name>CampaignConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>CampaignProvider</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <title>Activities</title>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <title>Tasks</title>
-      <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>b1b09ce7-82a2-41fd-9b20-1fd5235f8f30</name>
-          <tableName>CAMPAIGNSTEP</tableName>
-          <primaryKey>CAMPAIGNSTEPID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGN_ID.value</name>
-          <recordfield>CAMPAIGNSTEP.CAMPAIGN_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>CAMPAIGNSTEP.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_END.value</name>
-          <recordfield>CAMPAIGNSTEP.DATE_END</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>CAMPAIGNSTEP.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_START.value</name>
-          <recordfield>CAMPAIGNSTEP.DATE_START</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>EMPLOYEE_CONTACT_ID.value</name>
-          <recordfield>CAMPAIGNSTEP.EMPLOYEE_CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME.value</name>
-          <recordfield>CAMPAIGNSTEP.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SORTING.value</name>
-          <recordfield>CAMPAIGNSTEP.SORTING</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.value</name>
-          <recordfield>CAMPAIGNSTEP.STATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>CAMPAIGNSTEP.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>CAMPAIGNSTEP.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.displayValue</name>
-          <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MAXPARTICIPANTS.value</name>
-          <recordfield>CAMPAIGNSTEP.MAXPARTICIPANTS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNSTEPID.value</name>
-          <recordfield>CAMPAIGNSTEP.CAMPAIGNSTEPID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DESCRIPTION.value</name>
-          <recordfield>CAMPAIGNSTEP.DESCRIPTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COST.value</name>
-          <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGN_ID.displayValue</name>
-          <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>CampaignStep_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:GROUP_APPOINTMENT</icon>
+  <title>Campaign Step</title>
+  <contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
+  <imageProcess>%aditoprj%/entity/CampaignStep_entity/imageProcess.js</imageProcess>
+  <titlePlural>Steps</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>13f82959-7e04-449f-a657-c34f6b97f3be</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>CampaignSteps</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CAMPAIGNSTEPID</name>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CAMPAIGN_ID</name>
+      <title>Campaign</title>
+      <consumer>CampaignConsumer</consumer>
+      <linkedContext>Campaign</linkedContext>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEE_CONTACT_ID</name>
+      <title>Zuständiger</title>
+      <consumer>Employees</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DATE_START</name>
+      <title>Beginn</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js</onValueChange>
+      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>DATE_END</name>
+      <title>Ende</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>Status</title>
+      <consumer>KeywordStates</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/state/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SORTING</name>
+      <title>Reihenfolge</title>
+      <contentType>NUMBER</contentType>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/sorting/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>CampaignSteps</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>421e6cc2-f874-4834-b022-fe1b253d50af</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignSteps</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7f1c046b-0e8f-429e-a0a6-3322382c61d4</name>
+          <entityName>CampaignParticipant_entity</entityName>
+          <fieldName>CampaignSteps</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>eedc7b17-af98-4ffb-b527-97835cf8f903</name>
+          <entityName>CampaignAddParticipants_entity</entityName>
+          <fieldName>CampaignStepConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>ad4ee503-95b9-4add-a0ef-e833db008349</name>
+          <entityName>CampaignCost_entitiy</entityName>
+          <fieldName>CampaignSteps</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3fde1e51-cc4c-4727-b4e7-fd30bed1ee04</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignStepsReadonly</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>campaignId_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="false" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>campaignId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>MAXPARTICIPANTS</name>
+      <title>Max participants</title>
+      <contentType>NUMBER</contentType>
+      <mandatory v="true" />
+      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/maxparticipants/onValidation.js</onValidation>
+    </entityField>
+    <entityConsumer>
+      <name>CampaignParticipantsConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignParticipant_entity</entityName>
+        <fieldName>CampaignParticipantsProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignStepId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CurrentMaxParticipantsInfo</name>
+      <title>Participants</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/currentmaxparticipantsinfo/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CampaignStatus</name>
+      <title>Campaign status</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstatus/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityConsumer>
+      <name>Employees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignStepCosts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignCost_entitiy</entityName>
+        <fieldName>StepCosts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepcosts/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignStepId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepcosts/children/campaignstepid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>COST</name>
+      <title>Cost</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+    </entityField>
+    <entityConsumer>
+      <name>CampaignConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>CampaignProvider</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <title>Activities</title>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <title>Tasks</title>
+      <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>b1b09ce7-82a2-41fd-9b20-1fd5235f8f30</name>
+          <tableName>CAMPAIGNSTEP</tableName>
+          <primaryKey>CAMPAIGNSTEPID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGN_ID.value</name>
+          <recordfield>CAMPAIGNSTEP.CAMPAIGN_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CAMPAIGNSTEP.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_END.value</name>
+          <recordfield>CAMPAIGNSTEP.DATE_END</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CAMPAIGNSTEP.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_START.value</name>
+          <recordfield>CAMPAIGNSTEP.DATE_START</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.value</name>
+          <recordfield>CAMPAIGNSTEP.EMPLOYEE_CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>CAMPAIGNSTEP.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SORTING.value</name>
+          <recordfield>CAMPAIGNSTEP.SORTING</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <recordfield>CAMPAIGNSTEP.STATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CAMPAIGNSTEP.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CAMPAIGNSTEP.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.displayValue</name>
+          <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAXPARTICIPANTS.value</name>
+          <recordfield>CAMPAIGNSTEP.MAXPARTICIPANTS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNSTEPID.value</name>
+          <recordfield>CAMPAIGNSTEP.CAMPAIGNSTEPID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>CAMPAIGNSTEP.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COST.value</name>
+          <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGN_ID.displayValue</name>
+          <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 9ebe07ca30152ec333da43e2b0288801a5443396..8eef06dd4117e010c12cebccdab7227b932a3d17 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,436 +1,437 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Campaign_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:GROUP</icon>
-  <title>Campaign</title>
-  <contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit>
-  <imageProcess>%aditoprj%/entity/Campaign_entity/imageProcess.js</imageProcess>
-  <titlePlural>Campaigns</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>8db36fa6-e799-488c-882f-1141f781c9dc</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Campaigns</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>CAMPAIGNID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>DATE_START</name>
-      <title>Beginn</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.YYYY</outputFormat>
-      <inputFormat>dd.MM.YYYY</inputFormat>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_END</name>
-      <title>Ende</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.YYYY</outputFormat>
-      <inputFormat>dd.MM.YYYY</inputFormat>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_end/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>EMPLOYEE_CONTACT_ID</name>
-      <title>Hauptverantw.</title>
-      <consumer>Employee</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <contentType>DATE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <contentType>DATE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <state>EDITABLE</state>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>CampaignSteps</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="false" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>STATE</name>
-      <title>Status</title>
-      <consumer>KeywordStates</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/state/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>CampaignProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>7cb37ad1-a0a9-41bc-9a9e-7207317cd812</name>
-          <entityName>CampaignParticipant_entity</entityName>
-          <fieldName>CampaignsConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>918b744c-4bd5-4ae0-9a09-5ecf1927b8f6</name>
-          <entityName>CampaignAddParticipants_entity</entityName>
-          <fieldName>CampaignConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>d238b02c-75e7-4cf4-b90c-bb36d41ae90f</name>
-          <entityName>CampaignCost_entitiy</entityName>
-          <fieldName>Campaigns</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>92ec68f6-2ff5-4f15-9001-6297a6d5790d</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>CampaignConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityConsumer>
-      <name>CampaignParticipants</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignParticipant_entity</entityName>
-        <fieldName>CampaignParticipantsProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignStepId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignparticipants/children/campaignid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Employee</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignCosts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignCost_entitiy</entityName>
-        <fieldName>CampaignCosts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncosts/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>COST</name>
-      <title>Cost</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-    </entityField>
-    <entityConsumer>
-      <name>CampaignStepCosts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignCost_entitiy</entityName>
-        <fieldName>StepCosts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepcosts/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>stepCount</name>
-      <title>Steps</title>
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/stepcount/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>participantCount</name>
-      <title>Participants</title>
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/participantcount/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <title>Activities</title>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <title>Tasks</title>
-      <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>CampaignCostsChart</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <title>Charts</title>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignCostChart_entity</entityName>
-        <fieldName>CostChart</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignParticipantsChart</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <title>Chart 2</title>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignParticipantChart_entity</entityName>
-        <fieldName>ParticipantChart</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>remainingRuntime</name>
-      <title>Remaining Runtime</title>
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>CampaignStepsReadonly</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <state>READONLY</state>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>CampaignSteps</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <onDBInsert>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBDelete>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>f3893829-3af2-4e55-ae85-c3a24411a8b8</name>
-          <tableName>CAMPAIGN</tableName>
-          <primaryKey>CAMPAIGNID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>CAMPAIGN.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>CAMPAIGN.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DESCRIPTION.value</name>
-          <recordfield>CAMPAIGN.DESCRIPTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>EMPLOYEE_CONTACT_ID.value</name>
-          <recordfield>CAMPAIGN.EMPLOYEE_CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME.value</name>
-          <recordfield>CAMPAIGN.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>CAMPAIGN.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>CAMPAIGN.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.value</name>
-          <recordfield>CAMPAIGN.STATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.displayValue</name>
-          <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAMPAIGNID.value</name>
-          <recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COST.value</name>
-          <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Campaign_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GROUP</icon>
+  <title>Campaign</title>
+  <contentTitleProcess>%aditoprj%/entity/Campaign_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Campaign_entity/afterUiInit.js</afterUiInit>
+  <imageProcess>%aditoprj%/entity/Campaign_entity/imageProcess.js</imageProcess>
+  <titlePlural>Campaigns</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>8db36fa6-e799-488c-882f-1141f781c9dc</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Campaigns</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CAMPAIGNID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DATE_START</name>
+      <title>Beginn</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.YYYY</outputFormat>
+      <inputFormat>dd.MM.YYYY</inputFormat>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_END</name>
+      <title>Ende</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.YYYY</outputFormat>
+      <inputFormat>dd.MM.YYYY</inputFormat>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_end/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEE_CONTACT_ID</name>
+      <title>Hauptverantw.</title>
+      <consumer>Employee</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <contentType>DATE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <contentType>DATE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>EDITABLE</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>CampaignSteps</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>campaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="false" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>STATE</name>
+      <title>Status</title>
+      <consumer>KeywordStates</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/state/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>CampaignProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7cb37ad1-a0a9-41bc-9a9e-7207317cd812</name>
+          <entityName>CampaignParticipant_entity</entityName>
+          <fieldName>CampaignsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>918b744c-4bd5-4ae0-9a09-5ecf1927b8f6</name>
+          <entityName>CampaignAddParticipants_entity</entityName>
+          <fieldName>CampaignConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>d238b02c-75e7-4cf4-b90c-bb36d41ae90f</name>
+          <entityName>CampaignCost_entitiy</entityName>
+          <fieldName>Campaigns</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>92ec68f6-2ff5-4f15-9001-6297a6d5790d</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>CampaignConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityConsumer>
+      <name>CampaignParticipants</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignParticipant_entity</entityName>
+        <fieldName>CampaignParticipantsProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignStepId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignparticipants/children/campaignid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Employee</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignCosts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignCost_entitiy</entityName>
+        <fieldName>CampaignCosts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncosts/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>COST</name>
+      <title>Cost</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+    </entityField>
+    <entityConsumer>
+      <name>CampaignStepCosts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignCost_entitiy</entityName>
+        <fieldName>StepCosts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepcosts/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>stepCount</name>
+      <title>Steps</title>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/stepcount/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>participantCount</name>
+      <title>Participants</title>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/participantcount/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <title>Activities</title>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <title>Tasks</title>
+      <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>CampaignCostsChart</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <title>Charts</title>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignCostChart_entity</entityName>
+        <fieldName>CostChart</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignParticipantsChart</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <title>Chart 2</title>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignParticipantChart_entity</entityName>
+        <fieldName>ParticipantChart</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>remainingRuntime</name>
+      <title>Remaining Runtime</title>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>CampaignStepsReadonly</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>READONLY</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>CampaignSteps</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>campaignId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Campaign_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <onDBInsert>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBDelete>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>f3893829-3af2-4e55-ae85-c3a24411a8b8</name>
+          <tableName>CAMPAIGN</tableName>
+          <primaryKey>CAMPAIGNID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CAMPAIGN.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CAMPAIGN.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>CAMPAIGN.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.value</name>
+          <recordfield>CAMPAIGN.EMPLOYEE_CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>CAMPAIGN.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CAMPAIGN.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CAMPAIGN.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <recordfield>CAMPAIGN.STATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.displayValue</name>
+          <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAMPAIGNID.value</name>
+          <recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COST.value</name>
+          <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Campaign_entity/entityfields/attributes/onValidation.js b/entity/Campaign_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..96ef4534e9a503e2f7c6fefccd0d7fab815603c8
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -0,0 +1,59 @@
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ClassificationAdmin_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:LIST_OL</icon>
+  <title>Classification</title>
+  <titlePlural>Classifications</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <consumer>KeywordClassificationTypes</consumer>
+      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ClassificationsAdmin</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Classification_entity</entityName>
+        <fieldName>ClassificationsAdministration</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationType_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordClassificationTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16c85500b5355a72548030867e3d300661e9d4aa
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationsadmin/children/classificationtype_param/valueProcess.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/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5e82ac38396ff9ccda20b257c1d0820f5294683
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic")
+
+result.string($KeywordRegistry.classificationType())
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b92bfbc2e35eba18a9e8daf1ba5ab25180d8a837
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.classificationType(), vars.get("$this.value")))
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ac1682daac72873983e54688cb7fb34ae5ef3a9
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.db");
+
+result.object(db.table("select distinct CLASSIFICATIONTYPE from CLASSIFICATIONTYPE"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..68f7c83e51b9396a24a7d9d48ef015bb57ab1399
--- /dev/null
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -0,0 +1,120 @@
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ClassificationScore_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Possible Values</title>
+  <contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONSCOREID</name>
+      <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Title</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>SCORETYPE</name>
+      <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SORT</name>
+      <title>Sorting</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>SCORE</name>
+      <title>Score</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <mandatory v="true" />
+      <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
+    </entityField>
+    <entityProvider>
+      <name>ClassificationScores</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>85ff242d-a743-413f-8112-6d589baa30de</name>
+          <entityName>Classification_entity</entityName>
+          <fieldName>ClassificationScores</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Scoretype_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ClassificationNumber_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>Scoretype_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>MaxValue</name>
+      <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ClassificationNumber_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
+          <tableName>CLASSIFICATIONSCORE</tableName>
+          <primaryKey>CLASSIFICATIONSCOREID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONSCOREID.value</name>
+          <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SCORE.value</name>
+          <recordfield>CLASSIFICATIONSCORE.SCORE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SORT.value</name>
+          <recordfield>CLASSIFICATIONSCORE.SORT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>CLASSIFICATIONSCORE.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SCORETYPE.value</name>
+          <recordfield>CLASSIFICATIONSCORE.SCORETYPE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ClassificationScore_entity/contentTitleProcess.js b/entity/ClassificationScore_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a32d1c4fccfbd2b173010c5281709660619bd4cf
--- /dev/null
+++ b/entity/ClassificationScore_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2e1eadc780ee959ee845885c8bca4d35d4eece3d
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.util");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a65e5d8ff9ad1887738538ae5b04ff963ae1aef2
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
@@ -0,0 +1,22 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Sql_lib");
+
+if (!vars.get("$this.value"))
+{
+    var scoreType = vars.get("$param.Scoretype_param");
+    var maxValue = db.cell(
+            SqlCondition.begin()
+                        .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", scoreType, "# <> ?")
+                        .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER", vars.get("$param.ClassificationNumber_param"))
+                        .buildSql("select 100.0 - sum(maxScore) from ( \n\
+                                    select max(SCORE) maxScore from CLASSIFICATIONTYPE \n\
+                                    join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.scoretype = CLASSIFICATIONTYPE.scoretype", "1=2", "group by CLASSIFICATIONTYPE.scoretype) maxScores"));
+    
+    if (maxValue == "")
+        maxValue = 100;
+    
+    result.string(maxValue);
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..be6e4157430034d74f2785dcd3c5198b8dfe6a17
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
@@ -0,0 +1,8 @@
+import("Entity_lib");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var max = parseFloat(vars.getString("$field.MaxValue"));
+if (parseFloat(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SCORE"))) > max)
+    result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [max]));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js b/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf842a1c590e8a1a29dec0171a7e53747f219190
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$param.Scoretype_param"));
+}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..811e28aa9ae80ff40acd82e1d8a01a07fadc73c9
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+result.string(db.translateCondition(SqlCondition.begin()
+                  .andPrepareVars("CLASSIFICATIONSCORE.SCORETYPE", "$param.Scoretype_param")
+                  .build("1=2")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..41b093f08de18bd28403c0122382ef68ebdbb13a
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+db.deleteData("CLASSIFICATION", SqlCondition.begin()
+                                   .andPrepare("CLASSIFICATION.CLASSIFICATIONSCORE_ID", vars.get("$field.CLASSIFICATIONSCOREID"))
+                                   .build("1=2"));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0539ac314524a1cb75d491dce4252bad6cc7407
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+result.object({
+    "CLASSIFICATIONSCORE.SORT": false
+})
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..079ffd8c1573192577342ca08274a408c6a39b98
--- /dev/null
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -0,0 +1,48 @@
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ClassificationType_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONTYPEID</name>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+    </entityField>
+    <entityField>
+      <name>CLASS</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <linkInformation>
+        <linkInformation>
+          <name>0a0944fd-a72f-4c95-8c42-b1e7d3e17721</name>
+          <tableName>CLASSIFICATIONTYPE</tableName>
+          <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATIONTYPEID.value</name>
+          <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASS.value</name>
+          <recordfield>CLASSIFICATIONTYPE.CLASS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>CLASSIFICATIONTYPE.TYPE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a0e9d8cf6651b92c1ea520eff3bba2d943d3f201
--- /dev/null
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -0,0 +1,204 @@
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Classification_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Classification</title>
+  <afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
+  <titlePlural>Classifications</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONID</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONSCORE_ID</name>
+      <title>Selection</title>
+      <consumer>ClassificationScores</consumer>
+      <titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ClassificationType_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectRowid_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>Classifications</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Classifications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ScoreType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>IsAdminMode_param</name>
+          <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>CLASSIFICATIONTYPEID</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SCORETYPE</name>
+      <title>Scoretype</title>
+      <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js</mandatoryProcess>
+      <groupable v="true" />
+      <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/Classification_entity/entityfields/scoretype/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONNUMBER</name>
+      <title>Classification number</title>
+      <contentType>TEXT</contentType>
+      <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationnumber/mandatoryProcess.js</mandatoryProcess>
+      <groupable v="true" />
+      <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationnumber/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/Classification_entity/entityfields/classificationnumber/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONTYPE_ID</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_type/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityConsumer>
+      <name>ClassificationScores</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationScore_entity</entityName>
+        <fieldName>ClassificationScores</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Scoretype_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ClassificationNumber_param</name>
+          <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationnumber_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>edit</name>
+      <fieldType>ACTION</fieldType>
+      <onActionProcess>%aditoprj%/entity/Classification_entity/entityfields/edit/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityParameter>
+      <name>ScoreType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>CLASSIFICATIONTYPE</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>ClassificationsAdministration</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>67603e12-a23a-4f3f-9fcd-b128bd5f9b5f</name>
+          <entityName>ClassificationAdmin_entity</entityName>
+          <fieldName>ClassificationsAdmin</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>IsAdminMode_param</name>
+          <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ScoreType_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>IsAdminMode_param</name>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>Info</name>
+      <title>Rating</title>
+      <contentType>HTML</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/info/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SCORE_RESULTS</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>CLASSIFICATIONID.value</element>
+        <element>CLASSIFICATIONNUMBER.value</element>
+        <element>CLASSIFICATIONSCORE_ID.value</element>
+        <element>CLASSIFICATIONTYPEID.value</element>
+        <element>CLASSIFICATIONTYPE_ID.value</element>
+        <element>OBJECT_ROWID.value</element>
+        <element>OBJECT_TYPE.value</element>
+        <element>SCORETYPE.value</element>
+        <element>CLASSIFICATIONTYPE.value</element>
+        <element>SCORE_RESULTS.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Classification_entity/afterOperatingState.js b/entity/Classification_entity/afterOperatingState.js
new file mode 100644
index 0000000000000000000000000000000000000000..a94093073f1d90cd4d112f5e93eb90f853d2f4fd
--- /dev/null
+++ b/entity/Classification_entity/afterOperatingState.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) 
+{
+    neon.refreshAll();
+}
diff --git a/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..99c5e9563cfce4fdff07c9e4f5f5383e77463f58
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationnumber/displayValueProcess.js
@@ -0,0 +1,26 @@
+import("system.db");
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("Sql_lib");
+import("Classification_lib")
+
+if (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+{
+    result.string(vars.get("$this.value") + ". " + translate.text("Classification"));
+}
+else
+{
+    if (vars.getString("$field.CLASSIFICATIONNUMBER"))
+    {
+        var score = JSON.parse(vars.getString("$field.SCORE_RESULTS"))[vars.getString("$field.CLASSIFICATIONNUMBER")];
+
+        if (!score)
+            score = 0;
+        else
+            score = parseInt(score);
+
+        result.string(vars.get("$this.value") + ". " + translate.text("Classification") + ": " + score + " " + translate.text("points") + " = " + ClassificationUtils.mapToClass(score));
+
+    }
+}
diff --git a/entity/Classification_entity/entityfields/classificationnumber/mandatoryProcess.js b/entity/Classification_entity/entityfields/classificationnumber/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..52b7a0751a53c352e422b4d53b084429a951e423
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationnumber/mandatoryProcess.js
@@ -0,0 +1,5 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+result.object(vars.get("$param.IsAdminMode_param") == 1 && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationnumber/onValidation.js b/entity/Classification_entity/entityfields/classificationnumber/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..00d5ca00d56da1a0d3076dbe16d77ba5f1415517
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationnumber/onValidation.js
@@ -0,0 +1,12 @@
+import("Entity_lib");
+import("system.logging");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var number = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CLASSIFICATIONNUMBER"));
+
+if (!/^[0-9]+$/.test(number))
+{  
+    result.string(translate.text("${NUMBER_FORMAT_NEEDED}"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationnumber/stateProcess.js b/entity/Classification_entity/entityfields/classificationnumber/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..626da788b0307aee25ce6ab8849e3e9357ba0645
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationnumber/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(neon.COMPONENTSTATE_AUTO);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js b/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9358b57687a079539606124e88b74f15c7e3ac72
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(0);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0488a23572b30f97174720a23726a09b8b266381
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(1);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4b352e1b6d58a78c7d1d9a1d8c6cc20df770045
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+// TODO: loadEntity / #Title
+result.string(translate.text(db.cell(SqlCondition.begin()
+        .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
+        .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7865e4544cd6eaba5d15e15937bffca31e2675fa
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+if (vars.get("$sys.recordstate") && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text(vars.get("$field.SCORETYPE")));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/classificationnumber_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/classificationnumber_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..058ce28aa4e987bf0abf9ebb0ed394916fc01f01
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscores/children/classificationnumber_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONNUMBER"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b4133d616996e3340521a9fb7831ea77f95fb8d
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SCORETYPE"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/stateProcess.js b/entity/Classification_entity/entityfields/classificationscores/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..02b7fbc2bb2c333e2948112fad78a3b816c71313
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscores/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.IsAdminMode_param") && vars.getString("$param.IsAdminMode_param") == "1")
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype/valueProcess.js b/entity/Classification_entity/entityfields/classificationtype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bccd5eb7fbb2311971da0e6ae2ed3b56ed21268
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationtype/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$param.ClassificationType_param"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e49c8fad1ac02b78443eda6f571e2589b11afc7c
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+{
+    result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js b/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..20cd6706484d99085c2cb18d81000ebdf00f883a
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/edit/onActionProcess.js b/entity/Classification_entity/entityfields/edit/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d018fd74f148d59d904106aacd47f1877ad01d5
--- /dev/null
+++ b/entity/Classification_entity/entityfields/edit/onActionProcess.js
@@ -0,0 +1,23 @@
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+var selection = vars.get("$sys.selectionRows");
+if (selection.length > 0)
+{
+    var params = {
+        "ClassificationType_param" : vars.get("$param.ClassificationType_param"),
+        "ObjectType_param" : vars.get("$param.ObjectType_param"),
+        "ObjectRowid_param" : vars.get("$param.ObjectRowid_param"),
+        "IsAdminMode_param" : vars.get("$param.IsAdminMode_param")
+    }
+    
+    var view = "ClassificatonEdit_view";
+    
+    if (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+        view = "ClassificatonAdminEdit_view";
+    
+    neon.openContext("Classification", view, [selection[0].UID], neon.OPERATINGSTATE_EDIT, params);
+}
+
+
diff --git a/entity/Classification_entity/entityfields/info/valueProcess.js b/entity/Classification_entity/entityfields/info/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b581132ae69eaf7ea2f3bbac58e3a0d70bcec02b
--- /dev/null
+++ b/entity/Classification_entity/entityfields/info/valueProcess.js
@@ -0,0 +1,19 @@
+import("system.vars");
+import("system.db");
+import("system.translate");
+import("system.result");
+import("system.text");
+import("Sql_lib");
+
+var data = db.table(SqlCondition.begin()
+                     .andPrepare("CLASSIFICATIONSCORE.SCORETYPE", vars.get("$field.SCORETYPE"))
+                     .buildSql("select TITLE, SCORE from CLASSIFICATIONSCORE", "1=2", "order by SORT"))
+
+var resultText = "";
+
+data.forEach(function(pScore)
+{
+    resultText += translate.text(pScore[0]) + " = " + text.formatDouble(pScore[1], "#,##0.00") + "<br>"
+});
+
+result.string(resultText);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js b/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..55b3460083670fb4c229762303b24bd9585dbaaf
--- /dev/null
+++ b/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(1);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/object_rowid/valueProcess.js b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d15a596ff1090502ac8cd6afd63e12893ce05625
--- /dev/null
+++ b/entity/Classification_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+{
+    result.string(vars.get("$param.ObjectRowid_param"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/object_type/valueProcess.js b/entity/Classification_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b532aa65a135891c68363e05f02e3420967f409a
--- /dev/null
+++ b/entity/Classification_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
+{
+    result.string(vars.get("$param.ObjectType_param"));
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js b/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..002fb0103bfb70fcaf7ad4f979a2d8b4b96c6295
--- /dev/null
+++ b/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string(translate.text(vars.get("$this.value")))
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js b/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..52b7a0751a53c352e422b4d53b084429a951e423
--- /dev/null
+++ b/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js
@@ -0,0 +1,5 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+result.object(vars.get("$param.IsAdminMode_param") == 1 && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/onValidation.js b/entity/Classification_entity/entityfields/scoretype/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..6206ed379e0d80cfa431637cf8e80494fc44ca26
--- /dev/null
+++ b/entity/Classification_entity/entityfields/scoretype/onValidation.js
@@ -0,0 +1,21 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.db");
+import("Entity_lib");
+import("Sql_lib");
+import("system.vars");
+
+if (vars.get("$param.IsAdminMode_param") == "1" && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    // do not allow the same name a second time
+    var type = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SCORETYPE"));
+    var count = db.cell(SqlCondition.begin()
+                        .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", type)
+                        .buildSql("select count(*) from CLASSIFICATIONTYPE"));
+
+    if (count != 0)
+    {
+        result.string(translate.text("${SCORETYPE_ALREADY_EXISTS}"));
+    }
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/stateProcess.js b/entity/Classification_entity/entityfields/scoretype/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..626da788b0307aee25ce6ab8849e3e9357ba0645
--- /dev/null
+++ b/entity/Classification_entity/entityfields/scoretype/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(neon.COMPONENTSTATE_AUTO);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bad13cbd6f15fec52532defb25a92f0c2f224b58
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,56 @@
+import("Classification_lib");
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+var admin = (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+var scores = {};
+
+if (!admin)
+{
+    scores = JSON.stringify(ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
+}
+
+
+
+var classificationId;
+var classificationTypeId;
+
+// if the id starts with "C," it is a classificationId. If it starts with "T,", it is a classificationtypeId
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+{
+    var selected = vars.get("$local.idvalues")[0].split(",");
+    if (selected.length == 2)
+    {
+        if (selected[0] == 'C')
+            classificationId = selected[1]
+        else if (selected[0] == 'T')
+            classificationTypeId = selected[1]
+    }
+}
+
+var cond = SqlCondition.begin()
+                .andPrepareVars("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", "$param.ClassificationType_param")
+                .andPrepareIfSet("CLASSIFICATION.CLASSIFICATIONID", classificationId)
+
+
+
+if (!classificationId)
+{
+    cond.andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId);
+    
+    if(!admin)
+        cond.andSqlCondition(SqlCondition.begin().orPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
+                                                     .or("CLASSIFICATION.OBJECT_TYPE is null"))
+            .andSqlCondition(SqlCondition.begin().orPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param")
+                                                     .or("CLASSIFICATION.OBJECT_ROWID is null"))
+}
+    
+result.object(db.table(cond.buildSql("select case when CLASSIFICATIONID is not null then 'C,' || CLASSIFICATIONID else 'T,' || CLASSIFICATIONTYPEID end, CLASSIFICATIONID, CLASSIFICATIONNUMBER, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE from CLASSIFICATION \n\
+                                        right join CLASSIFICATIONTYPE on CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID", "1=2", "order by CLASSIFICATIONNUMBER asc"))
+    .map(function(pRow)
+    {
+        pRow.push(scores);
+        return pRow;
+    }));
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/onDelete.js b/entity/Classification_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..5e02ce7e27b58e7b2ac7141f28a7b01063cfe5f2
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,26 @@
+import("system.neon");
+import("system.question");
+import("Sql_lib");
+import("system.db");
+import("system.util");
+import("system.vars");
+
+var type = vars.get("$field.SCORETYPE");
+
+if (1 < db.cell(SqlCondition.begin()
+                        .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", vars.get("$field.CLASSIFICATIONTYPE"))
+                        .buildSql("select count(*) from CLASSIFICATIONTYPE", "1=2")))
+{
+    db.deleteData("CLASSIFICATION", "CLASSIFICATION.CLASSIFICATIONTYPE_ID in (" + db.translateStatement(
+                       SqlCondition.begin()
+                                   .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", type)
+                                   .buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID from CLASSIFICATIONTYPE", "1=2")) + ")");
+    db.deleteData("CLASSIFICATIONTYPE", SqlCondition.equals("CLASSIFICATIONTYPE.SCORETYPE", type, "1=2"));
+    db.deleteData("CLASSIFICATIONSCORE", SqlCondition.equals("CLASSIFICATIONSCORE.SCORETYPE", type, "1=2"));
+}
+neon.refreshAll();
+//else
+//{
+    // do not delete anything, because it is the last one. If this one is deleted, there would be no way to add anything again.
+    // TODO: delete-button disable if count(*) <= 1
+//}
diff --git a/entity/Classification_entity/recordcontainers/jdito/onInsert.js b/entity/Classification_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..7304a96a3cebcf223423274896596280a5e8c841
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,11 @@
+import("system.db");
+import("system.util");
+import("system.vars");
+
+var newId = util.getNewUUID();
+db.insertData("CLASSIFICATIONTYPE", ["CLASSIFICATIONTYPEID", "CLASSIFICATIONTYPE", "SCORETYPE", "CLASSIFICATIONNUMBER"], null, [
+    newId,
+    vars.get("$field.CLASSIFICATIONTYPE"),
+    vars.get("$field.SCORETYPE"),
+    vars.get("$field.CLASSIFICATIONNUMBER"),
+]);
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/onUpdate.js b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..060a72d4ee0a39795104ff2be3c7d4419a2e7290
--- /dev/null
+++ b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,36 @@
+import("system.logging");
+import("system.neon");
+import("system.util");
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+
+var changed = vars.get("$local.changed");
+
+// check if it already exists. Else it only exists as ScoreType but has no Classification-Entry
+if (vars.get("$field.CLASSIFICATIONID"))
+{
+    if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
+    {
+         db.updateData("CLASSIFICATION", ["CLASSIFICATIONSCORE_ID"], null, [
+            vars.get("$field.CLASSIFICATIONSCORE_ID")
+        ], SqlCondition.equals("CLASSIFICATION.CLASSIFICATIONID", vars.get("$field.CLASSIFICATIONID"), "1=2"));
+    }
+    else
+    {
+        db.deleteData("CLASSIFICATION", SqlCondition.equals("CLASSIFICATION.CLASSIFICATIONID", vars.get("$field.CLASSIFICATIONID")));
+    }
+}
+else if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
+{
+    var newId = util.getNewUUID();
+    db.insertData("CLASSIFICATION", ["CLASSIFICATIONID", "OBJECT_TYPE", "OBJECT_ROWID", "CLASSIFICATIONTYPE_ID", "CLASSIFICATIONSCORE_ID"], null, [
+        newId,
+        vars.get("$field.OBJECT_TYPE"),
+        vars.get("$field.OBJECT_ROWID"),
+        vars.get("$field.CLASSIFICATIONTYPE_ID"),
+        vars.get("$field.CLASSIFICATIONSCORE_ID"),
+    ]);
+    
+    neon.setFieldValue("$field.CLASSIFICATIONID", newId);
+}
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index d9f7a9ecaa572fa7e800906d26cd5fabcc119825..d12657ce0190f79737f17589b6897f2c688753e5 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,273 +1,280 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Communication_entity</name>
-  <description>former Comm</description>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Communication</title>
-  <contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>ADDR</name>
-      <title>${COMM_ADDRESS}</title>
-      <contentTypeProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Communication_entity/entityfields/addr/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-      </onValueChangeTypes>
-      <onValidation>%aditoprj%/entity/Communication_entity/entityfields/addr/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>COMMUNICATIONID</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/communicationid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>MEDIUM_ID</name>
-      <title>Medium</title>
-      <consumer>KeywordMediums</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STANDARD</name>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <description>This parameter is used for specifing a related "CONTACTID" 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>
-    <entityField>
-      <name>IS_STANDARD</name>
-      <contentType>BOOLEAN</contentType>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/is_standard/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityParameter>
-      <name>ContactsMainCountry_param</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js</valueProcess>
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>AllCommunications</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Communications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>22dd8c4d-2081-4547-adbd-929868f23069</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Communications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>a22c32e2-6d76-4e79-8c71-251ee381b22e</name>
-          <entityName>Contact_entity</entityName>
-          <fieldName>Communications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>CommCategory_param</name>
-          <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" />
-          <description>This parameter is used for specifing a related "CONTACTID" 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>
-    </entityProvider>
-    <entityProvider>
-      <name>PhoneCommunications</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>PhoneCommunications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>0eed17a6-443e-4469-a53b-3ce81440d7d0</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>PhoneCommunications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>CommCategory_param</name>
-          <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
-          <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" />
-          <description>This parameter is used for specifing a related "CONTACTID" 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>
-    </entityProvider>
-    <entityProvider>
-      <name>EmailCommunications</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>EmailCommunications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f8cc4865-ab08-4540-bd02-2b2c92946c84</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>EmailCommunications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>CommCategory_param</name>
-          <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
-          <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" />
-          <description>This parameter is used for specifing a related "CONTACTID" 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>
-    </entityProvider>
-    <entityParameter>
-      <name>CommCategory_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-    </entityParameter>
-    <entityParameter>
-      <name>CommMediumIds_param</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js</valueProcess>
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordMediums</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <linkInformation>
-        <linkInformation>
-          <name>e3567770-187a-4366-bb87-fb22ff7ff257</name>
-          <tableName>COMMUNICATION</tableName>
-          <primaryKey>COMMUNICATIONID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ADDR.value</name>
-          <recordfield>COMMUNICATION.ADDR</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MEDIUM_ID.value</name>
-          <recordfield>COMMUNICATION.MEDIUM_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COMMUNICATIONID.value</name>
-          <recordfield>COMMUNICATION.COMMUNICATIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>COMMUNICATION.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD.value</name>
-          <recordfield>COMMUNICATION.STANDARD</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MEDIUM_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>COMMUNICATION.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>COMMUNICATION.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>COMMUNICATION.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>COMMUNICATION.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Communication_entity</name>
+  <description>former Comm</description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Communication</title>
+  <contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>ADDR</name>
+      <title>${COMM_ADDRESS}</title>
+      <contentTypeProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Communication_entity/entityfields/addr/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
+      <onValidation>%aditoprj%/entity/Communication_entity/entityfields/addr/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>COMMUNICATIONID</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/communicationid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>MEDIUM_ID</name>
+      <title>Medium</title>
+      <consumer>KeywordMediums</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STANDARD</name>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <description>This parameter is used for specifing a related "CONTACTID" 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>
+    <entityField>
+      <name>IS_STANDARD</name>
+      <contentType>BOOLEAN</contentType>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityParameter>
+      <name>ContactsMainCountry_param</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js</valueProcess>
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>AllCommunications</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Communications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>22dd8c4d-2081-4547-adbd-929868f23069</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Communications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>a22c32e2-6d76-4e79-8c71-251ee381b22e</name>
+          <entityName>Contact_entity</entityName>
+          <fieldName>Communications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>CommCategory_param</name>
+          <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" />
+          <description>This parameter is used for specifing a related "CONTACTID" 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>
+    </entityProvider>
+    <entityProvider>
+      <name>PhoneCommunications</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>PhoneCommunications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>0eed17a6-443e-4469-a53b-3ce81440d7d0</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>PhoneCommunications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>CommCategory_param</name>
+          <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
+          <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" />
+          <description>This parameter is used for specifing a related "CONTACTID" 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>
+    </entityProvider>
+    <entityProvider>
+      <name>EmailCommunications</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>ADDR</lookupIdfield>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>EmailCommunications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f8cc4865-ab08-4540-bd02-2b2c92946c84</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>EmailCommunications</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b5ebddec-002b-40a5-a760-cedb78e94cfb</name>
+          <entityName>Email_entity</entityName>
+          <fieldName>EmailAddresses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>CommCategory_param</name>
+          <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
+          <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" />
+          <description>This parameter is used for specifing a related "CONTACTID" 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>
+    </entityProvider>
+    <entityParameter>
+      <name>CommCategory_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>CommMediumIds_param</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js</valueProcess>
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordMediums</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <linkInformation>
+        <linkInformation>
+          <name>e3567770-187a-4366-bb87-fb22ff7ff257</name>
+          <tableName>COMMUNICATION</tableName>
+          <primaryKey>COMMUNICATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADDR.value</name>
+          <recordfield>COMMUNICATION.ADDR</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MEDIUM_ID.value</name>
+          <recordfield>COMMUNICATION.MEDIUM_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COMMUNICATIONID.value</name>
+          <recordfield>COMMUNICATION.COMMUNICATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>COMMUNICATION.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD.value</name>
+          <recordfield>COMMUNICATION.STANDARD</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MEDIUM_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>COMMUNICATION.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>COMMUNICATION.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>COMMUNICATION.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>COMMUNICATION.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Communication_entity/recordcontainers/db/conditionProcess.js b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
index 74df308995f7d47cc8f2fecddb3d025843379486..02793e7f02adcde5e9dbc0955dc19306b5f8233b 100644
--- a/entity/Communication_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
@@ -9,8 +9,7 @@ cond.andPrepareVars("COMMUNICATION.CONTACT_ID", "$param.ContactId_param");
 
 if (vars.exists("$param.CommMediumIds_param"))
 {
-    var mediumIds = vars.get("$param.CommMediumIds_param");
-    mediumIds = JSON.parse(mediumIds);
+    var mediumIds = JSON.parse(vars.getString("$param.CommMediumIds_param"));
     if(mediumIds.length > 0) 
         cond.and("COMMUNICATION.MEDIUM_ID in ('" + mediumIds.join("', '") + "')");
 }
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 864b05a9e485bf701694f15d592549503a3d869a..ffebe6a76db0d05f1410b6f1c64cb7193c8be1e5 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,306 +1,306 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Contact_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
-  <title>Contact</title>
-  <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:USERS</iconId>
-  <titlePlural>Contacts</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>ccbf2270-c30c-458e-8a99-bf0cdcc89689</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Persons</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>CONTACTID</name>
-    </entityField>
-    <entityField>
-      <name>ORGANISATION_ID</name>
-      <title>Company</title>
-      <consumer>Organisations</consumer>
-      <mandatory v="false" />
-      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>PERSON_ID</name>
-      <title>Contact</title>
-      <mandatory v="true" />
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DEPARTMENT</name>
-      <title>Department</title>
-      <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-    </entityField>
-    <entityField>
-      <name>POSITION</name>
-      <title>Position</title>
-      <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-    </entityField>
-    <entityField>
-      <name>CONTACTROLE</name>
-      <title>Contactrole</title>
-      <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-    </entityField>
-    <entityConsumer>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>WithPersonIdFilter</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ExcludeOrganisationsByPersonId</name>
-          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>PersonId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>PersonRelated</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <children>
-        <entityParameter>
-          <name>OwnContactId_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>ADDRESS_ID</name>
-      <title>standard address</title>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PERSON_TITLE</name>
-      <title>Person</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_title/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Communications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>AllCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContactAddresses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Address_entity</entityName>
-        <fieldName>ContactAddresses</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>LANGUAGE</name>
-      <title>Language</title>
-      <consumer>Languages</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityProvider>
-      <name>PersonsContactsExceptOwn</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>targetContext</targetContextField>
-      <targetIdField>CONTACTID</targetIdField>
-      <titlePlural>Other Contactroles</titlePlural>
-      <dependencies>
-        <entityDependency>
-          <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>OtherContacts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>PersonId_param</name>
-          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>OwnContactId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>targetContext</name>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>Status</title>
-      <consumer>KeywordContactStates</consumer>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordContactStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>LanguageKey_param</name>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>31dbd8d8-b10c-4621-ab45-b735216f078f</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>31948bfb-2fe9-4345-a65c-14ad49ffbc0e</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CONTACTID.value</name>
-          <recordfield>CONTACT.CONTACTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DEPARTMENT.value</name>
-          <recordfield>CONTACT.DEPARTMENT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>POSITION.value</name>
-          <recordfield>CONTACT.POSITION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACTROLE.value</name>
-          <recordfield>CONTACT.CONTACTROLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESS_ID.value</name>
-          <recordfield>CONTACT.ADDRESS_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>CONTACT.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>CONTACT.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>CONTACT.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>CONTACT.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>CONTACT.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>CONTACT.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.displayValue</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Contact_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
+  <title>Contact</title>
+  <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
+  <iconId>VAADIN:USERS</iconId>
+  <titlePlural>Contacts</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>ccbf2270-c30c-458e-8a99-bf0cdcc89689</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Persons</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CONTACTID</name>
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_ID</name>
+      <title>Company</title>
+      <consumer>Organisations</consumer>
+      <mandatory v="false" />
+      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>PERSON_ID</name>
+      <title>Contact</title>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DEPARTMENT</name>
+      <title>Department</title>
+      <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+    </entityField>
+    <entityField>
+      <name>POSITION</name>
+      <title>Position</title>
+      <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+    </entityField>
+    <entityField>
+      <name>CONTACTROLE</name>
+      <title>Contactrole</title>
+      <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>WithPersonIdFilter</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>PersonId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>PersonRelated</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <children>
+        <entityParameter>
+          <name>OwnContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>ADDRESS_ID</name>
+      <title>standard address</title>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PERSON_TITLE</name>
+      <title>Person</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_title/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Communications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>AllCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContactAddresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>ContactAddresses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>LANGUAGE</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>PersonsContactsExceptOwn</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>targetContext</targetContextField>
+      <targetIdField>CONTACTID</targetIdField>
+      <titlePlural>Other Contactroles</titlePlural>
+      <dependencies>
+        <entityDependency>
+          <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>OtherContacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>PersonId_param</name>
+          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>OwnContactId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>targetContext</name>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordContactStates</consumer>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordContactStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>LanguageKey_param</name>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>31dbd8d8-b10c-4621-ab45-b735216f078f</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>31948bfb-2fe9-4345-a65c-14ad49ffbc0e</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CONTACTID.value</name>
+          <recordfield>CONTACT.CONTACTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_ID.value</name>
+          <recordfield>CONTACT.PERSON_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+          <recordfield>CONTACT.DEPARTMENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>POSITION.value</name>
+          <recordfield>CONTACT.POSITION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTROLE.value</name>
+          <recordfield>CONTACT.CONTACTROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESS_ID.value</name>
+          <recordfield>CONTACT.ADDRESS_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>CONTACT.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>CONTACT.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CONTACT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CONTACT.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CONTACT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CONTACT.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.displayValue</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 5ec04c8beba26cef69c46c7003c1f2c4ae9bafd0..8e58c3f1ed9e767b695739cacf770215516f58a3 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,119 +1,119 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Context_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
-  <contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
-          <entityName>AppointmentLink_entity</entityName>
-          <fieldName>Context</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f1eebe8c-93d2-4977-b619-b6315f843f7a</name>
-          <entityName>AttributeUsage_entity</entityName>
-          <fieldName>Context</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <title>Context id</title>
-    </entityField>
-    <entityField>
-      <name>CONTEXT_NAME</name>
-      <title>Context name</title>
-    </entityField>
-    <entityProvider>
-      <name>Context</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
-          <entityName>ObjectRelationType_entity</entityName>
-          <fieldName>Contexts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ExclusiveContexts_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ExclusiveContexts_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>ActivityLinkable</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
-          <entityName>ActivityLink_entity</entityName>
-          <fieldName>Context</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ExclusiveContexts_param</name>
-          <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityProvider>
-      <name>TaskLinkable</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
-          <entityName>TaskLink_entity</entityName>
-          <fieldName>Contexts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ExclusiveContexts_param</name>
-          <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>GetAllContexts_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>UseExclusives_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Context_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>UID.displayValue</element>
-        <element>CONTEXT_NAME.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Context_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
+  <contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
+          <entityName>AppointmentLink_entity</entityName>
+          <fieldName>Context</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f1eebe8c-93d2-4977-b619-b6315f843f7a</name>
+          <entityName>AttributeUsage_entity</entityName>
+          <fieldName>Context</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <title>Context id</title>
+    </entityField>
+    <entityField>
+      <name>CONTEXT_NAME</name>
+      <title>Context name</title>
+    </entityField>
+    <entityProvider>
+      <name>Context</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
+          <entityName>ObjectRelationType_entity</entityName>
+          <fieldName>Contexts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExclusiveContexts_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ExclusiveContexts_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>ActivityLinkable</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
+          <entityName>ActivityLink_entity</entityName>
+          <fieldName>Context</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExclusiveContexts_param</name>
+          <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityProvider>
+      <name>TaskLinkable</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
+          <entityName>TaskLink_entity</entityName>
+          <fieldName>Contexts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExclusiveContexts_param</name>
+          <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>GetAllContexts_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>UseExclusives_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Context_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>UID.displayValue</element>
+        <element>CONTEXT_NAME.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index cf879d38aa939f694678ee8f96e5ab1f3732c7a3..eef24ef3cd3f4d92c04b806e29c050f672321b13 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -37,6 +37,7 @@
       <resolution>DAY</resolution>
       <outputFormat>dd.MM.yyyy</outputFormat>
       <inputFormat>dd.MM.yyyy</inputFormat>
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractend/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
     </entityField>
@@ -297,6 +298,7 @@
     <entityConsumer>
       <name>Attributes</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Contract_entity/entityfields/attributes/onValidation.js</onValidation>
       <dependency>
         <name>dependency</name>
         <entityName>AttributeRelation_entity</entityName>
diff --git a/entity/Contract_entity/entityfields/attributes/onValidation.js b/entity/Contract_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Contract_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractend/valueProcess.js b/entity/Contract_entity/entityfields/contractend/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index db0c3a77314cf55ee67d75c7d04ace462125d59b..8026b818ac28c1bab31db8ca20a154d882fc9f33 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,156 +1,156 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Countries_Entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
-  <title>Countries</title>
-  <contentTitleProcess>%aditoprj%/entity/Countries_Entity/contentTitleProcess.js</contentTitleProcess>
-  <iconId>VAADIN:FLAG</iconId>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityProvider>
-      <name>ISO2Name</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
-          <entityName>Address_entity</entityName>
-          <fieldName>Countries</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Countries</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>Key_param</name>
-          <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>Value_param</name>
-          <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>Key_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>Value_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>ISO2</name>
-      <title>ISO 3166-1 alpha-2</title>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ISO3</name>
-      <title>ISO 3166-1 alpha-3</title>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ADDR_FORMAT</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ZIP_REGEX</name>
-      <documentation>%aditoprj%/entity/Countries_Entity/entityfields/zip_regex/documentation.adoc</documentation>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <searchable v="true" />
-    </entityField>
-    <entityField>
-      <name>REQUIRED_FIELDS</name>
-      <documentation>%aditoprj%/entity/Countries_Entity/entityfields/required_fields/documentation.adoc</documentation>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>NAME_TRANSLATED</name>
-      <title>Latin Name</title>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/name_translated/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>FLAG</name>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/flag/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>FLAG_RAW</name>
-      <description>//todo: move flags to binaries (asys_binaries)</description>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>NAME_ORIGIN</name>
-      <title>Native Name</title>
-      <searchable v="false" />
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
-          <tableName>AB_COUNTRYINFO</tableName>
-          <primaryKey>ISO2</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ADDR_FORMAT.value</name>
-          <recordfield>AB_COUNTRYINFO.ADDR_FORMAT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME_ORIGIN.value</name>
-          <recordfield>AB_COUNTRYINFO.NAME_NATIVE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ISO2.value</name>
-          <recordfield>AB_COUNTRYINFO.ISO2</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REQUIRED_FIELDS.value</name>
-          <recordfield>AB_COUNTRYINFO.REQUIRED_FIELDS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ISO3.value</name>
-          <recordfield>AB_COUNTRYINFO.ISO3</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ZIP_REGEX.value</name>
-          <recordfield>AB_COUNTRYINFO.ZIP_REGEX</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME.value</name>
-          <recordfield>AB_COUNTRYINFO.NAME_LATIN</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>FLAG_RAW.value</name>
-          <recordfield>AB_COUNTRYINFO.FLAG</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Countries_Entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
+  <title>Countries</title>
+  <contentTitleProcess>%aditoprj%/entity/Countries_Entity/contentTitleProcess.js</contentTitleProcess>
+  <iconId>VAADIN:FLAG</iconId>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityProvider>
+      <name>ISO2Name</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
+          <entityName>Address_entity</entityName>
+          <fieldName>Countries</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Countries</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Key_param</name>
+          <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Value_param</name>
+          <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>Key_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>Value_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>ISO2</name>
+      <title>ISO 3166-1 alpha-2</title>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ISO3</name>
+      <title>ISO 3166-1 alpha-3</title>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ADDR_FORMAT</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ZIP_REGEX</name>
+      <documentation>%aditoprj%/entity/Countries_Entity/entityfields/zip_regex/documentation.adoc</documentation>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <searchable v="true" />
+    </entityField>
+    <entityField>
+      <name>REQUIRED_FIELDS</name>
+      <documentation>%aditoprj%/entity/Countries_Entity/entityfields/required_fields/documentation.adoc</documentation>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>NAME_TRANSLATED</name>
+      <title>Latin Name</title>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/name_translated/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>FLAG</name>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/flag/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>FLAG_RAW</name>
+      <description>//todo: move flags to binaries (asys_binaries)</description>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>NAME_ORIGIN</name>
+      <title>Native Name</title>
+      <searchable v="false" />
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
+          <tableName>AB_COUNTRYINFO</tableName>
+          <primaryKey>ISO2</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADDR_FORMAT.value</name>
+          <recordfield>AB_COUNTRYINFO.ADDR_FORMAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME_ORIGIN.value</name>
+          <recordfield>AB_COUNTRYINFO.NAME_NATIVE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISO2.value</name>
+          <recordfield>AB_COUNTRYINFO.ISO2</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REQUIRED_FIELDS.value</name>
+          <recordfield>AB_COUNTRYINFO.REQUIRED_FIELDS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISO3.value</name>
+          <recordfield>AB_COUNTRYINFO.ISO3</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ZIP_REGEX.value</name>
+          <recordfield>AB_COUNTRYINFO.ZIP_REGEX</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>AB_COUNTRYINFO.NAME_LATIN</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FLAG_RAW.value</name>
+          <recordfield>AB_COUNTRYINFO.FLAG</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 3ce51ffa491e43786d44fce411deadae432e6fac..e15a52bca7ea895e3c9fe336be78188576d6e6b0 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,166 +1,166 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>DocumentTemplateLink_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Attachment</title>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DOCUMENTTEMPLATE_ID_PARENT</name>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DOCUMENTTEMPLATELINKID</name>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DOCUMENTTEMPLATE_ID_CHILD</name>
-      <consumer>Attachments</consumer>
-      <linkedContext>DocumentTemplate</linkedContext>
-      <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>DocumentId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Attachments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>DocumentTemplate_entity</entityName>
-        <fieldName>Attachments</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>DocumentTemplateType_param</name>
-          <title></title>
-          <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>Links</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
-          <entityName>DocumentTemplate_entity</entityName>
-          <fieldName>Links</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>DocumentId_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Type_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>Type_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionField>
-      <name>OpenDocument</name>
-      <fieldType>ACTION</fieldType>
-      <onActionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:DOWNLOAD</iconId>
-    </entityActionField>
-    <entityField>
-      <name>ICON</name>
-      <contentType>TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
-          <tableName>DOCUMENTTEMPLATELINK</tableName>
-          <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
-          <tableName>DOCUMENTTEMPLATE</tableName>
-          <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DOCUMENTTEMPLATELINKID.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>DocumentTemplateLink_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Attachment</title>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_ID_PARENT</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DOCUMENTTEMPLATELINKID</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_ID_CHILD</name>
+      <consumer>Attachments</consumer>
+      <linkedContext>DocumentTemplate</linkedContext>
+      <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>DocumentId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Attachments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>Attachments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>Links</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
+          <entityName>DocumentTemplate_entity</entityName>
+          <fieldName>Links</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DocumentId_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Type_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>Type_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>OpenDocument</name>
+      <fieldType>ACTION</fieldType>
+      <onActionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:DOWNLOAD</iconId>
+    </entityActionField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>TEXT</contentType>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
+          <tableName>DOCUMENTTEMPLATELINK</tableName>
+          <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
+          <tableName>DOCUMENTTEMPLATE</tableName>
+          <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATELINKID.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 8e0e3f5b671f3d53ec0789ff1da5d1df5faae976..52c0035965fc7c7b79dd441af34852803ef67bf4 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,76 +1,76 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>DocumentTemplateTypeCategory_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityParameter>
-      <name>usageFilter_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>AB_KEYWORD_ENTRYID</name>
-    </entityField>
-    <entityField>
-      <name>KEYID</name>
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-    </entityField>
-    <entityProvider>
-      <name>ByCategory</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <lookupIdfield>KEYID</lookupIdfield>
-      <dependencies>
-        <entityDependency>
-          <name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
-          <entityName>DocumentTemplate_entity</entityName>
-          <fieldName>DocumentTemplateTypeCategory</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>usageFilter_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
-          <tableName>AB_KEYWORD_ENTRY</tableName>
-          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ENTRYID.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>KEYID.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TITLE.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>DocumentTemplateTypeCategory_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityParameter>
+      <name>usageFilter_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>AB_KEYWORD_ENTRYID</name>
+    </entityField>
+    <entityField>
+      <name>KEYID</name>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+    </entityField>
+    <entityProvider>
+      <name>ByCategory</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>KEYID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
+          <entityName>DocumentTemplate_entity</entityName>
+          <fieldName>DocumentTemplateTypeCategory</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>usageFilter_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
+          <tableName>AB_KEYWORD_ENTRY</tableName>
+          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ENTRYID.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>KEYID.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 42c44b9a2775e8a0216d507bad5820b7893dbad9..384d6cb615a270c949e8e8d316cf53dd94fc5009 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,311 +1,320 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>DocumentTemplate_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:FILE_FONT</icon>
-  <title>Document Template</title>
-  <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <title>Date edit</title>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>DOCUMENTTEMPLATEID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <title>Date new</title>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>Type</title>
-      <consumer>KeywordDocumentTemplateType</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>LANGUAGE</name>
-      <title>Language</title>
-      <consumer>Languages</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>BINDATA</name>
-      <contentType>FILE</contentType>
-      <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js</onValueChange>
-    </entityField>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordDocumentTemplateType</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>htmlText</name>
-      <title>HTML</title>
-      <contentType>HTML</contentType>
-      <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>texText</name>
-      <title>Text</title>
-      <contentType>LONG_TEXT</contentType>
-      <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CLASSIFICATION</name>
-      <title>Classification</title>
-      <consumer>DocumentTemplateTypeCategory</consumer>
-      <groupable v="true" />
-      <state>DISABLED</state>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>DocumentTemplateTypeCategory</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>DocumentTemplateTypeCategory_entity</entityName>
-        <fieldName>ByCategory</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>usageFilter_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>Attachments</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>TARGET_CONTEXT</targetContextField>
-      <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
-      <titlePlural>Attachments</titlePlural>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>856e3435-a173-4cf5-8e81-3f884f8238d3</name>
-          <entityName>DocumentTemplateLink_entity</entityName>
-          <fieldName>Attachments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityConsumer>
-      <name>Links</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>DocumentTemplateLink_entity</entityName>
-        <fieldName>Links</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>DocumentId_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Type_param</name>
-          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>DocumentTemplateTypeClassification_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>DocumentTemplateProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>DocumentTemplateText</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>DocumentTemplateTex</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>DocumentTemplateType_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>TARGET_CONTEXT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <linkInformation>
-        <linkInformation>
-          <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
-          <tableName>DOCUMENTTEMPLATE</tableName>
-          <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>DOCUMENTTEMPLATE.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>DOCUMENTTEMPLATE.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DESCRIPTION.value</name>
-          <recordfield>DOCUMENTTEMPLATE.DESCRIPTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>DOCUMENTTEMPLATE.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME.value</name>
-          <recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>DOCUMENTTEMPLATE.TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>DOCUMENTTEMPLATE.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>DOCUMENTTEMPLATE.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DOCUMENTTEMPLATEID.value</name>
-          <recordfield>DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CLASSIFICATION.value</name>
-          <recordfield>DOCUMENTTEMPLATE.CLASSIFICATION</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>DocumentTemplate_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:FILE_FONT</icon>
+  <title>Document Template</title>
+  <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>5cc2e566-309c-4b47-84f3-52376e919b9b</name>
+          <entityName>Email_entity</entityName>
+          <fieldName>DocumnetTemplates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <title>Date edit</title>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>DOCUMENTTEMPLATEID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <title>Date new</title>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <consumer>KeywordDocumentTemplateType</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>LANGUAGE</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>BINDATA</name>
+      <contentType>FILE</contentType>
+      <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js</onValueChange>
+    </entityField>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordDocumentTemplateType</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>htmlText</name>
+      <title>HTML</title>
+      <contentType>HTML</contentType>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>texText</name>
+      <title>Text</title>
+      <contentType>LONG_TEXT</contentType>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATION</name>
+      <title>Classification</title>
+      <consumer>DocumentTemplateTypeCategory</consumer>
+      <groupable v="true" />
+      <state>DISABLED</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplateTypeCategory</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplateTypeCategory_entity</entityName>
+        <fieldName>ByCategory</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>usageFilter_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>Attachments</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TARGET_CONTEXT</targetContextField>
+      <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
+      <targetConsumerProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js</targetConsumerProcess>
+      <titlePlural>Attachments</titlePlural>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>856e3435-a173-4cf5-8e81-3f884f8238d3</name>
+          <entityName>DocumentTemplateLink_entity</entityName>
+          <fieldName>Attachments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityConsumer>
+      <name>Links</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplateLink_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentId_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Type_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>DocumentTemplateTypeClassification_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>DocumentTemplateProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>DocumentTemplateText</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>DocumentTemplateTex</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>DocumentTemplateType_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>TARGET_CONTEXT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <linkInformation>
+        <linkInformation>
+          <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
+          <tableName>DOCUMENTTEMPLATE</tableName>
+          <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DOCUMENTTEMPLATE.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DOCUMENTTEMPLATE.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>DOCUMENTTEMPLATE.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>DOCUMENTTEMPLATE.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>DOCUMENTTEMPLATE.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DOCUMENTTEMPLATE.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DOCUMENTTEMPLATE.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATEID.value</name>
+          <recordfield>DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATION.value</name>
+          <recordfield>DOCUMENTTEMPLATE.CLASSIFICATION</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js b/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
index 6a04c88b7f163c98e055c38bf9bd94ed6fbc0822..332c5b7e42d989c87c638f72a18136b2891af340 100644
--- a/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
@@ -1,9 +1,15 @@
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "")
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
+import("Document_lib");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "")
+{
+    var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
+    
+    if(fileExtension == "html" || fileExtension == "htm" || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    {
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    }
 }
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
index 18c530f346481cdababb77646abc9c3d28075f29..fa51263443c93c2fd3b57a08c3e3cd1f10fe4a20 100644
--- a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
@@ -1,12 +1,18 @@
-import("system.util");
-import("system.db");
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
-{
-    var binaryId      = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
-    result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+import("Document_lib");
+import("system.util");
+import("system.db");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
+    
+    if(fileExtension == "html" || fileExtension == "htm")
+    {
+        var binaryId      = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+        result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+    }
 }
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js
index 9c50f2967c8e80d1ce5290932b81b2a84d100ed7..25c65becd658df0dbb8cd865aaae444be77681ad 100644
--- a/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js
@@ -1,9 +1,15 @@
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "")
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
+import("Document_lib");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "")
+{
+    var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
+        
+    if(fileExtension == "txt" || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    {
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    }
 }
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
index 6afb3bf4bcdadd760ab57b16791dff8c0fd7c0a5..49fec559204fab6bb6f15dca63663b5b1330424c 100644
--- a/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
@@ -1,12 +1,18 @@
-import("system.util");
-import("system.db");
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
-{
-    var binaryId      = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
-    result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+import("Document_lib");
+import("system.util");
+import("system.db");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
+    
+    if(fileExtension == "txt")
+    {
+        var binaryId      = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+        result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+    }
 }
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
index 3a3a20876e5ab13cba90960eff760978a088d1ac..5d116a2d2fe4127d4b5586b62281e9f732ac5b2b 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -1,33 +1,34 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
-import("system.util");
-import("Document_lib");
-
-//TODO - Function
-
-var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
-var filename = "";
-var bindata = "";
-
-if(bindataUpload != "")
-{
-    filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
-    bindata  = bindataUpload;
-}
-else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
-{
-    filename = vars.get("$field.NAME") + ".html";
-    bindata  = util.encodeBase64String(vars.get("$field.htmlText"));
-}
-else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
-{
-    filename = vars.get("$field.NAME") + ".txt";
-    bindata  = util.encodeBase64String(vars.get("$field.texText"));
-}
-
-if(bindata != "" && filename != "")
-{
-    db.insertBinary("DOCUMENTTEMPLATE", "DOCUMENT", vars.get("$field.DOCUMENTTEMPLATEID"), 
-                    "", bindata, filename, "", "", "_____SYSTEMALIAS");
+import("system.result");
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.util");
+import("Document_lib");
+
+//TODO - Function
+
+var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
+var filename = "";
+var bindata = "";
+
+if(bindataUpload != "")
+{
+    filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
+    bindata  = bindataUpload;
+}
+else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
+{
+    filename = vars.get("$field.NAME") + ".html";
+    bindata  = util.encodeBase64String(vars.get("$field.htmlText"));
+}
+else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
+{
+    filename = vars.get("$field.NAME") + ".txt";
+    bindata  = util.encodeBase64String(vars.get("$field.texText"));
+}
+
+if(bindata != "" && filename != "")
+{
+    db.insertBinary("DOCUMENTTEMPLATE", "DOCUMENT", vars.get("$field.DOCUMENTTEMPLATEID"), 
+                    "", bindata, filename, "", "", "_____SYSTEMALIAS");
 }
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index ba7f76d6c4bfba1faa27979536d6f41eec89b044..5a68a399215615d760cc5d8a5181ccd63c4ff4fb 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,312 +1,312 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Document_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Document</title>
-  <iconId>VAADIN:FILE</iconId>
-  <titlePlural>Documents</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>6bbed1fb-7f22-420d-988e-7f9413c0b294</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>NAME</name>
-      <title>Filename</title>
-      <mandatory v="true" />
-      <state>AUTO</state>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>Filetype</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>SIZE</name>
-      <title>Filesize</title>
-      <contentType>FILESIZE</contentType>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>MINUTE</resolution>
-      <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
-      <inputFormat>dd.MM.yyyy HH:mm:ss</inputFormat>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>PREVIEW_IMAGE</name>
-      <title>Vorschau</title>
-      <contentType>IMAGE</contentType>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>BINDATA_UPLOAD</name>
-      <title>Datei</title>
-      <contentType>FILE</contentType>
-      <onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityActionGroup>
-      <name>Document_actions</name>
-      <children>
-        <entityActionField>
-          <name>downloadFilesAction</name>
-          <fieldType>ACTION</fieldType>
-          <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
-          <isObjectAction v="false" />
-          <isSelectionAction v="true" />
-          <iconId>VAADIN:DOWNLOAD</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityParameter>
-      <name>AssignmentTable_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>AssignmentName_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>AssignmentRowId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>UID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Beschreibung</title>
-      <contentType>LONG_TEXT</contentType>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>KEYWORD</name>
-      <title>Schlüsselwort</title>
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>IS_MAIN_DOCUMENT</name>
-      <title>Hauptdokument</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityParameter>
-      <name>Keyword_param</name>
-      <expose v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionField>
-      <name>downloadSingleFileAction</name>
-      <fieldType>ACTION</fieldType>
-      <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:DOWNLOAD</iconId>
-    </entityActionField>
-    <entityProvider>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>e4f23cab-a238-4123-8f96-1e09b9da3cb7</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8867e012-ed4e-4c34-9c1f-402acf910190</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>af4d109a-9265-4119-926e-b1fef4b3a2b3</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>92765669-c236-44c1-bacf-6d1aef7c1433</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>0d8ec167-6db1-4a8b-b1d5-8cba3f050bca</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>31a82406-7a61-49d9-b75b-731040614ecb</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>35ebe1f6-b2a2-4659-8b50-afdbe37269de</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>abd400df-a5a4-4750-b3a4-0476b2721161</name>
-          <entityName>Employee_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>e326d4f9-40fd-42c8-88d6-0c5cefc6fa71</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>Documents</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-          <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Keyword_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityProvider>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>87d738a5-5d5e-425e-b013-007371475a38</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>457fd01e-4197-4fca-8079-e2025295f89c</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>ff2d676c-7dd0-47ad-b7f2-ce35b0546e9f</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>75c1875c-5cb6-4cae-8bc7-82c45a2934e5</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8366d11d-4c46-4410-b255-6d196229a534</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>dfd2ed28-212f-4135-8f0c-7772f17b6ee6</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>MainDocuments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>Keyword_param</name>
-          <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <mandatory v="true" />
-          <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-          <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Document_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>NAME.value</element>
-        <element>SIZE.value</element>
-        <element>DATE_EDIT.value</element>
-        <element>PREVIEW_IMAGE.value</element>
-        <element>TYPE.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>KEYWORD.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Document_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Document</title>
+  <iconId>VAADIN:FILE</iconId>
+  <titlePlural>Documents</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>6bbed1fb-7f22-420d-988e-7f9413c0b294</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>NAME</name>
+      <title>Filename</title>
+      <mandatory v="true" />
+      <state>AUTO</state>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Filetype</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>SIZE</name>
+      <title>Filesize</title>
+      <contentType>FILESIZE</contentType>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>MINUTE</resolution>
+      <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
+      <inputFormat>dd.MM.yyyy HH:mm:ss</inputFormat>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>PREVIEW_IMAGE</name>
+      <title>Vorschau</title>
+      <contentType>IMAGE</contentType>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>BINDATA_UPLOAD</name>
+      <title>Datei</title>
+      <contentType>FILE</contentType>
+      <onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityActionGroup>
+      <name>Document_actions</name>
+      <children>
+        <entityActionField>
+          <name>downloadFilesAction</name>
+          <fieldType>ACTION</fieldType>
+          <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:DOWNLOAD</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityParameter>
+      <name>AssignmentTable_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AssignmentName_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AssignmentRowId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>UID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Beschreibung</title>
+      <contentType>LONG_TEXT</contentType>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>KEYWORD</name>
+      <title>Schlüsselwort</title>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IS_MAIN_DOCUMENT</name>
+      <title>Hauptdokument</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityParameter>
+      <name>Keyword_param</name>
+      <expose v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>downloadSingleFileAction</name>
+      <fieldType>ACTION</fieldType>
+      <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:DOWNLOAD</iconId>
+    </entityActionField>
+    <entityProvider>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e4f23cab-a238-4123-8f96-1e09b9da3cb7</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8867e012-ed4e-4c34-9c1f-402acf910190</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>af4d109a-9265-4119-926e-b1fef4b3a2b3</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>92765669-c236-44c1-bacf-6d1aef7c1433</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>0d8ec167-6db1-4a8b-b1d5-8cba3f050bca</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>31a82406-7a61-49d9-b75b-731040614ecb</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>35ebe1f6-b2a2-4659-8b50-afdbe37269de</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>abd400df-a5a4-4750-b3a4-0476b2721161</name>
+          <entityName>Employee_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e326d4f9-40fd-42c8-88d6-0c5cefc6fa71</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+          <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Keyword_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityProvider>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>87d738a5-5d5e-425e-b013-007371475a38</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>457fd01e-4197-4fca-8079-e2025295f89c</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>ff2d676c-7dd0-47ad-b7f2-ce35b0546e9f</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>75c1875c-5cb6-4cae-8bc7-82c45a2934e5</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8366d11d-4c46-4410-b255-6d196229a534</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>dfd2ed28-212f-4135-8f0c-7772f17b6ee6</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>MainDocuments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Keyword_param</name>
+          <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <mandatory v="true" />
+          <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+          <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Document_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>NAME.value</element>
+        <element>SIZE.value</element>
+        <element>DATE_EDIT.value</element>
+        <element>PREVIEW_IMAGE.value</element>
+        <element>TYPE.value</element>
+        <element>DESCRIPTION.value</element>
+        <element>KEYWORD.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..66d720c4477bc0e4dd699bff942ea98d91b3c3fd
--- /dev/null
+++ b/entity/Email_entity/Email_entity.aod
@@ -0,0 +1,71 @@
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Email_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>DOCUMENT_TEMPLATE</name>
+      <title>Document Template</title>
+      <consumer>DocumnetTemplates</consumer>
+      <linkedContext>DocumentTemplate</linkedContext>
+    </entityField>
+    <entityConsumer>
+      <name>DocumnetTemplates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>Recipient_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>RECIPIENT</name>
+      <title>Recipient</title>
+      <consumer>EmailAddresses</consumer>
+      <valueProcess>%aditoprj%/entity/Email_entity/entityfields/recipient/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Email_entity/entityfields/recipient/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>EmailAddresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>EmailCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <onInsert>%aditoprj%/entity/Email_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFields>
+        <element>UID.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js b/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a6cbb1ace318c2cbb496a21e49d5339cb92f206
--- /dev/null
+++ b/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+    result.string(vars.get("$param.ContactId_param"));
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/recipient/displayValueProcess.js b/entity/Email_entity/entityfields/recipient/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..465e0a9f7198021c0d439c55cbeaff0d5c566f89
--- /dev/null
+++ b/entity/Email_entity/entityfields/recipient/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/recipient/valueProcess.js b/entity/Email_entity/entityfields/recipient/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1115022a7a85a8c8283ab6429fa117100664a2c9
--- /dev/null
+++ b/entity/Email_entity/entityfields/recipient/valueProcess.js
@@ -0,0 +1,12 @@
+import("Communication_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    if (vars.exists("$param.Recipient_param") && vars.get("$param.Recipient_param"))
+        result.string(vars.get("$param.Recipient_param"));
+    else if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+        result.string(CommUtil.getStandardMail(vars.get("$param.ContactId_param")));
+}
\ No newline at end of file
diff --git a/entity/Email_entity/recordcontainers/jdito/onInsert.js b/entity/Email_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..f838dfce9ecf292a6fa77e741074e5cd60beae8f
--- /dev/null
+++ b/entity/Email_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,5 @@
+import("Employee_lib");
+import("system.vars");
+import("Email_lib");
+
+EmailUtils.openMailTemplate(vars.get("$field.RECIPIENT"), EmployeeUtils.getCurrentContactId(), vars.get("$field.DOCUMENT_TEMPLATE"));
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index c93663f15f02a54e90f6e925e6518cc8e3c1effc..693175fd176332885fc7e5b3bc99975bc0dc58a2 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,60 +1,60 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>EmployeeRole_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Role</title>
-  <titlePlural>Roles</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityParameter>
-      <name>UserTitle_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>EmployeeRoles</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
-          <entityName>Employee_entity</entityName>
-          <fieldName>EmployeeRoles</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>UserTitle_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>ROLE</name>
-      <title>Role</title>
-      <dropDownProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ROLE.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>EmployeeRole_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Role</title>
+  <titlePlural>Roles</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityParameter>
+      <name>UserTitle_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>EmployeeRoles</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+          <entityName>Employee_entity</entityName>
+          <fieldName>EmployeeRoles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>UserTitle_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>ROLE</name>
+      <title>Role</title>
+      <dropDownProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>ROLE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 60f11944b749b458685626237123419ba5e2842b..84dfd7afd61de055e61fb858231381fed435c3d9 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,297 +1,298 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Employee_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Employee</title>
-  <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
-  <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:USER</iconId>
-  <titlePlural>Employees</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <lookupIdfield>CONTACT_ID</lookupIdfield>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/uid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-      <title>Username</title>
-      <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Person</title>
-      <consumer>Contacts</consumer>
-      <linkedContext>Person</linkedContext>
-      <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/contact_id/stateProcess.js</stateProcess>
-      <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValueChange.js</onValueChange>
-      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>FIRSTNAME</name>
-      <title>Firstname</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>LASTNAME</name>
-      <title>Lastname</title>
-      <mandatory v="false" />
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>ISACTIVE</name>
-      <title>Active</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>EMAIL_ADDRESS</name>
-      <title>Email</title>
-      <mandatory v="true" />
-      <dropDownProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/email_address/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>PASSWORD</name>
-      <title>Password</title>
-      <contentType>PASSWORD</contentType>
-      <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>CONFIRM_PASSWORD</name>
-      <title>Confirm password</title>
-      <contentType>PASSWORD</contentType>
-      <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
-    </entityField>
-    <entityActionField>
-      <name>setPassword</name>
-      <fieldType>ACTION</fieldType>
-      <title>Set password</title>
-      <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PASSWORD</iconId>
-    </entityActionField>
-    <entityParameter>
-      <name>PasswordChange_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OnlyActives_param</name>
-      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Contacts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityFieldGroup>
-      <name>NAME_fieldGroup</name>
-      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
-      <title>Name</title>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>FIRSTNAME</element>
-        <element>LASTNAME</element>
-      </fields>
-    </entityFieldGroup>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>DEPARTMENT</name>
-      <title>Department</title>
-      <consumer>Departments</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Employee_entity/entityfields/department/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>ROLES</name>
-    </entityField>
-    <entityConsumer>
-      <name>EmployeeRoles</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>EmployeeRole_entity</entityName>
-        <fieldName>EmployeeRoles</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>UserTitle_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>Employees</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <lookupIdfield>CONTACT_ID</lookupIdfield>
-      <dependencies>
-        <entityDependency>
-          <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>Employees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
-          <entityName>Timetracking_entity</entityName>
-          <fieldName>Employees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>02bacafb-433c-497d-8561-96c426da61e9</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>Employee</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>fefc05d2-6087-4600-bc77-80804654809e</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>Employees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>OnlyActives_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Departments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Attribute_entity</entityName>
-        <fieldName>AttributeParent</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AttrParentId_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AttrParentType_param</name>
-          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-        <element>ISACTIVE.value</element>
-        <element>FIRSTNAME.value</element>
-        <element>LASTNAME.value</element>
-        <element>EMAIL_ADDRESS.value</element>
-        <element>EMAIL_ADDRESS.displayValue</element>
-        <element>DESCRIPTION.value</element>
-        <element>CONTACT_ID.value</element>
-        <element>CONTACT_ID.displayValue</element>
-        <element>DEPARTMENT.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Employee_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Employee</title>
+  <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+  <iconId>VAADIN:USER</iconId>
+  <titlePlural>Employees</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <lookupIdfield>CONTACT_ID</lookupIdfield>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Username</title>
+      <mandatory v="true" />
+      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Person</title>
+      <consumer>Contacts</consumer>
+      <linkedContext>Person</linkedContext>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/contact_id/stateProcess.js</stateProcess>
+      <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValueChange.js</onValueChange>
+      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>FIRSTNAME</name>
+      <title>Firstname</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>LASTNAME</name>
+      <title>Lastname</title>
+      <mandatory v="false" />
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>ISACTIVE</name>
+      <title>Active</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>EMAIL_ADDRESS</name>
+      <title>Email</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/email_address/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>PASSWORD</name>
+      <title>Password</title>
+      <contentType>PASSWORD</contentType>
+      <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>CONFIRM_PASSWORD</name>
+      <title>Confirm password</title>
+      <contentType>PASSWORD</contentType>
+      <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
+    </entityField>
+    <entityActionField>
+      <name>setPassword</name>
+      <fieldType>ACTION</fieldType>
+      <title>Set password</title>
+      <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PASSWORD</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>PasswordChange_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OnlyActives_param</name>
+      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Contacts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Employee_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityFieldGroup>
+      <name>NAME_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+      <title>Name</title>
+      <description>FIELDGROUP</description>
+      <fields>
+        <element>FIRSTNAME</element>
+        <element>LASTNAME</element>
+      </fields>
+    </entityFieldGroup>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>DEPARTMENT</name>
+      <title>Department</title>
+      <consumer>Departments</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Employee_entity/entityfields/department/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>ROLES</name>
+    </entityField>
+    <entityConsumer>
+      <name>EmployeeRoles</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeRole_entity</entityName>
+        <fieldName>EmployeeRoles</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>UserTitle_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>Employees</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>CONTACT_ID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>Employees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
+          <entityName>Timetracking_entity</entityName>
+          <fieldName>Employees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>02bacafb-433c-497d-8561-96c426da61e9</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>Employee</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>fefc05d2-6087-4600-bc77-80804654809e</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>Employees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>OnlyActives_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Departments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>AttributeParent</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AttrParentId_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/attrparentid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AttrParentType_param</name>
+          <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/attrparenttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TITLE.value</element>
+        <element>ISACTIVE.value</element>
+        <element>FIRSTNAME.value</element>
+        <element>LASTNAME.value</element>
+        <element>EMAIL_ADDRESS.value</element>
+        <element>EMAIL_ADDRESS.displayValue</element>
+        <element>DESCRIPTION.value</element>
+        <element>CONTACT_ID.value</element>
+        <element>CONTACT_ID.displayValue</element>
+        <element>DEPARTMENT.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/entityfields/attributes/onValidation.js b/entity/Employee_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca5cebe6bd635865e7f58c5adc5d116c21bfe0a1
--- /dev/null
+++ b/entity/Employee_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,8 @@
+import("Employee_lib");
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(EmployeeUtils.sliceUserId(vars.get("$field.UID")), 
+    ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 503b437ebcc132db154ea0cca14af0b7f76d130f..68ffad7a3767b22591734aae1974f1fa2b0fb760 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,37 +1,37 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Gender_keyword</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>VALUE</name>
-    </entityField>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>ede7d623-3709-4d22-85fa-30214e2293e2</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Genders</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Gender_keyword/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>VALUE.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Gender_keyword</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>ede7d623-3709-4d22-85fa-30214e2293e2</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Genders</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Gender_keyword/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>VALUE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index b58bf24e71a39e460faf734a701a3126f23c73cc..77266de0d3d39e579174466c808905abd7779a35 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,13 +1,13 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>IndexSearchEntity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>INDEXSEARCHFIELD</name>
-    </entityField>
-  </entityFields>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>IndexSearchEntity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INDEXSEARCHFIELD</name>
+    </entityField>
+  </entityFields>
+</entity>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index ba3cd8e4188fca386e9e5da83bb0f7b7b1e32090..5dbba80fa04c8448e6428f2f01519d0a833dc183 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,166 +1,166 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>KeywordAttributeRelation_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
-  <title>Keyword Attribute Values</title>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attributerelationid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CHAR_VALUE</name>
-      <title>CHAR_VALUE</title>
-    </entityField>
-    <entityField>
-      <name>NUMBER_VALUE</name>
-      <contentType>NUMBER</contentType>
-    </entityField>
-    <entityField>
-      <name>BOOL_VALUE</name>
-      <contentType>BOOLEAN</contentType>
-    </entityField>
-    <entityField>
-      <name>AB_KEYWORD_ATTRIBUTE_ID</name>
-      <title>Keyword Attribute</title>
-      <consumer>KeywordAttributes</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
-    </entityField>
-    <entityField>
-      <name>AB_KEYWORD_ENTRY_ID</name>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>AttributesForKeywordEntry</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <titlePlural></titlePlural>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
-          <entityName>KeywordEntry_entity</entityName>
-          <fieldName>KeywordAttributeRelations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>53b35858-7c81-429c-9e06-0362f567ad42</name>
-          <entityName>KeywordEntry_entity</entityName>
-          <fieldName>KeywordAttributeRelationsReadOnly</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>KeywordEntryId_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="false" />
-          <mandatory v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ContainerName_param</name>
-      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordAttributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordAttribute_entity</entityName>
-        <fieldName>SpecificContainerKeyword</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>FilterAlreadyUsedByEntryId_param</name>
-          <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>KeywordEntryId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>valueProxy</name>
-      <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
-      <title>Value</title>
-      <contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
-    </entityField>
-    <entityField>
-      <name>attributeType</name>
-      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
-          <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
-          <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTERELATIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>BOOL_VALUE.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CHAR_VALUE.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NUMBER_VALUE.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ATTRIBUTE_ID.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ENTRY_ID.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ATTRIBUTE_ID.displayValue</name>
-          <expression>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/recordfieldmappings/ab_keyword_attribute_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>KeywordAttributeRelation_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
+  <title>Keyword Attribute Values</title>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attributerelationid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CHAR_VALUE</name>
+      <title>CHAR_VALUE</title>
+    </entityField>
+    <entityField>
+      <name>NUMBER_VALUE</name>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityField>
+      <name>BOOL_VALUE</name>
+      <contentType>BOOLEAN</contentType>
+    </entityField>
+    <entityField>
+      <name>AB_KEYWORD_ATTRIBUTE_ID</name>
+      <title>Keyword Attribute</title>
+      <consumer>KeywordAttributes</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>AB_KEYWORD_ENTRY_ID</name>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>AttributesForKeywordEntry</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <titlePlural></titlePlural>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
+          <entityName>KeywordEntry_entity</entityName>
+          <fieldName>KeywordAttributeRelations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>53b35858-7c81-429c-9e06-0362f567ad42</name>
+          <entityName>KeywordEntry_entity</entityName>
+          <fieldName>KeywordAttributeRelationsReadOnly</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>KeywordEntryId_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="false" />
+          <mandatory v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ContainerName_param</name>
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordAttributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordAttribute_entity</entityName>
+        <fieldName>SpecificContainerKeyword</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterAlreadyUsedByEntryId_param</name>
+          <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>KeywordEntryId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>valueProxy</name>
+      <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
+      <title>Value</title>
+      <contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>attributeType</name>
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
+          <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
+          <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTERELATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>BOOL_VALUE.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CHAR_VALUE.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NUMBER_VALUE.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ATTRIBUTE_ID.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ENTRY_ID.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ATTRIBUTE_ID.displayValue</name>
+          <expression>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/recordfieldmappings/ab_keyword_attribute_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index f47ef00fbc88e7f821c01e0e849283dbc3029248..38e8ecc446d0573f51871f420eed143f2fea2ee6 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,131 +1,131 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>KeywordAttribute_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
-  <title>Keyword Attribute</title>
-  <contentTitleProcess>%aditoprj%/entity/KeywordAttribute_entity/contentTitleProcess.js</contentTitleProcess>
-  <iconId>VAADIN:KEY_O</iconId>
-  <iconIdProcess>%aditoprj%/entity/KeywordAttribute_entity/iconIdProcess.js</iconIdProcess>
-  <titlePlural>Keyword Attributes</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>AB_KEYWORD_ATTRIBUTEID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/ab_keyword_attributeid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTAINER</name>
-      <title>Container</title>
-      <mandatory v="true" />
-      <dropDownProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-      <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/name/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>Type</title>
-      <consumer>KeywordAttributeTypes</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityProvider>
-      <name>SpecificContainerKeyword</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc</documentation>
-      <dependencies>
-        <entityDependency>
-          <name>1d11c064-1cf2-4f08-b842-9fa941ad3157</name>
-          <entityName>KeywordAttributeRelation_entity</entityName>
-          <fieldName>KeywordAttributes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <triggerRecalculation v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>FilterAlreadyUsedByEntryId_param</name>
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ContainerName_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>FilterAlreadyUsedByEntryId_param</name>
-      <expose v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/filteralreadyusedbyentryid_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordAttributeTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <onDBDelete>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>bd113d67-34ab-4708-b0e5-60a44332e6b8</name>
-          <tableName>AB_KEYWORD_ATTRIBUTE</tableName>
-          <primaryKey>AB_KEYWORD_ATTRIBUTEID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ATTRIBUTEID.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTAINER.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTE.CONTAINER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTE.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>AB_KEYWORD_ATTRIBUTE.TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.displayValue</name>
-          <expression>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>KeywordAttribute_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
+  <title>Keyword Attribute</title>
+  <contentTitleProcess>%aditoprj%/entity/KeywordAttribute_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconId>VAADIN:KEY_O</iconId>
+  <iconIdProcess>%aditoprj%/entity/KeywordAttribute_entity/iconIdProcess.js</iconIdProcess>
+  <titlePlural>Keyword Attributes</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>AB_KEYWORD_ATTRIBUTEID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/ab_keyword_attributeid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTAINER</name>
+      <title>Container</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+      <onValidation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/name/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <consumer>KeywordAttributeTypes</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>SpecificContainerKeyword</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>1d11c064-1cf2-4f08-b842-9fa941ad3157</name>
+          <entityName>KeywordAttributeRelation_entity</entityName>
+          <fieldName>KeywordAttributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <triggerRecalculation v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterAlreadyUsedByEntryId_param</name>
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ContainerName_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>FilterAlreadyUsedByEntryId_param</name>
+      <expose v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/filteralreadyusedbyentryid_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordAttributeTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/KeywordAttribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <onDBDelete>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>bd113d67-34ab-4708-b0e5-60a44332e6b8</name>
+          <tableName>AB_KEYWORD_ATTRIBUTE</tableName>
+          <primaryKey>AB_KEYWORD_ATTRIBUTEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ATTRIBUTEID.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTAINER.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTE.CONTAINER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTE.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>AB_KEYWORD_ATTRIBUTE.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.displayValue</name>
+          <expression>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 7d0c99037ed263c88d12be48776b26a4959af90a..f7dacc688967a260bc2ffcec454dc412bfd62741 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,503 +1,509 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>KeywordEntry_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
-  <title>Keyword</title>
-  <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
-  <onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:KEY</iconId>
-  <iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
-  <titlePlural>Keywords</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <lookupIdfield>KEYID</lookupIdfield>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>CONTAINER</name>
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation>
-      <title>Container</title>
-      <mandatory v="true" />
-      <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-      <groupable v="true" />
-      <state>READONLY</state>
-      <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>AB_KEYWORD_ENTRYID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>KEYID</name>
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
-      <title>Key</title>
-      <mandatory v="true" />
-      <state>READONLY</state>
-      <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-      <title>Title (original language)</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>SORTING</name>
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
-      <title>Sorting</title>
-      <mandatory v="false" />
-      <state>AUTO</state>
-    </entityField>
-    <entityField>
-      <name>ISACTIVE</name>
-      <title>Active</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ISESSENTIAL</name>
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/documentation.adoc</documentation>
-      <title>Relational</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/dropDownProcess.js</dropDownProcess>
-      <state>READONLY</state>
-    </entityField>
-    <entityParameter>
-      <name>ContainerName_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
-    </entityParameter>
-    <entityProvider>
-      <name>SpecificContainerKeywords</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <lookupIdfield>KEYID</lookupIdfield>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>KeywordContactStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>KeywordDirections</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>ContractPayments</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>ContractStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>ContractTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>KeywordCurrencies</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>KeywordCurrencies</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
-          <entityName>Productprice_entity</entityName>
-          <fieldName>KeywordCurrencies</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
-          <entityName>Offeritem_entity</entityName>
-          <fieldName>KeywordProductGroupcodes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
-          <entityName>Orderitem_entity</entityName>
-          <fieldName>KeywordProductGroupcodes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>c404b010-1634-4160-adca-7edf1535ee26</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>KeywordProductGroupcodes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
-          <entityName>SalesprojectForecast_entity</entityName>
-          <fieldName>KeywordProductGroupcodes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>KeywordOfferStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>KeywordOrganisationTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>KeywordGenders</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>001e0934-0920-4b38-afff-caf299e96abf</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>KeywordTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>KeywordStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
-          <entityName>Productprice_entity</entityName>
-          <fieldName>KeywordPricelists</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
-          <entityName>Offeritem_entity</entityName>
-          <fieldName>KeywordQuantityUnits</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
-          <entityName>Orderitem_entity</entityName>
-          <fieldName>KeywordQuantityUnits</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>KeywordQuantityUnits</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
-          <entityName>SalesprojectMember_entity</entityName>
-          <fieldName>KeywordMemberRoles</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
-          <entityName>SalesprojectSource_entity</entityName>
-          <fieldName>KeywordSources</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>36a72192-902f-431b-8f43-0bef311678f7</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>KeywordStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
-          <entityName>Stock_entity</entityName>
-          <fieldName>KeywordWarehouses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
-          <entityName>KeywordAttribute_entity</entityName>
-          <fieldName>KeywordAttributeTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
-          <entityName>Attribute_entity</entityName>
-          <fieldName>KeywordAttributeTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>718fe5a2-c75f-49ed-b67e-fc4fbf63ff1d</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>KeywordProbabilties</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>KeywordCategories</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>KeywordProbabilities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>fa831dac-3287-422a-8f28-504fc525876a</name>
-          <entityName>Communication_entity</entityName>
-          <fieldName>KeywordMediums</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>KeywordPricePolitics</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>KeywordPricePolitics</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>KeywordWeaknesses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>854148e2-2532-4562-b393-832819e8d462</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>KeywordStrenghts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>613d5861-0494-45f9-a839-a705347a68da</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>KeywordWeaknesses</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>KeywordStrenghts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>KeywordStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>KeywordPhases</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f672b4a5-7d68-46c8-9834-4f706d0d8720</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>KeywordPhases</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>KeywordPriorities</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>KeywordStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>KeywordWonLost</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>KeywordProgress</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>36aa04c1-5361-4e40-a036-0546db596973</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>KeywordDeliveryTerm</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>KeywordPaymentTerm</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>77be3cca-8b50-4810-9549-3fd3e6fdf220</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>KeywordContactStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
-          <entityName>Contact_entity</entityName>
-          <fieldName>KeywordContactStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
-          <entityName>SalesprojectMilestone_entity</entityName>
-          <fieldName>Keywords</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>KeywordStates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
-          <entityName>CampaignCost_entitiy</entityName>
-          <fieldName>KeywordCampaignManagementCostCategory</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>OnlyActives_param</name>
-          <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>TITLE_TRANSLATED</name>
-      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>OnlyActives_param</name>
-      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordAttributeRelations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordAttributeRelation_entity</entityName>
-        <fieldName>AttributesForKeywordEntry</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>KeywordEntryId_param</name>
-          <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordAttributeRelationsReadOnly</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
-      <state>READONLY</state>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordAttributeRelation_entity</entityName>
-        <fieldName>AttributesForKeywordEntry</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>KeywordEntryId_param</name>
-          <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>ExcludedKeyIdsSubquery_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <isPageable v="false" />
-      <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
-          <tableName>AB_KEYWORD_ENTRY</tableName>
-          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>TITLE.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SORTING.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.SORTING</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ISESSENTIAL.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.ISESSENTIAL</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ISACTIVE.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.ISACTIVE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>AB_KEYWORD_ENTRYID.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>KEYID.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTAINER.value</name>
-          <recordfield>AB_KEYWORD_ENTRY.CONTAINER</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>KeywordEntry_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
+  <title>Keyword</title>
+  <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
+  <onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
+  <iconId>VAADIN:KEY</iconId>
+  <iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
+  <titlePlural>Keywords</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <lookupIdfield>KEYID</lookupIdfield>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>CONTAINER</name>
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation>
+      <title>Container</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+      <groupable v="true" />
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>AB_KEYWORD_ENTRYID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>KEYID</name>
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
+      <title>Key</title>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Title (original language)</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>SORTING</name>
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
+      <title>Sorting</title>
+      <mandatory v="false" />
+      <state>AUTO</state>
+    </entityField>
+    <entityField>
+      <name>ISACTIVE</name>
+      <title>Active</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ISESSENTIAL</name>
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/documentation.adoc</documentation>
+      <title>Relational</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/dropDownProcess.js</dropDownProcess>
+      <state>READONLY</state>
+    </entityField>
+    <entityParameter>
+      <name>ContainerName_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityProvider>
+      <name>SpecificContainerKeywords</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>KEYID</lookupIdfield>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>KeywordContactStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>KeywordDirections</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractPayments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordCurrencies</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>KeywordCurrencies</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
+          <entityName>Productprice_entity</entityName>
+          <fieldName>KeywordCurrencies</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
+          <entityName>Offeritem_entity</entityName>
+          <fieldName>KeywordProductGroupcodes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
+          <entityName>Orderitem_entity</entityName>
+          <fieldName>KeywordProductGroupcodes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>c404b010-1634-4160-adca-7edf1535ee26</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>KeywordProductGroupcodes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
+          <entityName>SalesprojectForecast_entity</entityName>
+          <fieldName>KeywordProductGroupcodes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordOfferStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>KeywordOrganisationTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>KeywordGenders</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>001e0934-0920-4b38-afff-caf299e96abf</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>KeywordTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>KeywordStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
+          <entityName>Productprice_entity</entityName>
+          <fieldName>KeywordPricelists</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
+          <entityName>Offeritem_entity</entityName>
+          <fieldName>KeywordQuantityUnits</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
+          <entityName>Orderitem_entity</entityName>
+          <fieldName>KeywordQuantityUnits</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>KeywordQuantityUnits</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
+          <entityName>SalesprojectMember_entity</entityName>
+          <fieldName>KeywordMemberRoles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
+          <entityName>SalesprojectSource_entity</entityName>
+          <fieldName>KeywordSources</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>36a72192-902f-431b-8f43-0bef311678f7</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>KeywordStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
+          <entityName>Stock_entity</entityName>
+          <fieldName>KeywordWarehouses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
+          <entityName>KeywordAttribute_entity</entityName>
+          <fieldName>KeywordAttributeTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
+          <entityName>Attribute_entity</entityName>
+          <fieldName>KeywordAttributeTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>718fe5a2-c75f-49ed-b67e-fc4fbf63ff1d</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>KeywordProbabilties</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>KeywordCategories</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordProbabilities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>fa831dac-3287-422a-8f28-504fc525876a</name>
+          <entityName>Communication_entity</entityName>
+          <fieldName>KeywordMediums</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>KeywordPricePolitics</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>KeywordPricePolitics</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>KeywordWeaknesses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>854148e2-2532-4562-b393-832819e8d462</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>KeywordStrenghts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>613d5861-0494-45f9-a839-a705347a68da</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>KeywordWeaknesses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>KeywordStrenghts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>KeywordStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>KeywordPhases</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f672b4a5-7d68-46c8-9834-4f706d0d8720</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>KeywordPhases</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>KeywordPriorities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>KeywordStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>KeywordWonLost</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>KeywordProgress</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>36aa04c1-5361-4e40-a036-0546db596973</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordDeliveryTerm</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordPaymentTerm</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>77be3cca-8b50-4810-9549-3fd3e6fdf220</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>KeywordContactStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
+          <entityName>Contact_entity</entityName>
+          <fieldName>KeywordContactStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
+          <entityName>SalesprojectMilestone_entity</entityName>
+          <fieldName>Keywords</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>KeywordStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
+          <entityName>CampaignCost_entitiy</entityName>
+          <fieldName>KeywordCampaignManagementCostCategory</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
+          <entityName>ClassificationAdmin_entity</entityName>
+          <fieldName>KeywordClassificationTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>OnlyActives_param</name>
+          <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>TITLE_TRANSLATED</name>
+      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>OnlyActives_param</name>
+      <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordAttributeRelations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordAttributeRelation_entity</entityName>
+        <fieldName>AttributesForKeywordEntry</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>KeywordEntryId_param</name>
+          <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordAttributeRelationsReadOnly</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
+      <state>READONLY</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordAttributeRelation_entity</entityName>
+        <fieldName>AttributesForKeywordEntry</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>KeywordEntryId_param</name>
+          <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ExcludedKeyIdsSubquery_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
+          <tableName>AB_KEYWORD_ENTRY</tableName>
+          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SORTING.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.SORTING</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISESSENTIAL.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.ISESSENTIAL</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISACTIVE.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.ISACTIVE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AB_KEYWORD_ENTRYID.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>KEYID.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTAINER.value</name>
+          <recordfield>AB_KEYWORD_ENTRY.CONTAINER</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index b2c5a1ddb4088d1497986509346bd01575ec1ad9..a48773e349f846792176135310cd2c8b9c22b1fa 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,111 +1,111 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Language_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>ISO2</name>
-    </entityField>
-    <entityField>
-      <name>ISO3</name>
-    </entityField>
-    <entityField>
-      <name>NAME_NATIVE</name>
-    </entityField>
-    <entityField>
-      <name>NAME_LATIN</name>
-    </entityField>
-    <entityField>
-      <name>ISACTIVE</name>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Language_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
-    </entityField>
-    <entityProvider>
-      <name>ISO3Name</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <lookupIdfield>ISO3</lookupIdfield>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Languages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3429b46c-03e1-458a-9b60-0b6d2a560ce1</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Languages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>d2ae2b80-941f-42c5-89a4-67269d9a0411</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Languages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f0fd487b-6d1e-4247-8539-4b0912b003f8</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Languages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>0b2dd6bf-933f-4476-9071-de9d5e23800b</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Languages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>030ac1ae-5f5b-4815-b9f4-1121b7c881ad</name>
-          <entityName>Contact_entity</entityName>
-          <fieldName>Languages</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <linkInformation>
-        <linkInformation>
-          <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
-          <tableName>AB_LANGUAGE</tableName>
-          <primaryKey>ISO3</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ISACTIVE.value</name>
-          <recordfield>AB_LANGUAGE.ISACTIVE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ISO2.value</name>
-          <recordfield>AB_LANGUAGE.ISO2</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ISO3.value</name>
-          <recordfield>AB_LANGUAGE.ISO3</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME_LATIN.value</name>
-          <recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME_NATIVE.value</name>
-          <recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Language_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>ISO2</name>
+    </entityField>
+    <entityField>
+      <name>ISO3</name>
+    </entityField>
+    <entityField>
+      <name>NAME_NATIVE</name>
+    </entityField>
+    <entityField>
+      <name>NAME_LATIN</name>
+    </entityField>
+    <entityField>
+      <name>ISACTIVE</name>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Language_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityProvider>
+      <name>ISO3Name</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <lookupIdfield>ISO3</lookupIdfield>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3429b46c-03e1-458a-9b60-0b6d2a560ce1</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>d2ae2b80-941f-42c5-89a4-67269d9a0411</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f0fd487b-6d1e-4247-8539-4b0912b003f8</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>0b2dd6bf-933f-4476-9071-de9d5e23800b</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>030ac1ae-5f5b-4815-b9f4-1121b7c881ad</name>
+          <entityName>Contact_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <linkInformation>
+        <linkInformation>
+          <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
+          <tableName>AB_LANGUAGE</tableName>
+          <primaryKey>ISO3</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ISACTIVE.value</name>
+          <recordfield>AB_LANGUAGE.ISACTIVE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISO2.value</name>
+          <recordfield>AB_LANGUAGE.ISO2</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISO3.value</name>
+          <recordfield>AB_LANGUAGE.ISO3</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME_LATIN.value</name>
+          <recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME_NATIVE.value</name>
+          <recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 9f77d533c10d73cc8ed7364c339b6488a48a2554..9a1d817362db85463a259aedc6cd542f80ec46cb 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,124 +1,124 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>LogHistory_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Log</title>
-  <iconId>NEON:HISTORY</iconId>
-  <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
-  <titlePlural>Logs</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DATE_NEW</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>SECOND</resolution>
-      <outputFormat></outputFormat>
-      <inputFormat></inputFormat>
-      <mandatory v="true" />
-      <groupable v="true" />
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <title>User</title>
-      <mandatory v="true" />
-      <groupable v="true" />
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-      <mandatory v="true" />
-    </entityField>
-    <entityProvider>
-      <name>LogHistoryProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>LogHistoryConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>6d14d6dd-ce6e-464f-9132-3e10c1116246</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>LogHistories</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>tablenames_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>UID</name>
-      <title>ID</title>
-      <mandatory v="true" />
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <isPageable v="false" />
-      <isSortable v="false" />
-      <contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>DATE_NEW.value</element>
-        <element>USER_NEW.value</element>
-        <element>DESCRIPTION.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>LogHistory_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Log</title>
+  <iconId>NEON:HISTORY</iconId>
+  <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
+  <titlePlural>Logs</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DATE_NEW</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>SECOND</resolution>
+      <outputFormat></outputFormat>
+      <inputFormat></inputFormat>
+      <mandatory v="true" />
+      <groupable v="true" />
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <title>User</title>
+      <mandatory v="true" />
+      <groupable v="true" />
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+      <mandatory v="true" />
+    </entityField>
+    <entityProvider>
+      <name>LogHistoryProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>LogHistoryConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>6d14d6dd-ce6e-464f-9132-3e10c1116246</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>LogHistories</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>tablenames_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>UID</name>
+      <title>ID</title>
+      <mandatory v="true" />
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isPageable v="false" />
+      <isSortable v="false" />
+      <contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>DATE_NEW.value</element>
+        <element>USER_NEW.value</element>
+        <element>DESCRIPTION.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
index 0bc408653afa4d0d2d195b59631d2a3e61f2670a..523c016b478bd19e674247a3beee6a1ea5298975 100644
--- a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
@@ -1,113 +1,113 @@
-import("system.eMath");
-import("Util_lib");
-import("system.datetime");
-import("system.result");
-import("system.logging");
-import("Loghistory_lib");
-import("JditoFilter_lib");
-import("Sql_lib");
-import("system.vars");
-import("system.db");
-
-var recordCond = SqlCondition.begin();
-
-//condition for only one/some selected records 
-//since this NOT (!) a unique ID we need to filter with all the other filters (via params) too
-if (vars.exists("$local.idvalues"))
-{
-    var semiId = vars.get("$local.idvalues");//this not really an ID, it's an object that contain the grouped content fields
-    if (semiId)
-    {
-        var groupingInfo = JSON.parse(semiId);
-        recordCond.andPrepare("AB_LOGHISTORY.USER_NEW", groupingInfo.u);
-        var dateFilterValue = datetime.toLong(groupingInfo.d, "yyyy-MM-dd HH:mm");
-        recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", dateFilterValue, "# >= ?");
-        recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", eMath.addInt(dateFilterValue, datetime.ONE_MINUTE), "# < ?");
-    }
-}
-
-//condition for restricting the loghistory to some specific tables (e.g. only contact-related tables) and a specific ID
-var tableNameCond = _getTableNameCondition();
-recordCond.andSqlCondition(tableNameCond);
-
-//user defined filter
-if (vars.exists("$local.filter") && vars.get("$local.filter"))
-{
-    var filter = vars.get("$local.filter");
-    recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_LOGHISTORY")));
-}
-
-var dataQuery = recordCond.buildSql("select AB_LOGHISTORY.DATE_NEW, AB_LOGHISTORY.USER_NEW, AB_LOGHISTORY.DESCRIPTION \n\
-        from AB_LOGHISTORY ", "1 = 2", "order by DATE_NEW desc, USER_NEW asc");
-
-var data = db.table(dataQuery);
-var resultData = _groupData(data);
-result.object(resultData);
-
-
-//helper functions:
-
-//creates an identifier for grouping flat table data 
-function _makeGroupingIdentifier(pDatetime, pUser)
-{
-    //no need to translate the datepattern since this is only used for internal checks and is never displayed to the user
-    //since this is also [part of] the ID keep it very short
-    return JSON.stringify({d: datetime.toDate(pDatetime, "yyyy-MM-dd HH:mm"), u: pUser});
-}
-
-//reduce flat talbe data to grouped data. Content is grouped by the "groupingIdentifier" which is generated with "_makeGroupingIdentifier"
-function _groupData(pData)
-{
-    if ( pData.length == 0 )
-        return [];
-
-    var res = [];
-    var logDatetime, logUser, logDesc;
-    [logDatetime, logUser, logDesc] = pData[0];
-    var previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
-    var logUid = previousGroupingIdentifier;//maybe add more information? But for not thats okay
-
-    for ( var i = 1; i < pData.length; i++ )
-    {
-        if (previousGroupingIdentifier == _makeGroupingIdentifier(pData[i][0], pData[i][1]) )
-        {
-            if (logDesc != pData[i][2])
-                logDesc = pData[i][2] + "\n" + logDesc;
-        }
-        else
-        {
-            res.push([logUid, logDatetime, logUser, logDesc]);
-            [logDatetime, logUser, logDesc] = pData[i];
-            previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
-            logUid = previousGroupingIdentifier;
-        }
-    }
-    res.push([logUid, logDatetime, logUser, logDesc]);
-
-    return res;
-}
-
-//converts the very dynamic talbeName-condition to a SqlCondition
-function _getTableNameCondition()
-{
-    var tableNameCond = SqlCondition.begin();
-    var tableNamesList = JSON.parse(vars.get("$param.tablenames_param"));
-    
-    //returns the condition for one entry in the tableNamesList
-    var _getCond = function(pDefinition)
-    {
-        var resCond = SqlCondition.begin();
-        pDefinition.tableNames.forEach(function(elem){
-            resCond.orPrepare("AB_LOGHISTORY.TABLENAME", elem);
-        });
-        
-        resCond = SqlCondition.begin().andSqlCondition(resCond).andPrepare("AB_LOGHISTORY.TABLENAMEID", pDefinition.id);
-        return resCond;
-    };
-    
-    tableNamesList.forEach(function(e){
-        tableNameCond.orSqlCondition(_getCond.call(this, e));
-    });
-    
-    return tableNameCond;
+import("system.eMath");
+import("Util_lib");
+import("system.datetime");
+import("system.result");
+import("system.logging");
+import("Loghistory_lib");
+import("JditoFilter_lib");
+import("Sql_lib");
+import("system.vars");
+import("system.db");
+
+var recordCond = SqlCondition.begin();
+
+//condition for only one/some selected records 
+//since this NOT (!) a unique ID we need to filter with all the other filters (via params) too
+if (vars.exists("$local.idvalues"))
+{
+    var semiId = vars.get("$local.idvalues");//this not really an ID, it's an object that contain the grouped content fields
+    if (semiId && semiId.length > 0)
+    {
+        var groupingInfo = JSON.parse(semiId[0]);
+        recordCond.andPrepare("AB_LOGHISTORY.USER_NEW", groupingInfo.u);
+        var dateFilterValue = datetime.toLong(groupingInfo.d, "yyyy-MM-dd HH:mm");
+        recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", dateFilterValue, "# >= ?");
+        recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", eMath.addInt(dateFilterValue, datetime.ONE_MINUTE), "# < ?");
+    }
+}
+
+//condition for restricting the loghistory to some specific tables (e.g. only contact-related tables) and a specific ID
+var tableNameCond = _getTableNameCondition();
+recordCond.andSqlCondition(tableNameCond);
+
+//user defined filter
+if (vars.exists("$local.filter") && vars.get("$local.filter"))
+{
+    var filter = vars.get("$local.filter");
+    recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_LOGHISTORY")));
+}
+
+var dataQuery = recordCond.buildSql("select AB_LOGHISTORY.DATE_NEW, AB_LOGHISTORY.USER_NEW, AB_LOGHISTORY.DESCRIPTION \n\
+        from AB_LOGHISTORY ", "1 = 2", "order by DATE_NEW desc, USER_NEW asc");
+
+var data = db.table(dataQuery);
+var resultData = _groupData(data);
+result.object(resultData);
+
+
+//helper functions:
+
+//creates an identifier for grouping flat table data 
+function _makeGroupingIdentifier(pDatetime, pUser)
+{
+    //no need to translate the datepattern since this is only used for internal checks and is never displayed to the user
+    //since this is also [part of] the ID keep it very short
+    return JSON.stringify({d: datetime.toDate(pDatetime, "yyyy-MM-dd HH:mm"), u: pUser});
+}
+
+//reduce flat talbe data to grouped data. Content is grouped by the "groupingIdentifier" which is generated with "_makeGroupingIdentifier"
+function _groupData(pData)
+{
+    if ( pData.length == 0 )
+        return [];
+
+    var res = [];
+    var logDatetime, logUser, logDesc;
+    [logDatetime, logUser, logDesc] = pData[0];
+    var previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
+    var logUid = previousGroupingIdentifier;//maybe add more information? But for not thats okay
+
+    for ( var i = 1; i < pData.length; i++ )
+    {
+        if (previousGroupingIdentifier == _makeGroupingIdentifier(pData[i][0], pData[i][1]) )
+        {
+            if (logDesc != pData[i][2])
+                logDesc = pData[i][2] + "\n" + logDesc;
+        }
+        else
+        {
+            res.push([logUid, logDatetime, logUser, logDesc]);
+            [logDatetime, logUser, logDesc] = pData[i];
+            previousGroupingIdentifier = _makeGroupingIdentifier(logDatetime, logUser);
+            logUid = previousGroupingIdentifier;
+        }
+    }
+    res.push([logUid, logDatetime, logUser, logDesc]);
+
+    return res;
+}
+
+//converts the very dynamic talbeName-condition to a SqlCondition
+function _getTableNameCondition()
+{
+    var tableNameCond = SqlCondition.begin();
+    var tableNamesList = JSON.parse(vars.getString("$param.tablenames_param"));
+    
+    //returns the condition for one entry in the tableNamesList
+    var _getCond = function(pDefinition)
+    {
+        var resCond = SqlCondition.begin();
+        pDefinition.tableNames.forEach(function(elem){
+            resCond.orPrepare("AB_LOGHISTORY.TABLENAME", elem);
+        });
+        
+        resCond = SqlCondition.begin().andSqlCondition(resCond).andPrepare("AB_LOGHISTORY.TABLENAMEID", pDefinition.id);
+        return resCond;
+    };
+    
+    tableNamesList.forEach(function(e){
+        tableNameCond.orSqlCondition(_getCond.call(this, e));
+    });
+    
+    return tableNameCond;
 }
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 46c7c6385f4e228a9d742177e8823fbc271c7549..d0bc2cc4d1514f4c05816c153dc1fe3a10d431c0 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,93 +1,93 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>ModuleTree_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>History</title>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>jdito</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>TITLE</name>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-      <contentType>IMAGE</contentType>
-    </entityField>
-    <entityProvider>
-      <name>TreeProviders</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>TYPE</targetContextField>
-      <targetIdField>UID</targetIdField>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>ModuleTrees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
-          <entityName>Activity_entity</entityName>
-          <fieldName>ModuleTrees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContextName_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ID_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>PARENT_ID</name>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>PARENT_CONTEXT</name>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-    </entityField>
-    <entityParameter>
-      <name>ContextName_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ID_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TYPE.value</element>
-        <element>PARENT_ID.value</element>
-        <element>PARENT_CONTEXT.value</element>
-        <element>TITLE.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>ICON.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ModuleTree_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>History</title>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>TITLE</name>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityProvider>
+      <name>TreeProviders</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TYPE</targetContextField>
+      <targetIdField>UID</targetIdField>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ModuleTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>ModuleTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContextName_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ID_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>PARENT_ID</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+    </entityField>
+    <entityParameter>
+      <name>ContextName_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ID_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TYPE.value</element>
+        <element>PARENT_ID.value</element>
+        <element>PARENT_CONTEXT.value</element>
+        <element>TITLE.value</element>
+        <element>DESCRIPTION.value</element>
+        <element>ICON.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index e134101c4ebb308b9f5407728f26a7b28584f414..4d32b33ed19d501fd7a3f78227cde7712a5bc680 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,213 +1,231 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Notification_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Notifications</title>
-  <iconId>VAADIN:BELL</iconId>
-  <titlePlural>Notifications</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <targetContextField>LINKCONTEXT</targetContextField>
-      <targetIdField>LINKID</targetIdField>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>CONTENTID</name>
-    </entityField>
-    <entityField>
-      <name>USER</name>
-    </entityField>
-    <entityField>
-      <name>STATE</name>
-      <title>State</title>
-      <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>BACKPACK</name>
-    </entityField>
-    <entityField>
-      <name>CAPTION</name>
-      <title>title</title>
-    </entityField>
-    <entityField>
-      <name>CREATIONDATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>MINUTE</resolution>
-      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>description</title>
-    </entityField>
-    <entityField>
-      <name>FORCEDPRIORITY</name>
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>LIFETIME</name>
-    </entityField>
-    <entityField>
-      <name>ORIGINATORNAME</name>
-    </entityField>
-    <entityField>
-      <name>RECIPIENTUSERIDS</name>
-    </entityField>
-    <entityField>
-      <name>TYPECODE</name>
-      <title>Type</title>
-      <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>VERSION</name>
-    </entityField>
-    <entityField>
-      <name>LINKCONTEXT</name>
-      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkcontext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>LINKID</name>
-      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>LINKINFO</name>
-    </entityField>
-    <entityActionGroup>
-      <name>setNotificationState</name>
-      <children>
-        <entityActionField>
-          <name>archieve</name>
-          <fieldType>ACTION</fieldType>
-          <description></description>
-          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>VAADIN:ARCHIVE</iconId>
-          <tooltip>archieve</tooltip>
-        </entityActionField>
-        <entityActionField>
-          <name>setRead</name>
-          <fieldType>ACTION</fieldType>
-          <description></description>
-          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>VAADIN:OPEN_BOOK</iconId>
-          <tooltip>set read</tooltip>
-        </entityActionField>
-        <entityActionField>
-          <name>setUnread</name>
-          <fieldType>ACTION</fieldType>
-          <description></description>
-          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>VAADIN:BOOK</iconId>
-          <tooltip>set unread</tooltip>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityActionField>
-      <name>rowClickAction</name>
-      <fieldType>ACTION</fieldType>
-      <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
-    </entityActionField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>_____SYSTEMALIAS</alias>
-      <isPageable v="false" />
-      <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>33b9740c-cd3d-43ec-97e6-65c9e880655a</name>
-          <tableName>ASYS_NOTIFICATIONS</tableName>
-          <primaryKey>ID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>b9a8b01d-bdc5-4132-801f-be4e799fff1c</name>
-          <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
-          <primaryKey>CONTENTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>BACKPACK.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.BACKPACK</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CAPTION.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.CAPTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTENTID.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.CONTENTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CREATIONDATE.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATIONDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DESCRIPTION.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>FORCEDPRIORITY.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LIFETIME.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.LIFETIME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORIGINATORNAME.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.ORIGINATORNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RECIPIENTUSERIDS.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.RECIPIENTUSERIDS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.value</name>
-          <recordfield>ASYS_NOTIFICATIONS.STATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPECODE.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.TYPECODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UID.value</name>
-          <recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER.value</name>
-          <recordfield>ASYS_NOTIFICATIONS.USERID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VERSION.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.VERSION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LINKINFO.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.LINK_INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ICON.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Notification_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Notifications</title>
+  <iconId>VAADIN:BELL</iconId>
+  <titlePlural>Notifications</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <targetContextField>LINKCONTEXT</targetContextField>
+      <targetIdField>LINKID</targetIdField>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CONTENTID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>USER</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>State</title>
+      <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>BACKPACK</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CAPTION</name>
+      <title>title</title>
+    </entityField>
+    <entityField>
+      <name>CREATIONDATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>MINUTE</resolution>
+      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>description</title>
+    </entityField>
+    <entityField>
+      <name>FORCEDPRIORITY</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>LIFETIME</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ORIGINATORNAME</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>RECIPIENTUSERIDS</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>TYPECODE</name>
+      <title>Type</title>
+      <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>VERSION</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>LINKCONTEXT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkcontext/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>LINKID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>LINKINFO</name>
+      <searchable v="false" />
+    </entityField>
+    <entityActionGroup>
+      <name>setNotificationState</name>
+      <children>
+        <entityActionField>
+          <name>archieve</name>
+          <fieldType>ACTION</fieldType>
+          <title>archieve</title>
+          <description></description>
+          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:ARCHIVE</iconId>
+          <tooltip></tooltip>
+          <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>setRead</name>
+          <fieldType>ACTION</fieldType>
+          <title>setRead</title>
+          <description></description>
+          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:OPEN_BOOK</iconId>
+          <tooltip></tooltip>
+          <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>setUnread</name>
+          <fieldType>ACTION</fieldType>
+          <title>setUnread</title>
+          <description></description>
+          <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:BOOK</iconId>
+          <tooltip></tooltip>
+          <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityActionField>
+      <name>rowClickAction</name>
+      <fieldType>ACTION</fieldType>
+      <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>_____SYSTEMALIAS</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>33b9740c-cd3d-43ec-97e6-65c9e880655a</name>
+          <tableName>ASYS_NOTIFICATIONS</tableName>
+          <primaryKey>ID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>b9a8b01d-bdc5-4132-801f-be4e799fff1c</name>
+          <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
+          <primaryKey>CONTENTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>BACKPACK.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.BACKPACK</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CAPTION.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.CAPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTENTID.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.CONTENTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CREATIONDATE.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATIONDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FORCEDPRIORITY.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LIFETIME.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.LIFETIME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORIGINATORNAME.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.ORIGINATORNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RECIPIENTUSERIDS.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.RECIPIENTUSERIDS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <recordfield>ASYS_NOTIFICATIONS.STATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPECODE.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.TYPECODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UID.value</name>
+          <recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER.value</name>
+          <recordfield>ASYS_NOTIFICATIONS.USERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VERSION.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.VERSION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LINKINFO.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.LINK_INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ICON.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
index 380701dc9f07c9599f4e90aa33bb35821f46093b..5ee955fd6389e03589d671d10bb0f51aa70a8bb2 100644
--- a/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
@@ -1,12 +1,12 @@
-import("system.vars");
-import("system.tools");
-import("system.notification");
-import("system.neon");
-
-var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
-
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = vars.get("$sys.selection");
+
+for(var i = 0; i < selectedNotifications.length; i++)
+    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
+
 neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
index 6ef6b2f5299bfe85f18943b567ccf6cef70ac2b1..d90098a01f6be9f474f4608d3fcd62454ce20c2f 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js
@@ -1,12 +1,12 @@
-import("system.vars");
-import("system.tools");
-import("system.notification");
-import("system.neon");
-
-var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
-
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = vars.get("$sys.selection");
+
+for(var i = 0; i < selectedNotifications.length; i++)
+    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
+
 neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3aa94ad62826d8f05824f78874cd2e2fe739ea56
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("archieve"));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index 380701dc9f07c9599f4e90aa33bb35821f46093b..5ee955fd6389e03589d671d10bb0f51aa70a8bb2 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -1,12 +1,12 @@
-import("system.vars");
-import("system.tools");
-import("system.notification");
-import("system.neon");
-
-var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
-
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = vars.get("$sys.selection");
+
+for(var i = 0; i < selectedNotifications.length; i++)
+    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
+
 neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b5a19c94ab62162274d40e060ec34dee10da48
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("setRead"));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
index 2b574452af68bac61678bcb8b4c520fbf6fb4070..9769ec5519b73d33625204f7d7c935bc64a233a1 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js
@@ -1,12 +1,12 @@
-import("system.vars");
-import("system.tools");
-import("system.notification");
-import("system.neon");
-
-var user = tools.getCurrentUser();
-var selectedNotifications = JSON.parse(vars.get("$sys.selection"));
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
-
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = vars.get("$sys.selection");
+
+for(var i = 0; i < selectedNotifications.length; i++)
+    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
+
 neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fdaef5f6d333ff01ea64d8d64f506214e7ee00d
--- /dev/null
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.text("setUnread"));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index a70046b2235c43944c3e5831f11bb39f21b9f357..ae432e0a314121d38e2a2c620e15163a8ff3a979 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,155 +1,155 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>ObjectRelationType_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:SPLIT</icon>
-  <title>Relation type</title>
-  <contentTitleProcess>%aditoprj%/entity/ObjectRelationType_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SOURCE_RELATION_TITLE</name>
-      <title>Relation type 1</title>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>SourceObjectType_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>ObjectRelationTypes</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>81f4567a-fc89-49fc-be86-77600cb66305</name>
-          <entityName>ObjectTree_entity</entityName>
-          <fieldName>ObjectRelationTypes</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>SourceObjectType_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OnlyFirstSide_param</name>
-          <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>OnlyFirstSide_param</name>
-      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>RELATION_TYPE</name>
-    </entityField>
-    <entityField>
-      <name>DIRECTION</name>
-    </entityField>
-    <entityField>
-      <name>HIERARCHY</name>
-      <title>Hierarchy</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DEST_OBJECT_TYPE</name>
-      <title>Context 2</title>
-      <consumer>Contexts</consumer>
-      <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js</mandatoryProcess>
-      <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>SOURCE_OBJECT_TYPE</name>
-      <title>Context 1</title>
-      <consumer>Contexts</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>AB_OBJECTRELATIONTYPE1</name>
-    </entityField>
-    <entityField>
-      <name>AB_OBJECTRELATIONTYPE2</name>
-    </entityField>
-    <entityField>
-      <name>SIDE</name>
-    </entityField>
-    <entityField>
-      <name>DEST_OBJECTRELATIONTYPEID</name>
-    </entityField>
-    <entityField>
-      <name>DEST_RELATION_TITLE</name>
-      <title>Relation type 2</title>
-      <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js</mandatoryProcess>
-      <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Contexts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>Context</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityActionField>
-      <name>removeUsage</name>
-      <fieldType>ACTION</fieldType>
-      <title>Delete all usage</title>
-      <onActionProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js</onActionProcess>
-      <iconId>NEON:TRASH</iconId>
-    </entityActionField>
-    <entityField>
-      <name>Type2Enabled_proxy</name>
-      <title>Enable relation type 2</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>SOURCE_RELATION_TITLE.value</element>
-        <element>RELATION_TYPE.value</element>
-        <element>DIRECTION.value</element>
-        <element>HIERARCHY.value</element>
-        <element>DEST_OBJECT_TYPE.value</element>
-        <element>SOURCE_OBJECT_TYPE.value</element>
-        <element>AB_OBJECTRELATIONTYPE1.value</element>
-        <element>AB_OBJECTRELATIONTYPE2.value</element>
-        <element>SIDE.value</element>
-        <element>DEST_OBJECTRELATIONTYPEID.value</element>
-        <element>DEST_RELATION_TITLE.value</element>
-        <element>Type2Enabled_proxy.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ObjectRelationType_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:SPLIT</icon>
+  <title>Relation type</title>
+  <contentTitleProcess>%aditoprj%/entity/ObjectRelationType_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SOURCE_RELATION_TITLE</name>
+      <title>Relation type 1</title>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>SourceObjectType_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>ObjectRelationTypes</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>81f4567a-fc89-49fc-be86-77600cb66305</name>
+          <entityName>ObjectTree_entity</entityName>
+          <fieldName>ObjectRelationTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>SourceObjectType_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyFirstSide_param</name>
+          <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>OnlyFirstSide_param</name>
+      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>RELATION_TYPE</name>
+    </entityField>
+    <entityField>
+      <name>DIRECTION</name>
+    </entityField>
+    <entityField>
+      <name>HIERARCHY</name>
+      <title>Hierarchy</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DEST_OBJECT_TYPE</name>
+      <title>Context 2</title>
+      <consumer>Contexts</consumer>
+      <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SOURCE_OBJECT_TYPE</name>
+      <title>Context 1</title>
+      <consumer>Contexts</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>AB_OBJECTRELATIONTYPE1</name>
+    </entityField>
+    <entityField>
+      <name>AB_OBJECTRELATIONTYPE2</name>
+    </entityField>
+    <entityField>
+      <name>SIDE</name>
+    </entityField>
+    <entityField>
+      <name>DEST_OBJECTRELATIONTYPEID</name>
+    </entityField>
+    <entityField>
+      <name>DEST_RELATION_TITLE</name>
+      <title>Relation type 2</title>
+      <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Contexts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>Context</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityActionField>
+      <name>removeUsage</name>
+      <fieldType>ACTION</fieldType>
+      <title>Delete all usage</title>
+      <onActionProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js</onActionProcess>
+      <iconId>NEON:TRASH</iconId>
+    </entityActionField>
+    <entityField>
+      <name>Type2Enabled_proxy</name>
+      <title>Enable relation type 2</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>SOURCE_RELATION_TITLE.value</element>
+        <element>RELATION_TYPE.value</element>
+        <element>DIRECTION.value</element>
+        <element>HIERARCHY.value</element>
+        <element>DEST_OBJECT_TYPE.value</element>
+        <element>SOURCE_OBJECT_TYPE.value</element>
+        <element>AB_OBJECTRELATIONTYPE1.value</element>
+        <element>AB_OBJECTRELATIONTYPE2.value</element>
+        <element>SIDE.value</element>
+        <element>DEST_OBJECTRELATIONTYPEID.value</element>
+        <element>DEST_RELATION_TITLE.value</element>
+        <element>Type2Enabled_proxy.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 63ec4d28c06d5bec1f769f4d5749faed0b565e77..f58d3c73569ec28dfada3295b121c3a9c6b29719 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,212 +1,212 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>ObjectTree_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Object relation</title>
-  <titlePlural>Relations</titlePlural>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>TreeProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>TARGET_CONTEXT</targetContextField>
-      <targetIdField>TARGET_ID</targetIdField>
-      <dependencies>
-        <entityDependency>
-          <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>ObjectTrees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>423acf79-e2c5-46e4-9fb5-7b1a7078d4f4</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>ObjectTrees</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>RelationType_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>Uid_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ObjectId_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>UID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>PARENT_ID</name>
-      <searchable v="false" />
-      <tooltip></tooltip>
-      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-      <title>Object</title>
-      <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/title/linkedContextProcess.js</linkedContextProcess>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>ObjectRelationTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ObjectRelationType_entity</entityName>
-        <fieldName>ObjectRelationTypes</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SourceObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>ObjectType_param</name>
-      <expose v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>EXPANDED</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>NODEID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>TARGET_ID</name>
-      <title>Object</title>
-      <consumer>Objects</consumer>
-      <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <searchable v="false" />
-      <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>TARGET_CONTEXT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-      <searchable v="false" />
-      <tooltipProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js</tooltipProcess>
-    </entityField>
-    <entityField>
-      <name>OBJECTRELATIONTYPEID</name>
-      <title>Relationtype</title>
-      <consumer>ObjectRelationTypes</consumer>
-      <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js</onValueChange>
-    </entityField>
-    <entityConsumer>
-      <name>Objects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Object_entity</entityName>
-        <fieldName>FilteredObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <title></title>
-          <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedObjectIds_param</name>
-          <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>insert</name>
-          <fieldType>ACTION</fieldType>
-          <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
-          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
-          <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js</stateProcess>
-        </entityActionField>
-        <entityActionField>
-          <name>edit</name>
-          <fieldType>ACTION</fieldType>
-          <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
-          <iconId>NEON:PENCIL</iconId>
-          <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityParameter>
-      <name>RelationType_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>Uid_param</name>
-      <expose v="true" />
-      <description>Needed to load ONE Objectrelation together with ObjectId_param and ObjectType_param to determine the side</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-        <element>PARENT_ID.value</element>
-        <element>EXPANDED.value</element>
-        <element>TARGET_ID.value</element>
-        <element>TARGET_CONTEXT.value</element>
-        <element>INFO.value</element>
-        <element>OBJECTRELATIONTYPEID.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>ObjectTree_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Object relation</title>
+  <titlePlural>Relations</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>TreeProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TARGET_CONTEXT</targetContextField>
+      <targetIdField>TARGET_ID</targetIdField>
+      <dependencies>
+        <entityDependency>
+          <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>ObjectTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>423acf79-e2c5-46e4-9fb5-7b1a7078d4f4</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>ObjectTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RelationType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Uid_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ObjectId_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>UID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>PARENT_ID</name>
+      <searchable v="false" />
+      <tooltip></tooltip>
+      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Object</title>
+      <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/title/linkedContextProcess.js</linkedContextProcess>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ObjectRelationTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectRelationType_entity</entityName>
+        <fieldName>ObjectRelationTypes</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SourceObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>EXPANDED</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>NODEID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>TARGET_ID</name>
+      <title>Object</title>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <searchable v="false" />
+      <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TARGET_CONTEXT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+      <searchable v="false" />
+      <tooltipProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js</tooltipProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECTRELATIONTYPEID</name>
+      <title>Relationtype</title>
+      <consumer>ObjectRelationTypes</consumer>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js</onValueChange>
+    </entityField>
+    <entityConsumer>
+      <name>Objects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>FilteredObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedObjectIds_param</name>
+          <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionGroup>
+      <name>alter</name>
+      <children>
+        <entityActionField>
+          <name>insert</name>
+          <fieldType>ACTION</fieldType>
+          <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+          <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js</stateProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>edit</name>
+          <fieldType>ACTION</fieldType>
+          <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+          <iconId>NEON:PENCIL</iconId>
+          <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityParameter>
+      <name>RelationType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>Uid_param</name>
+      <expose v="true" />
+      <description>Needed to load ONE Objectrelation together with ObjectId_param and ObjectType_param to determine the side</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TITLE.value</element>
+        <element>PARENT_ID.value</element>
+        <element>EXPANDED.value</element>
+        <element>TARGET_ID.value</element>
+        <element>TARGET_CONTEXT.value</element>
+        <element>INFO.value</element>
+        <element>OBJECTRELATIONTYPEID.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
index c18d22015d610e510b71019881de089a06d1632c..fc3ed15eaf7ab45ccc7caef5aff05ab0aa2f0e30 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -2,12 +2,12 @@ import("ObjectRelation_lib");
 import("system.neon");
 import("system.vars");
 
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
 {    
-    var selectedRows = JSON.parse(vars.get("$sys.selection"));
+    var selectedRows = vars.get("$sys.selection");
     var uid = JSON.parse(selectedRows[0]);
     var isObjectRelationNode = typeof uid[2] == "string";
-        
+
     if (isObjectRelationNode)
     {
         var params = {
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
index e46436ab939b94aa8d697e23d9d92390d1384404..7fd3c236f3e52b7fa99582842ccdf27700c54625 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
@@ -2,11 +2,12 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
 {    
-    var selectedRows = JSON.parse(vars.get("$sys.selection"));
+    var selectedRows = vars.get("$sys.selection");
     var isObjectRelationNode = false;
-    if (selectedRows.length > 0)
+    
+    if (selectedRows.length > 0 && selectedRows[0] && selectedRows[0].length > 0 && selectedRows[0][0] == "[")
     {
         var uid = JSON.parse(selectedRows[0]);
         isObjectRelationNode = typeof uid[2] == "string";
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
index cbeeeb007e4e98249f4cc3d011932efece2af4b2..70b23f118559daeb29baf7310e4d994f6c82089b 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -2,15 +2,15 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
 {    
-    var selectedRows = JSON.parse(vars.get("$sys.selection"));
+    var selectedRows = vars.get("$sys.selection");
     var isObjectRelationNode = false;
     if (selectedRows.length > 0)
     {
         var uid = JSON.parse(selectedRows[0]);
         isObjectRelationNode = typeof uid[2] == "string";
-        
+
         if (isObjectRelationNode)
         {
             parentId = uid[0];
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
index 5e1e7308c70d180decdf001e23bdb853e3e1e4c4..21d22fd05e88fedbb80646bca06977a1224c2ccd 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
@@ -3,11 +3,12 @@ import("system.neon");
 import("system.vars");
 import("system.neon");
 
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
 {    
-    var selectedRows = JSON.parse(vars.get("$sys.selection"));
+    var selectedRows = vars.get("$sys.selection");
     var isObjectRelationNode = false;
-    if (selectedRows.length > 0)
+    
+    if (selectedRows.length > 0 && selectedRows[0] && selectedRows[0].length > 0 && selectedRows[0][0] == "[")
     {
         var uid = JSON.parse(selectedRows[0]);
         isObjectRelationNode = typeof uid[2] == "string";
@@ -23,4 +24,4 @@ if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
         result.string(neon.COMPONENTSTATE_DISABLED);
 }
 else
-        result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+        result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index b7e9b9983dd60bc75dcbc6f51d4d0bd084536986..ede1d023d2d8dfb3229471990bf55e0de4d7f78f 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -12,7 +12,7 @@ var tree = []
 var uidParam;
 if (vars.exists("$param.Uid_param") && vars.get("$param.Uid_param"))
 {
-    uidParam = vars.get("$param.Uid_param");
+    uidParam = vars.getString("$param.Uid_param");
 } 
 else if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
 {
@@ -33,7 +33,7 @@ if (uidParam)
 }
 else
 {
-    var filter = JSON.parse(vars.get("$local.filter"))
+    var filter = vars.get("$local.filter")
     var selectedRelationType = null;
 
     if (filter)
@@ -43,9 +43,12 @@ else
             selectedRelationType = filter.childs[0].value;
         }
     }
-    var originalObjectId = vars.get("$param.ObjectId_param");
+    if (vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param")) 
+    {
+        var originalObjectId = vars.get("$param.ObjectId_param");
 
-    _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+        _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+    }
 }
 
 result.object(tree);
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
index 27ac27f8fe01dcffa3e2123c1e9f90978aa358a6..fc1ca5187e5c95cc58f0d5171cb175c8e5150553 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
@@ -4,7 +4,7 @@ import("system.db");
 import("Sql_lib");
 
 
-var uid = JSON.parse(vars.get("$field.UID"));
+var uid = JSON.parse(vars.getString("$field.UID"));
 var isObjectRelationNode = typeof uid[2] == "string";
 
 if (isObjectRelationNode)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
index 23a87592d8929a79aa3e55c6ffd11f4616999f6d..c62d01d48d36ea557c12c999c9051803d617db39 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
@@ -4,7 +4,7 @@ import("system.db");
 import("Sql_lib");
 
 
-var uid = JSON.parse(vars.get("$field.UID"));
+var uid = JSON.parse(vars.getString("$field.UID"));
 var isObjectRelationNode = typeof uid[2] == "string";
 
 if (isObjectRelationNode)
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 0d5e3595a0a65d404e46696c2d0f9e32801dff94..f1ec55829b053c3c80dcb272b7b2882e2ee9e6e9 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,188 +1,188 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Object_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
-  <contentTitleProcess>%aditoprj%/entity/Object_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>jdito</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>TITLE</name>
-    </entityField>
-    <entityParameter>
-      <name>ObjectType_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>AllObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
-      <documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
-          <entityName>TaskLink_entity</entityName>
-          <fieldName>Objects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>0a2aa5c9-1ba2-41bd-b5f4-3a761efbcf2e</name>
-          <entityName>ActivityLink_entity</entityName>
-          <fieldName>Objects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>564d43e8-a7d6-44a5-82a0-3443129d568c</name>
-          <entityName>AppointmentLink_entity</entityName>
-          <fieldName>Objects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedObjectIds_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Persons</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Offers</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offer_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Orders</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Order_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Contracts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Contract_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Salesprojects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Salesproject_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>ExcludedObjectIds_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>FilteredObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
-      <dependencies>
-        <entityDependency>
-          <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
-          <entityName>ObjectTree_entity</entityName>
-          <fieldName>Objects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ExcludedObjectIds_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Campaigns</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Object_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Object_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
+  <contentTitleProcess>%aditoprj%/entity/Object_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+    </entityField>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>AllObjects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
+      <documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
+          <entityName>TaskLink_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>0a2aa5c9-1ba2-41bd-b5f4-3a761efbcf2e</name>
+          <entityName>ActivityLink_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>564d43e8-a7d6-44a5-82a0-3443129d568c</name>
+          <entityName>AppointmentLink_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedObjectIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Persons</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Orders</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Order_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contracts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contract_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Salesprojects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Salesproject_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>ExcludedObjectIds_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>FilteredObjects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
+      <dependencies>
+        <entityDependency>
+          <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
+          <entityName>ObjectTree_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExcludedObjectIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Campaigns</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Object_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TITLE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 4497cff4006889629e44c87348ca9169084ad09b..23bd71b57278945a999bef861602850936dc5b10 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -8,7 +8,7 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
 {
     var excludedIds = [];
     if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
-        excludedIds = JSON.parse(vars.get("$param.ExcludedObjectIds_param"));
+        excludedIds = JSON.parse(vars.getString("$param.ExcludedObjectIds_param"));
     
     result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false, excludedIds)))
 } 
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index dedc23cd496046250ef7a7f17f557221eda7f924..282e1d3b9dda9e3954c23e4541c0ca08478a8793 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,883 +1,878 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Offer_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
-  <title>Offer</title>
-  <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
-  <iconId>VAADIN:CART</iconId>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>f909c251-16c1-49e2-9b43-6d5f834137c6</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Offers</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>CURRENCY</name>
-      <title>Currency</title>
-      <consumer>KeywordCurrencies</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>OFFERCODE</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/offercode/documentation.adoc</documentation>
-      <title>Offer number</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Offer_entity/entityfields/offercode/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>OFFERDATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OFFERID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PROBABILITY</name>
-      <title>Probability</title>
-      <consumer>KeywordProbabilities</consumer>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/documentation.adoc</documentation>
-      <title>Connection</title>
-      <consumer>AnyContacts</consumer>
-      <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <title>Salesproject</title>
-      <consumer>Salesprojects</consumer>
-      <linkedContext>Salesproject</linkedContext>
-      <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js</mandatoryProcess>
-      <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>Status</title>
-      <consumer>KeywordOfferStates</consumer>
-      <mandatory v="true" />
-      <state>EDITABLE</state>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>VAT</name>
-      <title>Total VAT</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>HEADER</name>
-      <title>Cover letter</title>
-      <contentType>LONG_TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Offeritems</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <description></description>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offeritem_entity</entityName>
-        <fieldName>OfferItems</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>OfferId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Currency_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OfferStatus_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newOfferVersion</name>
-      <fieldType>ACTION</fieldType>
-      <title>New offer version</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CART</iconId>
-    </entityActionField>
-    <entityField>
-      <name>NET</name>
-      <title>Total net</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>TotalGross</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
-      <title>Total gross</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>SalesprojectOffers</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>208c1273-d438-4263-a466-a4490b5e319a</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectOffers</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>LANGUAGE</name>
-      <title>Language</title>
-      <consumer>Languages</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityActionField>
-      <name>copyOffer</name>
-      <fieldType>ACTION</fieldType>
-      <title>Copy offer</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:COPY</iconId>
-    </entityActionField>
-    <entityField>
-      <name>VERSNR</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/versnr/documentation.adoc</documentation>
-      <title>Vers. no.</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/versnr/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OFFER_ID</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
-    </entityField>
-    <entityFieldGroup>
-      <name>OfferCode_VersNr_fieldgroup</name>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
-      <title>Offer number</title>
-      <description>Offercode + VersNr</description>
-      <state>READONLY</state>
-      <fields>
-        <element>OFFERCODE</element>
-        <element>VERSNR</element>
-      </fields>
-    </entityFieldGroup>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionField>
-      <name>printOffer</name>
-      <fieldType>ACTION</fieldType>
-      <title>Print Offer</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:FILE_TEXT_O</iconId>
-      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/stateProcess.js</stateProcess>
-    </entityActionField>
-    <entityField>
-      <name>CONTACT_ORG_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>CONTACT_PERSON_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityConsumer>
-      <name>AnyContacts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>MainDocuments</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Salesprojects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Salesproject_entity</entityName>
-        <fieldName>openSalesprojects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ADDRESS</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/address/documentation.adoc</documentation>
-      <title>Address</title>
-      <description></description>
-      <contentType>LONG_TEXT</contentType>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/address/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ChosenAddress</name>
-      <title>Choose address</title>
-      <consumer>PossibleAddresses</consumer>
-      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordCurrencies</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordOfferStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newOrder</name>
-      <fieldType>ACTION</fieldType>
-      <title>Create receipt</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:DOLLAR</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordProbabilities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityProvider>
-      <name>ContactOffers</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Offers</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Offers</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OfferLanguage_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>OfferCurrency_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferLanguage_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferHeader_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferOriginal_Id_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferAddress_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferCode_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferVersnr_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityField>
-      <name>PAYMENTTERMS</name>
-      <title>Payment term</title>
-      <consumer>KeywordPaymentTerm</consumer>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>DELIVERYTERMS</name>
-      <title>Deliveryspecification</title>
-      <consumer>KeywordDeliveryTerm</consumer>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordPaymentTerm</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordDeliveryTerm</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>INFO</name>
-      <title>Information</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>OfferPaymentTerm_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OfferDeliveryTerm_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>FullOfferCode</name>
-      <title>Offer number</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>PossibleAddresses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Address_entity</entityName>
-        <fieldName>OrganisationAndContactAddresses</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>chooseTEXHeader</name>
-      <consumer>DocumentTemplateTex</consumer>
-    </entityField>
-    <entityConsumer>
-      <name>DocumentTemplateTex</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>DocumentTemplate_entity</entityName>
-        <fieldName>DocumentTemplateProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>DocumentTemplateType_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>DocumentTemplateTypeClassification_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <maximumDbRows v="0" />
-      <fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>fdfae1fd-5eb3-4891-86b7-517803035f23</name>
-          <tableName>OFFER</tableName>
-          <primaryKey>OFFERID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>d49d4390-5567-449b-8702-ee97dbfe1700</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>d165322e-cdf3-4611-9fea-0e100853ae80</name>
-          <tableName>SALESPROJECT</tableName>
-          <primaryKey>SALESPROJECTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CURRENCY.value</name>
-          <recordfield>OFFER.CURRENCY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>HEADER.value</name>
-          <recordfield>OFFER.HEADER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>OFFER.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NET.value</name>
-          <recordfield>OFFER.NET</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OFFERCODE.value</name>
-          <recordfield>OFFER.OFFERCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OFFERDATE.value</name>
-          <recordfield>OFFER.OFFERDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OFFERID.value</name>
-          <recordfield>OFFER.OFFERID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROBABILITY.value</name>
-          <recordfield>OFFER.PROBABILITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>OFFER.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>OFFER.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VAT.value</name>
-          <recordfield>OFFER.VAT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VERSNR.value</name>
-          <recordfield>OFFER.VERSNR</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>OFFER.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ORG_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESS.value</name>
-          <recordfield>OFFER.ADDRESS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CURRENCY.displayValue</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.displayValue</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.displayValue</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROBABILITY.displayValue</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PAYMENTTERMS.value</name>
-          <recordfield>OFFER.PAYMENTTERMS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DELIVERYTERMS.value</name>
-          <recordfield>OFFER.DELIVERYTERMS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DELIVERYTERMS.displayValue</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PAYMENTTERMS.displayValue</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>OFFER.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>OFFER.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>OFFER.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>OFFER.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>OFFER.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.displayValue</name>
-          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Offer_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
+  <title>Offer</title>
+  <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
+  <iconId>VAADIN:CART</iconId>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>f909c251-16c1-49e2-9b43-6d5f834137c6</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Offers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CURRENCY</name>
+      <title>Currency</title>
+      <consumer>KeywordCurrencies</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>OFFERCODE</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/offercode/documentation.adoc</documentation>
+      <title>Offer number</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Offer_entity/entityfields/offercode/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>OFFERDATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OFFERID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PROBABILITY</name>
+      <title>Probability</title>
+      <consumer>KeywordProbabilities</consumer>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/documentation.adoc</documentation>
+      <title>Connection</title>
+      <consumer>AnyContacts</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <title>Salesproject</title>
+      <consumer>Salesprojects</consumer>
+      <linkedContext>Salesproject</linkedContext>
+      <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js</mandatoryProcess>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordOfferStates</consumer>
+      <mandatory v="true" />
+      <state>EDITABLE</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>VAT</name>
+      <title>Total VAT</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>HEADER</name>
+      <title>Cover letter</title>
+      <contentType>LONG_TEXT</contentType>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Offeritems</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <description></description>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offeritem_entity</entityName>
+        <fieldName>OfferItems</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OfferId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Currency_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferStatus_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOfferVersion</name>
+      <fieldType>ACTION</fieldType>
+      <title>New offer version</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CART</iconId>
+    </entityActionField>
+    <entityField>
+      <name>NET</name>
+      <title>Total net</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>TotalGross</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
+      <title>Total gross</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>SalesprojectOffers</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>208c1273-d438-4263-a466-a4490b5e319a</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectOffers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>LANGUAGE</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityActionField>
+      <name>copyOffer</name>
+      <fieldType>ACTION</fieldType>
+      <title>Copy offer</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:COPY</iconId>
+    </entityActionField>
+    <entityField>
+      <name>VERSNR</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/versnr/documentation.adoc</documentation>
+      <title>Vers. no.</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/versnr/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OFFER_ID</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
+    </entityField>
+    <entityFieldGroup>
+      <name>OfferCode_VersNr_fieldgroup</name>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
+      <title>Offer number</title>
+      <description>Offercode + VersNr</description>
+      <state>READONLY</state>
+      <fields>
+        <element>OFFERCODE</element>
+        <element>VERSNR</element>
+      </fields>
+    </entityFieldGroup>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>printOffer</name>
+      <fieldType>ACTION</fieldType>
+      <title>Print Offer</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:FILE_TEXT_O</iconId>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityField>
+      <name>CONTACT_ORG_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CONTACT_PERSON_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityConsumer>
+      <name>AnyContacts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>MainDocuments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Salesprojects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Salesproject_entity</entityName>
+        <fieldName>openSalesprojects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ADDRESS</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/address/documentation.adoc</documentation>
+      <title>Address</title>
+      <description></description>
+      <contentType>LONG_TEXT</contentType>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/address/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ChosenAddress</name>
+      <title>Choose address</title>
+      <consumer>PossibleAddresses</consumer>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordCurrencies</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordOfferStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOrder</name>
+      <fieldType>ACTION</fieldType>
+      <title>Create receipt</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:DOLLAR</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordProbabilities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityProvider>
+      <name>ContactOffers</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Offers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Offers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferLanguage_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>OfferCurrency_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferLanguage_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferHeader_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferOriginal_Id_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferAddress_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferCode_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferVersnr_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityField>
+      <name>PAYMENTTERMS</name>
+      <title>Payment term</title>
+      <consumer>KeywordPaymentTerm</consumer>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DELIVERYTERMS</name>
+      <title>Deliveryspecification</title>
+      <consumer>KeywordDeliveryTerm</consumer>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordPaymentTerm</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordDeliveryTerm</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>INFO</name>
+      <title>Information</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>OfferPaymentTerm_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferDeliveryTerm_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>FullOfferCode</name>
+      <title>Offer number</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>PossibleAddresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>OrganisationAndContactAddresses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>chooseTEXHeader</name>
+      <consumer>DocumentTemplateTex</consumer>
+    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplateTex</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DocumentTemplateTypeClassification_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <maximumDbRows v="0" />
+      <fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>fdfae1fd-5eb3-4891-86b7-517803035f23</name>
+          <tableName>OFFER</tableName>
+          <primaryKey>OFFERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>d49d4390-5567-449b-8702-ee97dbfe1700</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>d165322e-cdf3-4611-9fea-0e100853ae80</name>
+          <tableName>SALESPROJECT</tableName>
+          <primaryKey>SALESPROJECTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.value</name>
+          <recordfield>OFFER.CURRENCY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>HEADER.value</name>
+          <recordfield>OFFER.HEADER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>OFFER.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NET.value</name>
+          <recordfield>OFFER.NET</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OFFERCODE.value</name>
+          <recordfield>OFFER.OFFERCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OFFERDATE.value</name>
+          <recordfield>OFFER.OFFERDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OFFERID.value</name>
+          <recordfield>OFFER.OFFERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROBABILITY.value</name>
+          <recordfield>OFFER.PROBABILITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>OFFER.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>OFFER.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VAT.value</name>
+          <recordfield>OFFER.VAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VERSNR.value</name>
+          <recordfield>OFFER.VERSNR</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>OFFER.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ORG_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_PERSON_ID.value</name>
+          <recordfield>CONTACT.PERSON_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESS.value</name>
+          <recordfield>OFFER.ADDRESS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROBABILITY.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PAYMENTTERMS.value</name>
+          <recordfield>OFFER.PAYMENTTERMS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DELIVERYTERMS.value</name>
+          <recordfield>OFFER.DELIVERYTERMS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DELIVERYTERMS.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PAYMENTTERMS.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>OFFER.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>OFFER.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>OFFER.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>OFFER.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>OFFER.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.displayValue</name>
+          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Offer_entity/entityfields/attributes/onValidation.js b/entity/Offer_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Offer_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index c3d8c920eeae0f1fc9c1089633fa9b076a011264..0ae20dad6e06f3bda90fdbff5e7b83a63e5ca241 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -1,3 +1,4 @@
+import("AttributeRegistry_basic");
 import("system.neon");
 import("system.result");
 import("system.vars");
@@ -11,7 +12,7 @@ else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var contactId = vars.getString("$field.CONTACT_ID");
     if (contactId)
-    {                                         // Lieferkondition
-        result.string(AttributeRelationUtils.getAttribute("3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb", contactId));
+    { 
+        result.string(AttributeRelationUtils.getAttribute($AttributeRegistry.deliveryTerm(), contactId));
     }
 }
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
index 35d02f62cada7767c96df6d5b45bbce9658d3b0c..e75c10c9751ea47fa79c80841cfc2831dafb2deb 100644
--- a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
@@ -1,3 +1,4 @@
+import("AttributeRegistry_basic");
 import("system.neon");
 import("system.result");
 import("system.vars");
@@ -11,7 +12,7 @@ else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var contactId = vars.getString("$field.CONTACT_ID");
     if (contactId)
-    {                                         // Zahlungskondition
-        result.string(AttributeRelationUtils.getAttribute("292fae38-6557-466d-8843-3b1b4a1f6599", contactId));
+    {
+        result.string(AttributeRelationUtils.getAttribute($AttributeRegistry.paymentTerm(), contactId));
     }
 }
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 47147f37877de33d07fab7d65e2beb080cd44952..b5231edb5dea3f93aa70ef3feb39d734b70566c4 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,332 +1,332 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Offeritem_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
-  <title>Offeritem</title>
-  <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
-  <titlePlural>Offeritems</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>ASSIGNEDTO</name>
-    </entityField>
-    <entityField>
-      <name>DISCOUNT</name>
-      <title>Discount %</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>GROUPCODEID</name>
-      <title>Commodity group</title>
-      <consumer>KeywordProductGroupcodes</consumer>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>ITEMNAME</name>
-      <title>Designation</title>
-    </entityField>
-    <entityField>
-      <name>ITEMPOSITION</name>
-      <title>Position</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>ITEMSORT</name>
-    </entityField>
-    <entityField>
-      <name>OFFERITEMID</name>
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OFFER_ID</name>
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>OPTIONAL</name>
-      <title>Optional</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PRICE</name>
-      <title>Unit price</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-    </entityField>
-    <entityField>
-      <name>PRODUCT_ID</name>
-      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
-      <title>Article</title>
-      <consumer>Products</consumer>
-      <linkedContext>Product</linkedContext>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>QUANTITY</name>
-      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
-      <title>Quantity</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#</outputFormat>
-      <inputFormat>#</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-      <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>UNIT</name>
-      <title>Unit</title>
-      <consumer>KeywordQuantityUnits</consumer>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>PROCESS</element>
-        <element>MASK</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>VAT</name>
-      <title>VAT in %</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-    </entityField>
-    <entityParameter>
-      <name>OfferId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>Currency_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>TotalPrice</name>
-      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
-      <title>Sum</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>OfferStatus_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>OfferItems</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Offeritems</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Currency_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OfferId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OfferStatus_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>INFO</name>
-      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-      <state>READONLY</state>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordProductGroupcodes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordQuantityUnits</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <maximumDbRows v="0" />
-      <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
-          <tableName>OFFERITEM</tableName>
-          <primaryKey>OFFERITEMID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ASSIGNEDTO.value</name>
-          <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DISCOUNT.value</name>
-          <recordfield>OFFERITEM.DISCOUNT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODEID.value</name>
-          <recordfield>OFFERITEM.GROUPCODEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ITEMNAME.value</name>
-          <recordfield>OFFERITEM.ITEMNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ITEMPOSITION.value</name>
-          <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ITEMSORT.value</name>
-          <recordfield>OFFERITEM.ITEMSORT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OFFERITEMID.value</name>
-          <recordfield>OFFERITEM.OFFERITEMID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OFFER_ID.value</name>
-          <recordfield>OFFERITEM.OFFER_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OPTIONAL.value</name>
-          <recordfield>OFFERITEM.OPTIONAL</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRICE.value</name>
-          <recordfield>OFFERITEM.PRICE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.value</name>
-          <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>QUANTITY.value</name>
-          <recordfield>OFFERITEM.QUANTITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UNIT.value</name>
-          <recordfield>OFFERITEM.UNIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VAT.value</name>
-          <recordfield>OFFERITEM.VAT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>OFFERITEM.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODEID.displayValue</name>
-          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UNIT.displayValue</name>
-          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Offeritem_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
+  <title>Offeritem</title>
+  <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
+  <titlePlural>Offeritems</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>ASSIGNEDTO</name>
+    </entityField>
+    <entityField>
+      <name>DISCOUNT</name>
+      <title>Discount %</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>GROUPCODEID</name>
+      <title>Commodity group</title>
+      <consumer>KeywordProductGroupcodes</consumer>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ITEMNAME</name>
+      <title>Designation</title>
+    </entityField>
+    <entityField>
+      <name>ITEMPOSITION</name>
+      <title>Position</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>ITEMSORT</name>
+    </entityField>
+    <entityField>
+      <name>OFFERITEMID</name>
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OFFER_ID</name>
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>OPTIONAL</name>
+      <title>Optional</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRICE</name>
+      <title>Unit price</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+    </entityField>
+    <entityField>
+      <name>PRODUCT_ID</name>
+      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
+      <title>Article</title>
+      <consumer>Products</consumer>
+      <linkedContext>Product</linkedContext>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>QUANTITY</name>
+      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
+      <title>Quantity</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#</outputFormat>
+      <inputFormat>#</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+      <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>UNIT</name>
+      <title>Unit</title>
+      <consumer>KeywordQuantityUnits</consumer>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>PROCESS</element>
+        <element>MASK</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>VAT</name>
+      <title>VAT in %</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+    </entityField>
+    <entityParameter>
+      <name>OfferId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>Currency_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>TotalPrice</name>
+      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
+      <title>Sum</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>OfferStatus_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>OfferItems</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Offeritems</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Currency_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferStatus_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>INFO</name>
+      <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+      <state>READONLY</state>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordProductGroupcodes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordQuantityUnits</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <maximumDbRows v="0" />
+      <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
+          <tableName>OFFERITEM</tableName>
+          <primaryKey>OFFERITEMID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ASSIGNEDTO.value</name>
+          <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISCOUNT.value</name>
+          <recordfield>OFFERITEM.DISCOUNT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODEID.value</name>
+          <recordfield>OFFERITEM.GROUPCODEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ITEMNAME.value</name>
+          <recordfield>OFFERITEM.ITEMNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ITEMPOSITION.value</name>
+          <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ITEMSORT.value</name>
+          <recordfield>OFFERITEM.ITEMSORT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OFFERITEMID.value</name>
+          <recordfield>OFFERITEM.OFFERITEMID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OFFER_ID.value</name>
+          <recordfield>OFFERITEM.OFFER_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OPTIONAL.value</name>
+          <recordfield>OFFERITEM.OPTIONAL</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRICE.value</name>
+          <recordfield>OFFERITEM.PRICE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.value</name>
+          <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>QUANTITY.value</name>
+          <recordfield>OFFERITEM.QUANTITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UNIT.value</name>
+          <recordfield>OFFERITEM.UNIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VAT.value</name>
+          <recordfield>OFFERITEM.VAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>OFFERITEM.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODEID.displayValue</name>
+          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UNIT.displayValue</name>
+          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index fc9994c4e51ec83d9ffe238797b472270ea51ca1..85a18b53383611f0bc12ede10ebecb332041aa6e 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -1,3 +1,4 @@
+import("AttributeRegistry_basic");
 import("system.vars");
 import("system.neon");
 import("Product_lib");
@@ -10,7 +11,7 @@ if(pid != "")
 {
     var currency = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
     var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
-    var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
+    var pricelist = AttributeRelationUtils.getAttribute($AttributeRegistry.pricelist(), contactid) || "";
     
     var PriceListFilter = { currency: currency, quantity: vars.get("$field.QUANTITY"), relationId: contactid, priceList: pricelist };
     
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index 5076a258429919fff7eefdabaacaeb6536416898..d2920a905317babb7361c90c0a30f67077543563 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -1,3 +1,4 @@
+import("AttributeRegistry_basic");
 import("system.vars");
 import("system.neon");
 import("Product_lib");
@@ -11,7 +12,7 @@ if(pid != "" && newQuantity != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
     var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
-    var pricelist = AttributeRelationUtils.getAttribute("97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec", contactid) || "";
+    var pricelist = AttributeRelationUtils.getAttribute($AttributeRegistry.pricelist(), contactid) || "";
     
     var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid, priceList: pricelist };
     
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index 0564d2600ab640248290e9d69378939d8baa470a..de9d4fa41de0410cfbef07fb2471511cc412d81a 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,50 +1,50 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Options_Entity</name>
-  <description></description>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Options</title>
-  <iconId>VAADIN:WRENCH</iconId>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>Option1</name>
-      <title>Option1</title>
-    </entityField>
-    <entityField>
-      <name>Option2</name>
-      <title>Option2</title>
-      <contentType>NUMBER</contentType>
-    </entityField>
-    <entityField>
-      <name>Option3</name>
-      <title>Option3</title>
-      <contentType>DATE</contentType>
-    </entityField>
-    <entityField>
-      <name>Option4</name>
-      <title>Option4</title>
-      <contentType>PASSWORD</contentType>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Options_Entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>Option1.value</element>
-        <element>Option2.value</element>
-        <element>Option3.value</element>
-        <element>Option4.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Options_Entity</name>
+  <description></description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Options</title>
+  <iconId>VAADIN:WRENCH</iconId>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>Option1</name>
+      <title>Option1</title>
+    </entityField>
+    <entityField>
+      <name>Option2</name>
+      <title>Option2</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityField>
+      <name>Option3</name>
+      <title>Option3</title>
+      <contentType>DATE</contentType>
+    </entityField>
+    <entityField>
+      <name>Option4</name>
+      <title>Option4</title>
+      <contentType>PASSWORD</contentType>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Options_Entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>Option1.value</element>
+        <element>Option2.value</element>
+        <element>Option3.value</element>
+        <element>Option4.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 1790691cb71d6a3a75f0ddc9fcce4f02f8bfbacf..b2d2762e41721cdf91154cdce9f1c68599d5f69a 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,611 +1,612 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Order_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
-  <title>Receipt</title>
-  <contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
-  <iconId>VAADIN:DOLLAR</iconId>
-  <titlePlural>Receipts</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>95e7ab85-0af9-46ea-a50a-7719833acd2a</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Orders</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>CURRENCY</name>
-      <title>Currency</title>
-      <consumer>KeywordCurrencies</consumer>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESORDERCODE</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/salesordercode/documentation.adoc</documentation>
-      <title>Receipt number</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesordercode/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Order_entity/entityfields/salesordercode/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>SALESORDERDATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESORDERID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/contact_id/documentation.adoc</documentation>
-      <title>Connection</title>
-      <consumer>AnyContacts</consumer>
-      <linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Order_entity/entityfields/contact_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <title>Salesproject</title>
-      <consumer>Salesprojects</consumer>
-      <linkedContext>Salesproject</linkedContext>
-      <mandatory v="true" />
-      <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>Status</title>
-      <consumer>KeywordStates</consumer>
-      <state>EDITABLE</state>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>VAT</name>
-      <title>Total VAT</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>HEADER</name>
-      <title>Header text</title>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/header/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>FOOTER</name>
-      <title>Footer text</title>
-    </entityField>
-    <entityConsumer>
-      <name>Orderitems</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <description></description>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Orderitem_entity</entityName>
-        <fieldName>Orderitems</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>OrderId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Currency_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/currency_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/ContactId_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrderStatus_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderstatus_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newOrderVersion</name>
-      <fieldType>ACTION</fieldType>
-      <title>New receipt version</title>
-      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworderversion/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:DOLLAR</iconId>
-    </entityActionField>
-    <entityField>
-      <name>NET</name>
-      <title>Total net</title>
-      <state>READONLY</state>
-      <valueProcess></valueProcess>
-    </entityField>
-    <entityField>
-      <name>TotalGross</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/totalgross/documentation.adoc</documentation>
-      <title>Total gross</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>LANGUAGE</name>
-      <title>Language</title>
-      <consumer>Languages</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/language/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityActionField>
-      <name>newOrder</name>
-      <fieldType>ACTION</fieldType>
-      <title>Copy receipt</title>
-      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:COPY</iconId>
-    </entityActionField>
-    <entityField>
-      <name>VERSNR</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/versnr/documentation.adoc</documentation>
-      <title>Vers. no.</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/versnr/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESORDER_ID</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/salesorder_id/documentation.adoc</documentation>
-    </entityField>
-    <entityFieldGroup>
-      <name>OrderCode_VersNr_fieldgroup</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js</valueProcess>
-      <title>Receipt number</title>
-      <description>Ordercode + VersNr</description>
-      <state>READONLY</state>
-      <fields>
-        <element>SALESORDERCODE</element>
-        <element>VERSNR</element>
-      </fields>
-    </entityFieldGroup>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>CONTACT_ORG_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>CONTACT_PERSON_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityConsumer>
-      <name>AnyContacts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>MainDocuments</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-          <documentation>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Salesprojects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Salesproject_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityField>
-      <name>ADDRESS</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordCurrencies</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>OrderCurrency_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderLanguage_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderHeader_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>OrderAddress_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>OfferId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityField>
-      <name>OFFER_ID</name>
-      <title>Offer</title>
-      <linkedContext>Offer</linkedContext>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <maximumDbRows v="0" />
-      <fromClauseProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>c1a83567-58d0-44bd-ae08-14018311a6ae</name>
-          <tableName>SALESORDER</tableName>
-          <primaryKey>SALESORDERID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>7d433584-df9f-4b5b-bae4-f3b0a1962d59</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>33653e5e-df52-413c-9a91-349fd989ab89</name>
-          <tableName>SALESPROJECT</tableName>
-          <primaryKey>SALESPROJECTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CURRENCY.value</name>
-          <recordfield>SALESORDER.CURRENCY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>FOOTER.value</name>
-          <recordfield>SALESORDER.FOOTER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>HEADER.value</name>
-          <recordfield>SALESORDER.HEADER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>SALESORDER.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NET.value</name>
-          <recordfield>SALESORDER.NET</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESORDERCODE.value</name>
-          <recordfield>SALESORDER.SALESORDERCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESORDERDATE.value</name>
-          <recordfield>SALESORDER.SALESORDERDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESORDERID.value</name>
-          <recordfield>SALESORDER.SALESORDERID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>SALESORDER.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>SALESORDER.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VAT.value</name>
-          <recordfield>SALESORDER.VAT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VERSNR.value</name>
-          <recordfield>SALESORDER.VERSNR</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>SALESORDER.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ORG_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESS.value</name>
-          <recordfield>SALESORDER.ADDRESS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CURRENCY.displayValue</name>
-          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.displayValue</name>
-          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.displayValue</name>
-          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OFFER_ID.value</name>
-          <recordfield>SALESORDER.OFFER_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.displayValue</name>
-          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Order_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
+  <title>Receipt</title>
+  <contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
+  <iconId>VAADIN:DOLLAR</iconId>
+  <titlePlural>Receipts</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>95e7ab85-0af9-46ea-a50a-7719833acd2a</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Orders</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CURRENCY</name>
+      <title>Currency</title>
+      <consumer>KeywordCurrencies</consumer>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESORDERCODE</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/salesordercode/documentation.adoc</documentation>
+      <title>Receipt number</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesordercode/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Order_entity/entityfields/salesordercode/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>SALESORDERDATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESORDERID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/contact_id/documentation.adoc</documentation>
+      <title>Connection</title>
+      <consumer>AnyContacts</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Order_entity/entityfields/contact_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <title>Salesproject</title>
+      <consumer>Salesprojects</consumer>
+      <linkedContext>Salesproject</linkedContext>
+      <mandatory v="true" />
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/salesproject_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordStates</consumer>
+      <state>EDITABLE</state>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>VAT</name>
+      <title>Total VAT</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>HEADER</name>
+      <title>Header text</title>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/header/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>FOOTER</name>
+      <title>Footer text</title>
+    </entityField>
+    <entityConsumer>
+      <name>Orderitems</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <description></description>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Orderitem_entity</entityName>
+        <fieldName>Orderitems</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OrderId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Currency_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/currency_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/ContactId_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrderStatus_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderstatus_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOrderVersion</name>
+      <fieldType>ACTION</fieldType>
+      <title>New receipt version</title>
+      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworderversion/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:DOLLAR</iconId>
+    </entityActionField>
+    <entityField>
+      <name>NET</name>
+      <title>Total net</title>
+      <state>READONLY</state>
+      <valueProcess></valueProcess>
+    </entityField>
+    <entityField>
+      <name>TotalGross</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/totalgross/documentation.adoc</documentation>
+      <title>Total gross</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>LANGUAGE</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/language/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityActionField>
+      <name>newOrder</name>
+      <fieldType>ACTION</fieldType>
+      <title>Copy receipt</title>
+      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:COPY</iconId>
+    </entityActionField>
+    <entityField>
+      <name>VERSNR</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/versnr/documentation.adoc</documentation>
+      <title>Vers. no.</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/versnr/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESORDER_ID</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/salesorder_id/documentation.adoc</documentation>
+    </entityField>
+    <entityFieldGroup>
+      <name>OrderCode_VersNr_fieldgroup</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js</valueProcess>
+      <title>Receipt number</title>
+      <description>Ordercode + VersNr</description>
+      <state>READONLY</state>
+      <fields>
+        <element>SALESORDERCODE</element>
+        <element>VERSNR</element>
+      </fields>
+    </entityFieldGroup>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>CONTACT_ORG_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CONTACT_PERSON_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityConsumer>
+      <name>AnyContacts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>MainDocuments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+          <documentation>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Salesprojects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Salesproject_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>ADDRESS</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordCurrencies</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>OrderCurrency_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OrderLanguage_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OrderHeader_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OrderAddress_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>OfferId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityField>
+      <name>OFFER_ID</name>
+      <title>Offer</title>
+      <linkedContext>Offer</linkedContext>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Order_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <maximumDbRows v="0" />
+      <fromClauseProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>c1a83567-58d0-44bd-ae08-14018311a6ae</name>
+          <tableName>SALESORDER</tableName>
+          <primaryKey>SALESORDERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>7d433584-df9f-4b5b-bae4-f3b0a1962d59</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>33653e5e-df52-413c-9a91-349fd989ab89</name>
+          <tableName>SALESPROJECT</tableName>
+          <primaryKey>SALESPROJECTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.value</name>
+          <recordfield>SALESORDER.CURRENCY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FOOTER.value</name>
+          <recordfield>SALESORDER.FOOTER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>HEADER.value</name>
+          <recordfield>SALESORDER.HEADER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>SALESORDER.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NET.value</name>
+          <recordfield>SALESORDER.NET</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESORDERCODE.value</name>
+          <recordfield>SALESORDER.SALESORDERCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESORDERDATE.value</name>
+          <recordfield>SALESORDER.SALESORDERDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESORDERID.value</name>
+          <recordfield>SALESORDER.SALESORDERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>SALESORDER.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>SALESORDER.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VAT.value</name>
+          <recordfield>SALESORDER.VAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VERSNR.value</name>
+          <recordfield>SALESORDER.VERSNR</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>SALESORDER.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ORG_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_PERSON_ID.value</name>
+          <recordfield>CONTACT.PERSON_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESS.value</name>
+          <recordfield>SALESORDER.ADDRESS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.displayValue</name>
+          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.displayValue</name>
+          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OFFER_ID.value</name>
+          <recordfield>SALESORDER.OFFER_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.displayValue</name>
+          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Order_entity/entityfields/attributes/onValidation.js b/entity/Order_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..3dc21efcc3ba693e83bd3ba87c46bd7beb3fb2c2
--- /dev/null
+++ b/entity/Order_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$field.SALESORDERID"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 885aebc0723429de02f86c19daadf72850fd428a..eaa4cda062d59777cbdd454cd993891afc42b098 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,312 +1,312 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Orderitem_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
-  <title>Orderitem</title>
-  <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
-  <titlePlural>Orderitems</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>ASSIGNEDTO</name>
-    </entityField>
-    <entityField>
-      <name>DISCOUNT</name>
-      <title>Discount</title>
-    </entityField>
-    <entityField>
-      <name>GROUPCODEID</name>
-      <title>Commodity group</title>
-      <consumer>KeywordProductGroupcodes</consumer>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>ITEMNAME</name>
-      <title>Designation</title>
-    </entityField>
-    <entityField>
-      <name>ITEMPOSITION</name>
-      <title>Position</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ITEMSORT</name>
-    </entityField>
-    <entityField>
-      <name>SALESORDERITEMID</name>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESORDER_ID</name>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OPTIONAL</name>
-      <title>Optional</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PRICE</name>
-      <title>Unit price</title>
-    </entityField>
-    <entityField>
-      <name>PRODUCT_ID</name>
-      <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
-      <title>Article</title>
-      <consumer>Products</consumer>
-      <linkedContext>Product</linkedContext>
-      <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>QUANTITY</name>
-      <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
-      <title>Quantity</title>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-      <onValidation></onValidation>
-    </entityField>
-    <entityField>
-      <name>UNIT</name>
-      <title>Unit</title>
-      <consumer>KeywordQuantityUnits</consumer>
-      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>VAT</name>
-      <title>VAT in %</title>
-      <state>AUTO</state>
-    </entityField>
-    <entityParameter>
-      <name>OrderId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>Currency_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>TotalPrice</name>
-      <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
-      <title>Sum</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
-      <onValidation></onValidation>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>OrderStatus_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>Orderitems</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Orderitems</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Orderitems</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Currency_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrderId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrderStatus_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>INFO</name>
-      <title>Description</title>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordProductGroupcodes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordQuantityUnits</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <maximumDbRows v="0" />
-      <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
-          <tableName>SALESORDERITEM</tableName>
-          <primaryKey>SALESORDERITEMID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ASSIGNEDTO.value</name>
-          <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DISCOUNT.value</name>
-          <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODEID.value</name>
-          <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ITEMNAME.value</name>
-          <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ITEMPOSITION.value</name>
-          <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ITEMSORT.value</name>
-          <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESORDERITEMID.value</name>
-          <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESORDER_ID.value</name>
-          <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OPTIONAL.value</name>
-          <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRICE.value</name>
-          <recordfield>SALESORDERITEM.PRICE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.value</name>
-          <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>QUANTITY.value</name>
-          <recordfield>SALESORDERITEM.QUANTITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UNIT.value</name>
-          <recordfield>SALESORDERITEM.UNIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VAT.value</name>
-          <recordfield>SALESORDERITEM.VAT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODEID.displayValue</name>
-          <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UNIT.displayValue</name>
-          <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>SALESORDERITEM.INFO</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Orderitem_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
+  <title>Orderitem</title>
+  <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
+  <titlePlural>Orderitems</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>ASSIGNEDTO</name>
+    </entityField>
+    <entityField>
+      <name>DISCOUNT</name>
+      <title>Discount</title>
+    </entityField>
+    <entityField>
+      <name>GROUPCODEID</name>
+      <title>Commodity group</title>
+      <consumer>KeywordProductGroupcodes</consumer>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ITEMNAME</name>
+      <title>Designation</title>
+    </entityField>
+    <entityField>
+      <name>ITEMPOSITION</name>
+      <title>Position</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ITEMSORT</name>
+    </entityField>
+    <entityField>
+      <name>SALESORDERITEMID</name>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESORDER_ID</name>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OPTIONAL</name>
+      <title>Optional</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRICE</name>
+      <title>Unit price</title>
+    </entityField>
+    <entityField>
+      <name>PRODUCT_ID</name>
+      <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
+      <title>Article</title>
+      <consumer>Products</consumer>
+      <linkedContext>Product</linkedContext>
+      <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>QUANTITY</name>
+      <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
+      <title>Quantity</title>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+      <onValidation></onValidation>
+    </entityField>
+    <entityField>
+      <name>UNIT</name>
+      <title>Unit</title>
+      <consumer>KeywordQuantityUnits</consumer>
+      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>VAT</name>
+      <title>VAT in %</title>
+      <state>AUTO</state>
+    </entityField>
+    <entityParameter>
+      <name>OrderId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>Currency_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>TotalPrice</name>
+      <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
+      <title>Sum</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+      <onValidation></onValidation>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>OrderStatus_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>Orderitems</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Orderitems</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Orderitems</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Currency_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrderId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrderStatus_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>INFO</name>
+      <title>Description</title>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordProductGroupcodes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordQuantityUnits</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <maximumDbRows v="0" />
+      <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
+          <tableName>SALESORDERITEM</tableName>
+          <primaryKey>SALESORDERITEMID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ASSIGNEDTO.value</name>
+          <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISCOUNT.value</name>
+          <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODEID.value</name>
+          <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ITEMNAME.value</name>
+          <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ITEMPOSITION.value</name>
+          <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ITEMSORT.value</name>
+          <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESORDERITEMID.value</name>
+          <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESORDER_ID.value</name>
+          <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OPTIONAL.value</name>
+          <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRICE.value</name>
+          <recordfield>SALESORDERITEM.PRICE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.value</name>
+          <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>QUANTITY.value</name>
+          <recordfield>SALESORDERITEM.QUANTITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UNIT.value</name>
+          <recordfield>SALESORDERITEM.UNIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VAT.value</name>
+          <recordfield>SALESORDERITEM.VAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODEID.displayValue</name>
+          <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UNIT.displayValue</name>
+          <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>SALESORDERITEM.INFO</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 0c503bb925d27e90cbe0e75869299971263f59af..95de4db4fa766cbc463fdd3ce256b9cb15e87bb8 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,934 +1,936 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Organisation_entity</name>
-  <description>former Org</description>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Organisation_entity/documentation.adoc</documentation>
-  <title>Company</title>
-  <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
-  <iconId>VAADIN:BUILDING</iconId>
-  <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
-  <titlePlural>Companies</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>CUSTOMERCODE</name>
-      <title>Customercode</title>
-      <contentType>TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Information</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-      <contentType>LONG_TEXT</contentType>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>ORGANISATIONID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>LANGUAGE</name>
-      <title>Language</title>
-      <consumer>Languages</consumer>
-      <selectionMode>SINGLE</selectionMode>
-    </entityField>
-    <entityField>
-      <name>ORGANISATION_ID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACTID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>Status</title>
-      <consumer>KeywordContactStates</consumer>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>Type</title>
-      <consumer>KeywordOrganisationTypes</consumer>
-      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Contact</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>OrganisationRelated</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>OrgId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contact/children/orgid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityFieldGroup>
-      <name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>CUSTOMERCODE</element>
-      </fields>
-    </entityFieldGroup>
-    <entityProvider>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>85aa363e-d8ba-4df5-8422-bf7aff86a4f8</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Organisations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>WithPrivate_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludeOrganisationsByPersonId</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeKeyId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Addresses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Address_entity</entityName>
-        <fieldName>OrganisationAddresses</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>DefaultAddressId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ADDRESS_ID</name>
-      <title>Address</title>
-      <consumer>Addresses</consumer>
-      <searchable v="false" />
-      <state>AUTO</state>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Communications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>AllCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Contracts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Contract_entity</entityName>
-        <fieldName>Contracts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Productprices</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Productprice_entity</entityName>
-        <fieldName>Productprices</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/productprices/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="false" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Organisations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>openEditDefaultsView</name>
-      <fieldType>ACTION</fieldType>
-      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
-      <title>Edit defaults</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
-      <actionOrder v="1" />
-      <iconId>NEON:WRENCH</iconId>
-    </entityActionField>
-    <entityActionField>
-      <name>newOffer</name>
-      <fieldType>ACTION</fieldType>
-      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/documentation.adoc</documentation>
-      <title>New offer</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
-      <actionOrder v="2" />
-      <iconId>VAADIN:CART</iconId>
-    </entityActionField>
-    <entityField>
-      <name>STANDARD_EMAIL_COMMUNICATION</name>
-      <title>Email</title>
-      <consumer>EmailCommunications</consumer>
-      <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>RECORD</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>STANDARD_PHONE_COMMUNICATION</name>
-      <title>Phone</title>
-      <consumer>PhoneCommunications</consumer>
-      <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
-    </entityField>
-    <entityConsumer>
-      <name>PhoneCommunications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>PhoneCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>EmailCommunications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>EmailCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <actionOrder v="0" />
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>orgReport</name>
-      <fieldType>ACTION</fieldType>
-      <title>Customer Base Sheet</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
-      <actionOrder v="4" />
-      <iconId>VAADIN:FILE_TEXT_O</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Countries</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Countries_Entity</entityName>
-        <fieldName>ISO2Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <title></title>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ObjectRelations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordContactStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordOrganisationTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPricePolitics</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordWeaknesses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordStrenghts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <actionOrder v="3" />
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Salesprojects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Salesproject_entity</entityName>
-        <fieldName>Salesprojects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Offers</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offer_entity</entityName>
-        <fieldName>ContactOffers</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>WithPrivate_param</name>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>ObjectTrees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ObjectTree_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newAppointment</name>
-      <fieldType>ACTION</fieldType>
-      <title>New appointment</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CALENDAR</iconId>
-      <tooltip>New Appointment</tooltip>
-    </entityActionField>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>360DegreeObjects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>360Degree_entity</entityName>
-        <fieldName>OrganisationObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>ExcludeOrganisationsByPersonId</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>WithPersonIdFilter</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc</documentation>
-      <dependencies>
-        <entityDependency>
-          <name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
-          <entityName>Contact_entity</entityName>
-          <fieldName>Organisations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>a80c3db0-29db-433c-8f7c-4ebf6639ad6d</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Organisations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ExcludeOrganisationsByPersonId</name>
-          <title></title>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>WithPrivate_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeKeyId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>AttributeId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>AttributeKeyId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>WithAttribute</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
-          <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>Organisations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f368be61-1a15-449f-b37c-b1343069412c</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Organisations</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeKeyId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludeOrganisationsByPersonId</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>WithPrivate_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ExcludedContactIds_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>DATE_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW_CONTACT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW_CONTACT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PICTURE</name>
-      <title>Picture</title>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>AvatarText_param</name>
-      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionGroup>
-      <name>campaignActionGroup</name>
-      <children>
-        <entityActionField>
-          <name>addToCampaignFromTable</name>
-          <fieldType>ACTION</fieldType>
-          <title>Add to Campaign</title>
-          <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
-          <isObjectAction v="false" />
-          <isSelectionAction v="true" />
-          <iconId>NEON:GROUP_APPOINTMENT</iconId>
-          <tooltip>Add the selection to a campaign</tooltip>
-          <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityActionField>
-      <name>addToCampaign</name>
-      <fieldType>ACTION</fieldType>
-      <title>Add to Campaign</title>
-      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess>
-      <iconId>NEON:GROUP_APPOINTMENT</iconId>
-      <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
-    </entityActionField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <linkInformation>
-        <linkInformation>
-          <name>f745a13c-6fbe-4cab-99d8-3cb7d599005a</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>31f03bd6-83c1-4185-a9a7-4e6d94469fd2</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>695731e1-879d-4fb1-a1bb-56ecfd6f7c03</name>
-          <tableName>ADDRESS</tableName>
-          <primaryKey>ADDRESSID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ADDRESS_ID.value</name>
-          <recordfield>CONTACT.ADDRESS_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CUSTOMERCODE.value</name>
-          <recordfield>ORGANISATION.CUSTOMERCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>ORGANISATION.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>CONTACT.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATIONID.value</name>
-          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACTID.value</name>
-          <recordfield>CONTACT.CONTACTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>CONTACT.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>ORGANISATION.TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
-          <recordfield></recordfield>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
-          <recordfield></recordfield>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.displayValue</name>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.displayValue</name>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.displayValue</name>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>ORGANISATION.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>ORGANISATION.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>ORGANISATION.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>ORGANISATION.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW_CONTACT.value</name>
-          <recordfield>CONTACT.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW_CONTACT.value</name>
-          <recordfield>CONTACT.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESS_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PICTURE.value</name>
-          <recordfield>ORGANISATION.PICTURE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Organisation_entity</name>
+  <description>former Org</description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Organisation_entity/documentation.adoc</documentation>
+  <title>Company</title>
+  <contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
+  <iconId>VAADIN:BUILDING</iconId>
+  <imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
+  <titlePlural>Companies</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>CUSTOMERCODE</name>
+      <title>Customercode</title>
+      <contentType>TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Information</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <contentType>LONG_TEXT</contentType>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>ORGANISATIONID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>LANGUAGE</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <selectionMode>SINGLE</selectionMode>
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_ID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACTID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordContactStates</consumer>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <consumer>KeywordOrganisationTypes</consumer>
+      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contact</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>OrganisationRelated</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contact/children/orgid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityFieldGroup>
+      <name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
+      <description>FIELDGROUP</description>
+      <fields>
+        <element>CUSTOMERCODE</element>
+      </fields>
+    </entityFieldGroup>
+    <entityProvider>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>85aa363e-d8ba-4df5-8422-bf7aff86a4f8</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2eb60a6e-575c-4579-9278-5868ffe4bc75</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>71be0991-5bd8-4046-89b5-41d9a152202b</name>
+          <entityName>SalesprojectCompetition_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Addresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>OrganisationAddresses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DefaultAddressId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ADDRESS_ID</name>
+      <title>Address</title>
+      <consumer>Addresses</consumer>
+      <searchable v="false" />
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Communications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>AllCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contracts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contract_entity</entityName>
+        <fieldName>Contracts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Productprices</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Productprice_entity</entityName>
+        <fieldName>Productprices</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/productprices/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="false" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>openEditDefaultsView</name>
+      <fieldType>ACTION</fieldType>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
+      <title>Edit defaults</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
+      <actionOrder v="1" />
+      <iconId>NEON:WRENCH</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newOffer</name>
+      <fieldType>ACTION</fieldType>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/documentation.adoc</documentation>
+      <title>New offer</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+      <actionOrder v="2" />
+      <iconId>VAADIN:CART</iconId>
+    </entityActionField>
+    <entityField>
+      <name>STANDARD_EMAIL_COMMUNICATION</name>
+      <title>Email</title>
+      <consumer>EmailCommunications</consumer>
+      <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>RECORD</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>STANDARD_PHONE_COMMUNICATION</name>
+      <title>Phone</title>
+      <consumer>PhoneCommunications</consumer>
+      <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
+    </entityField>
+    <entityConsumer>
+      <name>PhoneCommunications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>PhoneCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>EmailCommunications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>EmailCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <actionOrder v="0" />
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>orgReport</name>
+      <fieldType>ACTION</fieldType>
+      <title>Customer Base Sheet</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
+      <actionOrder v="4" />
+      <iconId>VAADIN:FILE_TEXT_O</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Countries</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Countries_Entity</entityName>
+        <fieldName>ISO2Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Organisation_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ObjectRelations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowid_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordContactStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordOrganisationTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPricePolitics</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordWeaknesses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStrenghts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <actionOrder v="3" />
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Salesprojects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Salesproject_entity</entityName>
+        <fieldName>Salesprojects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>ContactOffers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>WithPrivate_param</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withprivate_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>ObjectTrees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newAppointment</name>
+      <fieldType>ACTION</fieldType>
+      <title>New appointment</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CALENDAR</iconId>
+      <tooltip>New Appointment</tooltip>
+    </entityActionField>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>360DegreeObjects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>360Degree_entity</entityName>
+        <fieldName>OrganisationObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ExcludeOrganisationsByPersonId</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/excludeorganisationsbypersonid/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>WithPersonIdFilter</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
+          <entityName>Contact_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>a80c3db0-29db-433c-8f7c-4ebf6639ad6d</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <title></title>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>AttributeId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AttributeKeyId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>WithAttribute</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ExcludedContactIds_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DATE_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW_CONTACT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW_CONTACT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PICTURE</name>
+      <title>Picture</title>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>AvatarText_param</name>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionGroup>
+      <name>campaignActionGroup</name>
+      <children>
+        <entityActionField>
+          <name>addToCampaignFromTable</name>
+          <fieldType>ACTION</fieldType>
+          <title>Add to Campaign</title>
+          <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>NEON:GROUP_APPOINTMENT</iconId>
+          <tooltip>Add the selection to a campaign</tooltip>
+          <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityActionField>
+      <name>addToCampaign</name>
+      <fieldType>ACTION</fieldType>
+      <title>Add to Campaign</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess>
+      <iconId>NEON:GROUP_APPOINTMENT</iconId>
+      <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
+    </entityActionField>
+    <entityParameter>
+      <name>OrganisationType_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <linkInformation>
+        <linkInformation>
+          <name>f745a13c-6fbe-4cab-99d8-3cb7d599005a</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>31f03bd6-83c1-4185-a9a7-4e6d94469fd2</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>695731e1-879d-4fb1-a1bb-56ecfd6f7c03</name>
+          <tableName>ADDRESS</tableName>
+          <primaryKey>ADDRESSID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADDRESS_ID.value</name>
+          <recordfield>CONTACT.ADDRESS_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CUSTOMERCODE.value</name>
+          <recordfield>ORGANISATION.CUSTOMERCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>ORGANISATION.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>CONTACT.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATIONID.value</name>
+          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTID.value</name>
+          <recordfield>CONTACT.CONTACTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>CONTACT.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>ORGANISATION.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
+          <recordfield></recordfield>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
+          <recordfield></recordfield>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.displayValue</name>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.displayValue</name>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>ORGANISATION.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>ORGANISATION.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>ORGANISATION.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>ORGANISATION.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW_CONTACT.value</name>
+          <recordfield>CONTACT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW_CONTACT.value</name>
+          <recordfield>CONTACT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESS_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PICTURE.value</name>
+          <recordfield>ORGANISATION.PICTURE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index bcfda44fe71eac93b3f8c11cc0c85a496f2cd51c..533f8ec837ea2f9b588ddf05545ac47cdda23d18 100644
--- a/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/attributes/onValidation.js b/entity/Organisation_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
index fde05a49a0df1146c17e05dc3775b82ea0de6f12..45a55b3998f07f9d2d3ce78ad10b19894407f43e 100644
--- a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
@@ -7,7 +7,7 @@ import("Context_lib");
 
 
 var params = {};
-params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
 
 neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
 
diff --git a/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc b/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..9dd2be39a6b8facd112ed750541682ed95571c9c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisationtype_param/documentation.adoc
@@ -0,0 +1 @@
+Param for filtering a specific organisationtype. (OrganisationType is a keyword)
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 224704217d5f0041ceda924f6636dbf540bae5f6..d75c7b8904823327c61473ffdc98761453c1ed70 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -1,44 +1,46 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-import("Context_lib");
-
-var cond = SqlCondition.begin();
-                            
-// filter privat company if it is not needed
-if (vars.getString("$param.WithPrivate_param") != "true")
-    cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?");
-
-var excludeOrgsWithPersonId = vars.get("$param.ExcludeOrganisationsByPersonId")
-if (excludeOrgsWithPersonId)
-    cond.andAttachPrepared(SqlCondition.begin()
-                                       .andPrepare("CONTACT.PERSON_ID", excludeOrgsWithPersonId)
-                                       .buildSql("ORGANISATION.ORGANISATIONID not in (select CONTACT.ORGANISATION_ID from CONTACT", null, ")"));
-
-if (vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param"))
-{
-    var hasAttributeCondition = SqlCondition.begin()
-                                            .andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", ContextUtils.getCurrentContextId())
-                                            .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", vars.get("$param.AttributeId_param"))
-                                            .andPrepareVars("AB_ATTRIBUTERELATION.ID_VALUE", "$param.AttributeKeyId_param");
-                                            
-    cond.andAttachPrepared(hasAttributeCondition.buildSql("ORGANISATION.ORGANISATIONID in (select OBJECT_ROWID from AB_ATTRIBUTERELATION", "1=2", ")"));
-}
-
-if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedContactIds_param"))
-{
-    var excludedContacts = JSON.parse(vars.get("$param.ExcludedContactIds_param"));
-    var excludedCond = SqlCondition.begin();
-    
-    excludedContacts.forEach(function(pContactId)
-    {
-        excludedCond.andPrepare("CONTACT.CONTACTID", pContactId, "#<>?");
-    });
-    
-    cond.andSqlCondition(excludedCond, "1=1");
-}
-
-//TODO: use a preparedCondition when available #1030812 #1034026
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+import("Context_lib");
+
+var cond = SqlCondition.begin();
+                            
+// filter privat company if it is not needed
+if (vars.getString("$param.WithPrivate_param") != "true")
+    cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?");
+
+var excludeOrgsWithPersonId = vars.get("$param.ExcludeOrganisationsByPersonId")
+if (excludeOrgsWithPersonId)
+    cond.andAttachPrepared(SqlCondition.begin()
+                                       .andPrepare("CONTACT.PERSON_ID", excludeOrgsWithPersonId)
+                                       .buildSql("ORGANISATION.ORGANISATIONID not in (select CONTACT.ORGANISATION_ID from CONTACT", null, ")"));
+
+if (vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param"))
+{
+    var hasAttributeCondition = SqlCondition.begin()
+                                            .andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", ContextUtils.getCurrentContextId())
+                                            .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", vars.get("$param.AttributeId_param"))
+                                            .andPrepareVars("AB_ATTRIBUTERELATION.ID_VALUE", "$param.AttributeKeyId_param");
+                                            
+    cond.andAttachPrepared(hasAttributeCondition.buildSql("ORGANISATION.ORGANISATIONID in (select OBJECT_ROWID from AB_ATTRIBUTERELATION", "1=2", ")"));
+}
+
+if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedContactIds_param"))
+{
+    var excludedContacts = JSON.parse(vars.getString("$param.ExcludedContactIds_param"));
+    var excludedCond = SqlCondition.begin();
+    
+    excludedContacts.forEach(function(pContactId)
+    {
+        excludedCond.andPrepare("CONTACT.CONTACTID", pContactId, "#<>?");
+    });
+    
+    cond.andSqlCondition(excludedCond, "1=1");
+}
+
+cond.andPrepareVars("ORGANISATION.TYPE", "$param.OrganisationType_param");
+
+//TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 71725ad5b3f4de6a72d22935b71e1d7696c87ae7..d8140373febb384476c8c4bff0687c03c3ee9646 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,1080 +1,1085 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Person_entity</name>
-  <description>former Pers</description>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
-  <title>Contact</title>
-  <contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
-  <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:USERS</iconId>
-  <imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
-  <titlePlural>Contacts</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>DATEOFBIRTH</name>
-      <title>Date of birth</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <onValidation>%aditoprj%/entity/Person_entity/entityfields/dateofbirth/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>FIRSTNAME</name>
-      <title>Firstname</title>
-    </entityField>
-    <entityField>
-      <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>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>LASTNAME</name>
-      <title>Lastname</title>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/lastname/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>MIDDLENAME</name>
-      <title>Middlename</title>
-    </entityField>
-    <entityField>
-      <name>PERSONID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALUTATION</name>
-      <title>Salutation</title>
-      <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>
-      <searchable v="false" />
-    </entityField>
-    <entityParameter>
-      <name>OrgId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityFieldGroup>
-      <name>NAME_fieldGroup</name>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>FIRSTNAME</element>
-        <element>LASTNAME</element>
-      </fields>
-    </entityFieldGroup>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>CONTACTID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityProvider>
-      <name>OrganisationRelated</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>41952879-c2f0-411f-8ca1-36c38914a629</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Contact</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrgId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>PERSON_ID</name>
-      <documentation>%aditoprj%/entity/Person_entity/entityfields/person_id/documentation.adoc</documentation>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ORGANISATION_ID</name>
-      <title>Firma</title>
-      <consumer>Organisations</consumer>
-      <linkedContextProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="false" />
-      <searchable v="true" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
-      <onValidation>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValidation.js</onValidation>
-    </entityField>
-    <entityConsumer>
-      <name>PersAddresses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Address_entity</entityName>
-        <fieldName>ContactAddresses</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>DefaultAddressId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Communications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>AllCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <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 &amp;quot;CONTACTID&amp;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>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>SINGLE</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>WithPersonIdFilter</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ExcludeOrganisationsByPersonId</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Contracts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Contract_entity</entityName>
-        <fieldName>Contracts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Pricelists</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <state>AUTO</state>
-      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Productprice_entity</entityName>
-        <fieldName>Productprices</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="false" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Genders</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Gender_keyword</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>799de3aa-657c-4bc1-a41e-10dc1687ca75</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>ContactRequestors</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3e467178-bc3b-40b5-9fd3-af27bc3ba476</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>ContactEditors</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>ec66d6b0-a1fa-40a1-9612-34775d3e89a9</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Persons</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>LANGUAGE</name>
-      <title>Language</title>
-      <consumer>Languages</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/language/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityFieldGroup>
-      <name>FULL_NAME_fieldGroup</name>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js</valueProcess>
-      <title>Name</title>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>SALUTATION</element>
-        <element>TITLE</element>
-        <element>FIRSTNAME</element>
-        <element>MIDDLENAME</element>
-        <element>LASTNAME</element>
-      </fields>
-    </entityFieldGroup>
-    <entityProvider>
-      <name>Contact</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>12c5350a-3159-449b-a94e-d57658b4c124</name>
-          <entityName>SalesprojectMember_entity</entityName>
-          <fieldName>CurrentContact</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>OrgId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>OrgAddresses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <state>READONLY</state>
-      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Address_entity</entityName>
-        <fieldName>OrganisationAddressesByContact</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/contactid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>DefaultAddressId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>REL_RELATIONSHIP</name>
-      <title>Relationship</title>
-      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
-      <contentType>NUMBER</contentType>
-      <mandatory v="false" />
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
-    </entityField>
-    <entityActionField>
-      <name>openEditDefaultsView</name>
-      <fieldType>ACTION</fieldType>
-      <title>Edit defaults</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:WRENCH</iconId>
-    </entityActionField>
-    <entityActionField>
-      <name>newOffer</name>
-      <fieldType>ACTION</fieldType>
-      <title>New offer</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CART</iconId>
-    </entityActionField>
-    <entityField>
-      <name>STANDARD_EMAIL_COMMUNICATION</name>
-      <title>E-Mail</title>
-      <consumer>EmailCommunications</consumer>
-      <searchable v="false" />
-      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>STANDARD_PHONE_COMMUNICATION</name>
-      <title>Phone</title>
-      <consumer>PhoneCommunications</consumer>
-      <searchable v="false" />
-      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
-    </entityField>
-    <entityConsumer>
-      <name>PhoneCommunications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <description>Used for standard communication</description>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>PhoneCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <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 &amp;quot;CONTACTID&amp;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>
-    </entityConsumer>
-    <entityConsumer>
-      <name>EmailCommunications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <description>Used for standard communication</description>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Communication_entity</entityName>
-        <fieldName>EmailCommunications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <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 &amp;quot;CONTACTID&amp;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>
-    </entityConsumer>
-    <entityField>
-      <name>ADDRESS_ID</name>
-      <title>Address</title>
-      <consumer>ContactAndOrganisationAddresses</consumer>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityConsumer>
-      <name>ObjectRelations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordGenders</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Offers</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offer_entity</entityName>
-        <fieldName>ContactOffers</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
-        </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>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </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>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ObjectTrees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ObjectTree_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>STATUS</name>
-      <title>Status</title>
-      <consumer>KeywordContactStates</consumer>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/status/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordContactStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContactAndOrganisationAddresses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Address_entity</entityName>
-        <fieldName>OrganisationAndContactAddresses</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrganisationId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>DEPARTMENT</name>
-      <title>Department</title>
-      <dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-    </entityField>
-    <entityField>
-      <name>POSITION</name>
-      <title>Position</title>
-      <dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-    </entityField>
-    <entityField>
-      <name>CONTACTROLE</name>
-      <title>Contactrole</title>
-      <dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
-      <textInputAllowed v="true" />
-    </entityField>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>OtherContacts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Contact_entity</entityName>
-        <fieldName>PersonsContactsExceptOwn</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>OwnContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>LanguageKey_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>ORGANISATION_NAME</name>
-      <searchable v="false" />
-    </entityField>
-    <entityParameter>
-      <name>ExcludedContactIds_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>Contacts</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>75f0e309-8b3f-4224-b599-a203405f1bff</name>
-          <entityName>SalesprojectMember_entity</entityName>
-          <fieldName>Contacts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>e46dcd73-64a8-4b3e-b976-1b4643c54ebb</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>ContactsConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>OrgId_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>360DegreeObjects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>360Degree_entity</entityName>
-        <fieldName>PersonObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>addToCampaign</name>
-      <fieldType>ACTION</fieldType>
-      <title>Add to Campaign</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess>
-      <actionOrder v="1" />
-      <iconId>NEON:GROUP_APPOINTMENT</iconId>
-      <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
-    </entityActionField>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>DATE_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW_CONTACT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW_CONTACT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>AdditionalActivityTaskLinks_param</name>
-      <title></title>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js</valueProcess>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>PICTURE</name>
-      <title>Picture</title>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>AvatarText_param</name>
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionGroup>
-      <name>campaignActionGroup</name>
-      <title>Campaign</title>
-      <children>
-        <entityActionField>
-          <name>addToCampaignFromTable</name>
-          <fieldType>ACTION</fieldType>
-          <title>Add to Campaign</title>
-          <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
-          <isMenuAction v="true" />
-          <isObjectAction v="false" />
-          <isSelectionAction v="true" />
-          <iconId>NEON:GROUP_APPOINTMENT</iconId>
-          <tooltip>Add the selection to a campaign</tooltip>
-          <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <linkInformation>
-        <linkInformation>
-          <name>3afdecb0-515e-43d2-872f-04c82ecca9ae</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>217d431f-018c-4573-b786-d1b6b88f4b64</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>19877118-eb80-4672-bd73-cf10dbbb052a</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>64f188c2-e53d-44b5-9980-c867282eff7e</name>
-          <tableName>ADDRESS</tableName>
-          <primaryKey>ADDRESSID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>PERSONID.value</name>
-          <recordfield>PERSON.PERSONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATEOFBIRTH.value</name>
-          <recordfield>PERSON.DATEOFBIRTH</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>FIRSTNAME.value</name>
-          <recordfield>PERSON.FIRSTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GENDER.value</name>
-          <recordfield>PERSON.GENDER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>CONTACT.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LASTNAME.value</name>
-          <recordfield>PERSON.LASTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MIDDLENAME.value</name>
-          <recordfield>PERSON.MIDDLENAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACTID.value</name>
-          <recordfield>CONTACT.CONTACTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALUTATION.value</name>
-          <recordfield>PERSON.SALUTATION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TITLE.value</name>
-          <recordfield>PERSON.TITLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TITLESUFFIX.value</name>
-          <recordfield>PERSON.TITLESUFFIX</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REL_RELATIONSHIP.value</name>
-          <recordfield>CONTACT.RELATIONSHIP</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
-          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
-          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESS_ID.value</name>
-          <recordfield>CONTACT.ADDRESS_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_ID.displayValue</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GENDER.displayValue</name>
-          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <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>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>CONTACT.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>POSITION.value</name>
-          <recordfield>CONTACT.POSITION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DEPARTMENT.value</name>
-          <recordfield>CONTACT.DEPARTMENT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACTROLE.value</name>
-          <recordfield>CONTACT.CONTACTROLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>PERSON.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>PERSON.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>PERSON.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>PERSON.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW_CONTACT.value</name>
-          <recordfield>CONTACT.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW_CONTACT.value</name>
-          <recordfield>CONTACT.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESS_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PICTURE.value</name>
-          <recordfield>PERSON.PICTURE</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Person_entity</name>
+  <description>former Pers</description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
+  <title>Contact</title>
+  <contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
+  <iconId>VAADIN:USERS</iconId>
+  <imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
+  <titlePlural>Contacts</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>DATEOFBIRTH</name>
+      <title>Date of birth</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <onValidation>%aditoprj%/entity/Person_entity/entityfields/dateofbirth/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>FIRSTNAME</name>
+      <title>Firstname</title>
+    </entityField>
+    <entityField>
+      <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>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>LASTNAME</name>
+      <title>Lastname</title>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/lastname/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>MIDDLENAME</name>
+      <title>Middlename</title>
+    </entityField>
+    <entityField>
+      <name>PERSONID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/personid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALUTATION</name>
+      <title>Salutation</title>
+      <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>
+      <searchable v="false" />
+    </entityField>
+    <entityParameter>
+      <name>OrgId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityFieldGroup>
+      <name>NAME_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+      <description>FIELDGROUP</description>
+      <fields>
+        <element>FIRSTNAME</element>
+        <element>LASTNAME</element>
+      </fields>
+    </entityFieldGroup>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CONTACTID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityProvider>
+      <name>OrganisationRelated</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>41952879-c2f0-411f-8ca1-36c38914a629</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Contact</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>PERSON_ID</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/person_id/documentation.adoc</documentation>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_ID</name>
+      <title>Firma</title>
+      <consumer>Organisations</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="false" />
+      <searchable v="true" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
+      <onValidation>%aditoprj%/entity/Person_entity/entityfields/organisation_id/onValidation.js</onValidation>
+    </entityField>
+    <entityConsumer>
+      <name>PersAddresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>ContactAddresses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DefaultAddressId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Communications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>AllCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <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 &amp;quot;CONTACTID&amp;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>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>SINGLE</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>WithPersonIdFilter</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contracts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contract_entity</entityName>
+        <fieldName>Contracts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Pricelists</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>AUTO</state>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Productprice_entity</entityName>
+        <fieldName>Productprices</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="false" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Genders</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Gender_keyword</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>799de3aa-657c-4bc1-a41e-10dc1687ca75</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ContactRequestors</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3e467178-bc3b-40b5-9fd3-af27bc3ba476</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ContactEditors</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>ec66d6b0-a1fa-40a1-9612-34775d3e89a9</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Persons</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>LANGUAGE</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/language/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityFieldGroup>
+      <name>FULL_NAME_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js</valueProcess>
+      <title>Name</title>
+      <description>FIELDGROUP</description>
+      <fields>
+        <element>SALUTATION</element>
+        <element>TITLE</element>
+        <element>FIRSTNAME</element>
+        <element>MIDDLENAME</element>
+        <element>LASTNAME</element>
+      </fields>
+    </entityFieldGroup>
+    <entityProvider>
+      <name>Contact</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>12c5350a-3159-449b-a94e-d57658b4c124</name>
+          <entityName>SalesprojectMember_entity</entityName>
+          <fieldName>CurrentContact</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>OrgAddresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>OrganisationAddressesByContact</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/contactid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>DefaultAddressId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>REL_RELATIONSHIP</name>
+      <title>Relationship</title>
+      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+      <contentType>NUMBER</contentType>
+      <mandatory v="false" />
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionField>
+      <name>openEditDefaultsView</name>
+      <fieldType>ACTION</fieldType>
+      <title>Edit defaults</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:WRENCH</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newOffer</name>
+      <fieldType>ACTION</fieldType>
+      <title>New offer</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CART</iconId>
+    </entityActionField>
+    <entityField>
+      <name>STANDARD_EMAIL_COMMUNICATION</name>
+      <title>E-Mail</title>
+      <consumer>EmailCommunications</consumer>
+      <searchable v="false" />
+      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>STANDARD_PHONE_COMMUNICATION</name>
+      <title>Phone</title>
+      <consumer>PhoneCommunications</consumer>
+      <searchable v="false" />
+      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
+    </entityField>
+    <entityConsumer>
+      <name>PhoneCommunications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <description>Used for standard communication</description>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>PhoneCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <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 &amp;quot;CONTACTID&amp;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>
+    </entityConsumer>
+    <entityConsumer>
+      <name>EmailCommunications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <description>Used for standard communication</description>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Communication_entity</entityName>
+        <fieldName>EmailCommunications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <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 &amp;quot;CONTACTID&amp;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>
+    </entityConsumer>
+    <entityField>
+      <name>ADDRESS_ID</name>
+      <title>Address</title>
+      <consumer>ContactAndOrganisationAddresses</consumer>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityConsumer>
+      <name>ObjectRelations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowid_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordGenders</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>ContactOffers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
+        </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>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Person_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </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>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ObjectTrees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordContactStates</consumer>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordContactStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContactAndOrganisationAddresses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Address_entity</entityName>
+        <fieldName>OrganisationAndContactAddresses</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/contactid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DEPARTMENT</name>
+      <title>Department</title>
+      <dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+    </entityField>
+    <entityField>
+      <name>POSITION</name>
+      <title>Position</title>
+      <dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+    </entityField>
+    <entityField>
+      <name>CONTACTROLE</name>
+      <title>Contactrole</title>
+      <dropDownProcess>%aditoprj%/entity/Person_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+    </entityField>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>OtherContacts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contact_entity</entityName>
+        <fieldName>PersonsContactsExceptOwn</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OwnContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/owncontactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>LanguageKey_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ORGANISATION_NAME</name>
+      <searchable v="false" />
+    </entityField>
+    <entityParameter>
+      <name>ExcludedContactIds_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>Contacts</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>75f0e309-8b3f-4224-b599-a203405f1bff</name>
+          <entityName>SalesprojectMember_entity</entityName>
+          <fieldName>Contacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e46dcd73-64a8-4b3e-b976-1b4643c54ebb</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>ContactsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>360DegreeObjects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>360Degree_entity</entityName>
+        <fieldName>PersonObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>addToCampaign</name>
+      <fieldType>ACTION</fieldType>
+      <title>Add to Campaign</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/addtocampaign/onActionProcess.js</onActionProcess>
+      <actionOrder v="1" />
+      <iconId>NEON:GROUP_APPOINTMENT</iconId>
+      <tooltip>Choose a campaign and a step to add the contact to a  campaign</tooltip>
+    </entityActionField>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DATE_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW_CONTACT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW_CONTACT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/user_new_contact/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>AdditionalActivityTaskLinks_param</name>
+      <title></title>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js</valueProcess>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>PICTURE</name>
+      <title>Picture</title>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>AvatarText_param</name>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionGroup>
+      <name>campaignActionGroup</name>
+      <title>Campaign</title>
+      <children>
+        <entityActionField>
+          <name>addToCampaignFromTable</name>
+          <fieldType>ACTION</fieldType>
+          <title>Add to Campaign</title>
+          <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
+          <isMenuAction v="true" />
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>NEON:GROUP_APPOINTMENT</iconId>
+          <tooltip>Add the selection to a campaign</tooltip>
+          <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityActionField>
+      <name>newEmail</name>
+      <fieldType>ACTION</fieldType>
+      <title>Write email</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newemail/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:AT</iconId>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <linkInformation>
+        <linkInformation>
+          <name>3afdecb0-515e-43d2-872f-04c82ecca9ae</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>217d431f-018c-4573-b786-d1b6b88f4b64</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>19877118-eb80-4672-bd73-cf10dbbb052a</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>64f188c2-e53d-44b5-9980-c867282eff7e</name>
+          <tableName>ADDRESS</tableName>
+          <primaryKey>ADDRESSID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>PERSONID.value</name>
+          <recordfield>PERSON.PERSONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATEOFBIRTH.value</name>
+          <recordfield>PERSON.DATEOFBIRTH</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FIRSTNAME.value</name>
+          <recordfield>PERSON.FIRSTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GENDER.value</name>
+          <recordfield>PERSON.GENDER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>CONTACT.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_ID.value</name>
+          <recordfield>CONTACT.PERSON_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LASTNAME.value</name>
+          <recordfield>PERSON.LASTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MIDDLENAME.value</name>
+          <recordfield>PERSON.MIDDLENAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTID.value</name>
+          <recordfield>CONTACT.CONTACTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALUTATION.value</name>
+          <recordfield>PERSON.SALUTATION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>PERSON.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLESUFFIX.value</name>
+          <recordfield>PERSON.TITLESUFFIX</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REL_RELATIONSHIP.value</name>
+          <recordfield>CONTACT.RELATIONSHIP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESS_ID.value</name>
+          <recordfield>CONTACT.ADDRESS_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.displayValue</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GENDER.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <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>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>CONTACT.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>POSITION.value</name>
+          <recordfield>CONTACT.POSITION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+          <recordfield>CONTACT.DEPARTMENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTROLE.value</name>
+          <recordfield>CONTACT.CONTACTROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>PERSON.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>PERSON.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>PERSON.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>PERSON.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW_CONTACT.value</name>
+          <recordfield>CONTACT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW_CONTACT.value</name>
+          <recordfield>CONTACT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESS_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PICTURE.value</name>
+          <recordfield>PERSON.PICTURE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Person_entity/entityfields/attributes/onValidation.js b/entity/Person_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Person_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
index 9f78150c7ca1669fa6bc58ef2444f5808fa7ed14..4ad263b4ef3d4498fcf4a282917a2ed55b0f493a 100644
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -1,9 +1,9 @@
-import("system.vars");
-import("system.logging");
-import("system.neon");
-import("Campaign_lib");
-    logging.log("sys selection -> " + vars.get("$sys.selection"));
-if(vars.exists("$sys.selection")) //selektierte IDs als Array
-{
-    CampaignUtils.addParticipants(vars.getString("$sys.selection"));
+import("system.vars");
+import("system.logging");
+import("system.neon");
+import("Campaign_lib");
+    logging.log("sys selection -> " + vars.getString("$sys.selection"));
+if(vars.exists("$sys.selection")) //selektierte IDs als Array
+{
+    CampaignUtils.addParticipants(vars.getString("$sys.selection"));
 }
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newactivity/onActionProcess.js b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
index e7d148841fe65c68800d7f56e342e4007490269c..e84b4b594d5b4afc91f0f9da5d6e95e2ece6f294 100644
--- a/entity/Person_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newactivity/onActionProcess.js
@@ -1,6 +1,5 @@
 import("system.vars");
 import("ActivityTask_lib");
 
-var links = vars.get("$param.AdditionalActivityTaskLinks_param");
-links = JSON.parse(links);
+links = JSON.parse(vars.getString("$param.AdditionalActivityTaskLinks_param"));
 ActivityUtils.createNewActivity(vars.getString("$field.CONTACTID"), links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newemail/onActionProcess.js b/entity/Person_entity/entityfields/newemail/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd08784b868ada5103f3dbcb0bef4d984c823074
--- /dev/null
+++ b/entity/Person_entity/entityfields/newemail/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Email_lib");
+
+EmailUtils.openNewMail(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newtask/onActionProcess.js b/entity/Person_entity/entityfields/newtask/onActionProcess.js
index 6293b7faa23bbe45811120d70f296937727febd6..8c40c78dad45b8f1c1ec116a4d10fae11495ea83 100644
--- a/entity/Person_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newtask/onActionProcess.js
@@ -1,7 +1,6 @@
 import("system.vars");
 import("ActivityTask_lib");
 
-var links = vars.get("$param.AdditionalActivityTaskLinks_param");
-links = JSON.parse(links);
+links = JSON.parse(vars.getString("$param.AdditionalActivityTaskLinks_param"));
 
 TaskUtils.createNewTask(vars.get("$field.CONTACTID"), links);
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index d31e4c68e741d38374e087d121f55def93d54d3c..2678fdab9c1337a75e2f06a34ac456384daa8c66 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -9,7 +9,7 @@ cond.andPrepareVars("CONTACT.ORGANISATION_ID", "$param.OrgId_param")
 
 if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedContactIds_param"))
 {
-    var excludedContacts = JSON.parse(vars.get("$param.ExcludedContactIds_param"));
+    var excludedContacts = JSON.parse(vars.getString("$param.ExcludedContactIds_param"));
     var excludedCond = SqlCondition.begin();
     
     excludedContacts.forEach(function(pContactId)
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 430d09bef902eb01e98d5fd1beaa1226db720b84..bd4f91a0b5472d1b639c4fcaf204119151d0b553 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,150 +1,150 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Prod2prod_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
-  <title>Parts list</title>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DEST_ID</name>
-      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/documentation.adoc</documentation>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OPTIONAL</name>
-      <title>Optional</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/uid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>QUANTITY</name>
-      <title>Quantity</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#</outputFormat>
-      <inputFormat>#</inputFormat>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SOURCE_ID</name>
-      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/documentation.adoc</documentation>
-      <title>Product</title>
-      <consumer>Products</consumer>
-    </entityField>
-    <entityField>
-      <name>TAKEPRICE</name>
-      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/documentation.adoc</documentation>
-      <title>Take price</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>ProductId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>PROD2PRODID</name>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>ProductLinks</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>targetContext</targetContextField>
-      <targetIdField>SOURCE_ID</targetIdField>
-      <dependencies>
-        <entityDependency>
-          <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>ProductLinks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CurrentProductId_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>PRODUCTCODE</name>
-      <title>Product number</title>
-    </entityField>
-    <entityField>
-      <name>targetContext</name>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>insert</name>
-          <fieldType>ACTION</fieldType>
-          <onActionProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
-    <entityConsumer>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>Products</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ExcludedProducts_param</name>
-          <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/products/children/excludedproducts_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>PRODUCTID</name>
-    </entityField>
-    <entityParameter>
-      <name>CurrentProductId_param</name>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/currentproductid_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>SOURCE_ID.value</element>
-        <element>DEST_ID.value</element>
-        <element>QUANTITY.value</element>
-        <element>PRODUCTCODE.value</element>
-        <element>PRODUCTID.value</element>
-        <element>PROD2PRODID.value</element>
-        <element>OPTIONAL.value</element>
-        <element>TAKEPRICE.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Prod2prod_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
+  <title>Parts list</title>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DEST_ID</name>
+      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/documentation.adoc</documentation>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OPTIONAL</name>
+      <title>Optional</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>QUANTITY</name>
+      <title>Quantity</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#</outputFormat>
+      <inputFormat>#</inputFormat>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SOURCE_ID</name>
+      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/documentation.adoc</documentation>
+      <title>Product</title>
+      <consumer>Products</consumer>
+    </entityField>
+    <entityField>
+      <name>TAKEPRICE</name>
+      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/documentation.adoc</documentation>
+      <title>Take price</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ProductId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>PROD2PRODID</name>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>ProductLinks</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>targetContext</targetContextField>
+      <targetIdField>SOURCE_ID</targetIdField>
+      <dependencies>
+        <entityDependency>
+          <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>ProductLinks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CurrentProductId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>PRODUCTCODE</name>
+      <title>Product number</title>
+    </entityField>
+    <entityField>
+      <name>targetContext</name>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionGroup>
+      <name>alter</name>
+      <children>
+        <entityActionField>
+          <name>insert</name>
+          <fieldType>ACTION</fieldType>
+          <onActionProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityConsumer>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>Products</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedProducts_param</name>
+          <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/products/children/excludedproducts_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>PRODUCTID</name>
+    </entityField>
+    <entityParameter>
+      <name>CurrentProductId_param</name>
+      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/currentproductid_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>SOURCE_ID.value</element>
+        <element>DEST_ID.value</element>
+        <element>QUANTITY.value</element>
+        <element>PRODUCTCODE.value</element>
+        <element>PRODUCTID.value</element>
+        <element>PROD2PRODID.value</element>
+        <element>OPTIONAL.value</element>
+        <element>TAKEPRICE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js
index 9aef9e30447606e854cd1aaf3dc5f7308926a1b4..9ab774bcf4868b4a23a6c0ff1b2ea7f55184b8e4 100644
--- a/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js
+++ b/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 
 if (vars.exists("$local.rows") && vars.get("$local.rows"))
 {
-    var selectedRows = JSON.parse(vars.get("$local.rows"));
+    var selectedRows = vars.get("$local.rows");
     
     if (selectedRows.length > 0 && vars.exists("$param.ProductId_param") && vars.getString("$param.ProductId_param"))
     {
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 781175aa736ee99c772c414d19dcf3aefc22c8d7..dedce944fae2fe2cd1893bcc8a336647de19d51c 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,565 +1,556 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Product_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
-  <title>Product</title>
-  <contentTitleProcess>%aditoprj%/entity/Product_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Product_entity/afterUiInit.js</afterUiInit>
-  <iconId>VAADIN:HAMMER</iconId>
-  <titlePlural>Products</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>ADVERTISING</name>
-      <title>Advertising material</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>GROUPCODEID</name>
-      <title>Product group</title>
-      <consumer>KeywordProductGroupcodes</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>MINSTOCK</name>
-      <title>Min. stock</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#0</outputFormat>
-      <inputFormat>#0</inputFormat>
-    </entityField>
-    <entityField>
-      <name>PRODUCTCODE</name>
-      <documentation>%aditoprj%/entity/Product_entity/entityfields/productcode/documentation.adoc</documentation>
-      <title>Product number</title>
-      <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/Product_entity/entityfields/productcode/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>PRODUCTID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/productid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PRODUCTNAME</name>
-      <title>Product name</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>STANDARD</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>Active</title>
-      <contentType>BOOLEAN</contentType>
-      <dropDownProcess>%aditoprj%/entity/Product_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/status/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>UNIT</name>
-      <title>Unit</title>
-      <consumer>KeywordQuantityUnits</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>currentPurchasePrice</name>
-      <title>Curr. purchase price</title>
-      <contentType>TEXT</contentType>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>currentSalesPrice</name>
-      <title>Curr. sales price</title>
-      <contentType>TEXT</contentType>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>WithAttribute</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeKeyId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Productprices</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Productprice_entity</entityName>
-        <fieldName>Productprices</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Stocks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>SINGLE</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Stock_entity</entityName>
-        <fieldName>Stocks</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/image/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Product_entity/entityfields/image/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>StockCounts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <state>READONLY</state>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Stock_entity</entityName>
-        <fieldName>Stocks</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>edd8a3af-d168-4a3b-871d-39db964c700b</name>
-          <entityName>Offeritem_entity</entityName>
-          <fieldName>Products</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>e4ba4c26-a777-4560-ab68-311ffae76e2f</name>
-          <entityName>Orderitem_entity</entityName>
-          <fieldName>Products</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>760f179a-f37e-4bdf-af8f-d8935e86db0f</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Products</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityConsumer>
-      <name>ProductLinks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Prod2prod_entity</entityName>
-        <fieldName>ProductLinks</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/productlinks/children/productid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Developer</title>
-      <consumer>Organisations</consumer>
-      <linkedContext>Organisation</linkedContext>
-      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>MainDocuments</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordProductGroupcodes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordQuantityUnits</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>LANGUAGE</name>
-      <consumer>Languages</consumer>
-      <searchable v="false" />
-      <titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
-      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Languages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>ExcludedProducts_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
-          <entityName>Prod2prod_entity</entityName>
-          <fieldName>Products</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ExcludedProducts_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>USER_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <maximumDbRows v="0" />
-      <fromClauseProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBUpdate>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <onDBDelete>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>67ca4a6c-a613-4ee7-bd9d-6ebc17c43944</name>
-          <tableName>PRODUCT</tableName>
-          <primaryKey>PRODUCTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ADVERTISING.value</name>
-          <recordfield>PRODUCT.ADVERTISING</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODEID.value</name>
-          <recordfield>PRODUCT.GROUPCODEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MINSTOCK.value</name>
-          <recordfield>PRODUCT.MINSTOCK</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCTCODE.value</name>
-          <recordfield>PRODUCT.PRODUCTCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCTID.value</name>
-          <recordfield>PRODUCT.PRODUCTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCTNAME.value</name>
-          <recordfield>PRODUCT.PRODUCTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STANDARD.value</name>
-          <recordfield>PRODUCT.STANDARD</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>PRODUCT.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UNIT.value</name>
-          <recordfield>PRODUCT.UNIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>PRODUCT.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>PRODUCT.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODEID.displayValue</name>
-          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>UNIT.displayValue</name>
-          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.value</name>
-          <recordfield>PRODUCT.LANGUAGE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LANGUAGE.displayValue</name>
-          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>PRODUCT.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <recordfield>PRODUCT.USER_EDIT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>PRODUCT.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <recordfield>PRODUCT.DATE_EDIT</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Product_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
+  <title>Product</title>
+  <contentTitleProcess>%aditoprj%/entity/Product_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Product_entity/afterUiInit.js</afterUiInit>
+  <iconId>VAADIN:HAMMER</iconId>
+  <titlePlural>Products</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>ADVERTISING</name>
+      <title>Advertising material</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/advertising/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>GROUPCODEID</name>
+      <title>Product group</title>
+      <consumer>KeywordProductGroupcodes</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>MINSTOCK</name>
+      <title>Min. stock</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#0</outputFormat>
+      <inputFormat>#0</inputFormat>
+    </entityField>
+    <entityField>
+      <name>PRODUCTCODE</name>
+      <documentation>%aditoprj%/entity/Product_entity/entityfields/productcode/documentation.adoc</documentation>
+      <title>Product number</title>
+      <mandatory v="true" />
+      <onValidation>%aditoprj%/entity/Product_entity/entityfields/productcode/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>PRODUCTID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/productid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRODUCTNAME</name>
+      <title>Product name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>STANDARD</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Active</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Product_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/status/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>UNIT</name>
+      <title>Unit</title>
+      <consumer>KeywordQuantityUnits</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>currentPurchasePrice</name>
+      <title>Curr. purchase price</title>
+      <contentType>TEXT</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>currentSalesPrice</name>
+      <title>Curr. sales price</title>
+      <contentType>TEXT</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Productprices</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Productprice_entity</entityName>
+        <fieldName>Productprices</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Stocks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>SINGLE</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Stock_entity</entityName>
+        <fieldName>Stocks</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/image/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Product_entity/entityfields/image/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>StockCounts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>READONLY</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Stock_entity</entityName>
+        <fieldName>Stocks</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>edd8a3af-d168-4a3b-871d-39db964c700b</name>
+          <entityName>Offeritem_entity</entityName>
+          <fieldName>Products</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e4ba4c26-a777-4560-ab68-311ffae76e2f</name>
+          <entityName>Orderitem_entity</entityName>
+          <fieldName>Products</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>760f179a-f37e-4bdf-af8f-d8935e86db0f</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Products</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityConsumer>
+      <name>ProductLinks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Prod2prod_entity</entityName>
+        <fieldName>ProductLinks</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/productlinks/children/productid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Developer</title>
+      <consumer>Organisations</consumer>
+      <linkedContext>Organisation</linkedContext>
+      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>MainDocuments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordProductGroupcodes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordQuantityUnits</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>LANGUAGE</name>
+      <consumer>Languages</consumer>
+      <searchable v="false" />
+      <titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Languages</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Product_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ExcludedProducts_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
+          <entityName>Prod2prod_entity</entityName>
+          <fieldName>Products</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExcludedProducts_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>USER_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <maximumDbRows v="0" />
+      <fromClauseProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBUpdate>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>67ca4a6c-a613-4ee7-bd9d-6ebc17c43944</name>
+          <tableName>PRODUCT</tableName>
+          <primaryKey>PRODUCTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADVERTISING.value</name>
+          <recordfield>PRODUCT.ADVERTISING</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODEID.value</name>
+          <recordfield>PRODUCT.GROUPCODEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MINSTOCK.value</name>
+          <recordfield>PRODUCT.MINSTOCK</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCTCODE.value</name>
+          <recordfield>PRODUCT.PRODUCTCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCTID.value</name>
+          <recordfield>PRODUCT.PRODUCTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCTNAME.value</name>
+          <recordfield>PRODUCT.PRODUCTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STANDARD.value</name>
+          <recordfield>PRODUCT.STANDARD</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>PRODUCT.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UNIT.value</name>
+          <recordfield>PRODUCT.UNIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>PRODUCT.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>PRODUCT.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODEID.displayValue</name>
+          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>UNIT.displayValue</name>
+          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.value</name>
+          <recordfield>PRODUCT.LANGUAGE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>LANGUAGE.displayValue</name>
+          <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>PRODUCT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>PRODUCT.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>PRODUCT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>PRODUCT.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Product_entity/entityfields/attributes/onValidation.js b/entity/Product_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Product_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
deleted file mode 100644
index 645b2d936511e365614a516e8292c1f34bb3a51f..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Target Group (Zielgruppe)
-result.string("5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
deleted file mode 100644
index 4a5bc0b05c93591807469e2ec88adda2db5cb056..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Manufacturer
-result.string("41b0832f-8de2-4ab5-a6e0-9a793c5f80c3");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b537d2a8f3f250bcf366e2c9a81aa7de5e978e12
--- /dev/null
+++ b/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.organisationType$manufacturer());
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/conditionProcess.js b/entity/Product_entity/recordcontainers/db/conditionProcess.js
index f042f7dfa2aadf6d8e9d56d2f8ac3bcdab3b392e..be16e42ba7592bf31fcac470d3e796d15f80583a 100644
--- a/entity/Product_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Product_entity/recordcontainers/db/conditionProcess.js
@@ -7,7 +7,7 @@ var productCond = SqlCondition.begin()
 
 if (vars.exists("$param.ExcludedProducts_param") && vars.get("$param.ExcludedProducts_param"))
 {
-    var excludedIds = JSON.parse(vars.get("$param.ExcludedProducts_param"));
+    var excludedIds = JSON.parse(vars.getString("$param.ExcludedProducts_param"));
 
     excludedIds.forEach(function(pId) 
     {
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 594bfb932031a3033eb1b278e50b273a7841b923..cd09e9a74c44d926fa6d255288b8e07f2b415841 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,275 +1,275 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Productprice_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
-  <title>Prices</title>
-  <afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>BUYSELL</name>
-      <title>PP/SP</title>
-      <mandatory v="true" />
-      <dropDownProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CURRENCY</name>
-      <title>Currency</title>
-      <consumer>KeywordCurrencies</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>FROMQUANTITY</name>
-      <title>From no. of units</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0</outputFormat>
-      <inputFormat>#,##0</inputFormat>
-      <mandatory v="true" />
-      <state>AUTO</state>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PRICE</name>
-      <title>Price</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <mandatory v="true" />
-      <state>AUTO</state>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PRODUCTPRICEID</name>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PRODUCT_ID</name>
-      <title>Product</title>
-      <consumer>Products</consumer>
-      <linkedContext>Product</linkedContext>
-      <mandatory v="true" />
-      <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Company</title>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>VALID_FROM</name>
-      <title>Valid from</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>VALID_TO</name>
-      <title>Valid until</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_to/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>VAT</name>
-      <title>VAT in %</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/vat/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>PRICELIST</name>
-      <documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
-      <title>Price list</title>
-      <consumer>KeywordPricelists</consumer>
-      <state>AUTO</state>
-      <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
-      <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/onValidation.js</onValidation>
-    </entityField>
-    <entityParameter>
-      <name>ProductId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityProvider>
-      <name>Productprices</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Productprices</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>4efc927f-7441-480c-aaaa-36347e2e60c5</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Pricelists</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>dc9e2360-1769-41ec-b4ec-1a4c67013ef8</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Productprices</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>KeywordCurrencies</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPricelists</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBDelete>%aditoprj%/entity/Productprice_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
-          <tableName>PRODUCTPRICE</tableName>
-          <primaryKey>PRODUCTPRICEID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>BUYSELL.value</name>
-          <recordfield>PRODUCTPRICE.BUYSELL</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CURRENCY.value</name>
-          <recordfield>PRODUCTPRICE.CURRENCY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>FROMQUANTITY.value</name>
-          <recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRICE.value</name>
-          <recordfield>PRODUCTPRICE.PRICE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRICELIST.value</name>
-          <recordfield>PRODUCTPRICE.PRICELIST</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCTPRICEID.value</name>
-          <recordfield>PRODUCTPRICE.PRODUCTPRICEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.value</name>
-          <recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>PRODUCTPRICE.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VALID_FROM.value</name>
-          <recordfield>PRODUCTPRICE.VALID_FROM</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VALID_TO.value</name>
-          <recordfield>PRODUCTPRICE.VALID_TO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VAT.value</name>
-          <recordfield>PRODUCTPRICE.VAT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CURRENCY.displayValue</name>
-          <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Productprice_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
+  <title>Prices</title>
+  <afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>BUYSELL</name>
+      <title>PP/SP</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CURRENCY</name>
+      <title>Currency</title>
+      <consumer>KeywordCurrencies</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>FROMQUANTITY</name>
+      <title>From no. of units</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0</outputFormat>
+      <inputFormat>#,##0</inputFormat>
+      <mandatory v="true" />
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRICE</name>
+      <title>Price</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <mandatory v="true" />
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRODUCTPRICEID</name>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRODUCT_ID</name>
+      <title>Product</title>
+      <consumer>Products</consumer>
+      <linkedContext>Product</linkedContext>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Company</title>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>VALID_FROM</name>
+      <title>Valid from</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>VALID_TO</name>
+      <title>Valid until</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_to/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>VAT</name>
+      <title>VAT in %</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/vat/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>PRICELIST</name>
+      <documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
+      <title>Price list</title>
+      <consumer>KeywordPricelists</consumer>
+      <state>AUTO</state>
+      <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
+      <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/onValidation.js</onValidation>
+    </entityField>
+    <entityParameter>
+      <name>ProductId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityProvider>
+      <name>Productprices</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Productprices</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4efc927f-7441-480c-aaaa-36347e2e60c5</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Pricelists</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>dc9e2360-1769-41ec-b4ec-1a4c67013ef8</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Productprices</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>KeywordCurrencies</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPricelists</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBDelete>%aditoprj%/entity/Productprice_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
+          <tableName>PRODUCTPRICE</tableName>
+          <primaryKey>PRODUCTPRICEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>BUYSELL.value</name>
+          <recordfield>PRODUCTPRICE.BUYSELL</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.value</name>
+          <recordfield>PRODUCTPRICE.CURRENCY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FROMQUANTITY.value</name>
+          <recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRICE.value</name>
+          <recordfield>PRODUCTPRICE.PRICE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRICELIST.value</name>
+          <recordfield>PRODUCTPRICE.PRICELIST</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCTPRICEID.value</name>
+          <recordfield>PRODUCTPRICE.PRODUCTPRICEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.value</name>
+          <recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>PRODUCTPRICE.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VALID_FROM.value</name>
+          <recordfield>PRODUCTPRICE.VALID_FROM</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VALID_TO.value</name>
+          <recordfield>PRODUCTPRICE.VALID_TO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VAT.value</name>
+          <recordfield>PRODUCTPRICE.VAT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.displayValue</name>
+          <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index d14a957d973bb6d2b45fc7ee7ba0df3131c2eebb..4cfefe2689826831c66d1205dd20c1da6d59074a 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,70 +1,70 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectAnalyses_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
-  <title>Salesproject Analyses</title>
-  <iconId>VAADIN:PIE_CHART</iconId>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>SORTING</name>
-      <title>Parent</title>
-    </entityField>
-    <entityField>
-      <name>X_PHASE</name>
-      <title>Phase</title>
-    </entityField>
-    <entityField>
-      <name>Y_COUNT</name>
-      <title>Count</title>
-    </entityField>
-    <entityField>
-      <name>OVERALL_TURNOVER</name>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OVERALL_FORECAST</name>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SENT_OFFERS</name>
-      <title>Sent offers</title>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OPEN_SALESPROJECTS</name>
-      <title>Open salesprojects</title>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>X_PHASE.value</element>
-        <element>Y_COUNT.value</element>
-        <element>SORTING.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectAnalyses_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
+  <title>Salesproject Analyses</title>
+  <iconId>VAADIN:PIE_CHART</iconId>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>SORTING</name>
+      <title>Parent</title>
+    </entityField>
+    <entityField>
+      <name>X_PHASE</name>
+      <title>Phase</title>
+    </entityField>
+    <entityField>
+      <name>Y_COUNT</name>
+      <title>Count</title>
+    </entityField>
+    <entityField>
+      <name>OVERALL_TURNOVER</name>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OVERALL_FORECAST</name>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SENT_OFFERS</name>
+      <title>Sent offers</title>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OPEN_SALESPROJECTS</name>
+      <title>Open salesprojects</title>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>X_PHASE.value</element>
+        <element>Y_COUNT.value</element>
+        <element>SORTING.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
index 07052217b28416a93aac639b7fdb963aab18f30d..4613fbeb79dd7fc9114e322dbdf1bf98b48c87f0 100644
--- a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
+++ b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
@@ -1,85 +1,77 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectClassificationEntry_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>SalesprojectClassificatonEntries</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>a7414022-56d3-4ca0-b15f-33601b655d78</name>
-          <entityName>SalesprojectClassification_entity</entityName>
-          <fieldName>SalesprojectClassificationEntries</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ClassId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ClassId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>UID</name>
-      <title>Uid</title>
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-    </entityField>
-    <entityField>
-      <name>VALUE</name>
-      <title>Value</title>
-      <dropDownProcess>%aditoprj%/entity/SalesprojectClassificationEntry_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>Type</title>
-      <state>INVISIBLE</state>
-    </entityField>
-    <entityField>
-      <name>POINTS</name>
-      <contentType>NUMBER</contentType>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/SalesprojectClassificationEntry_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onUpdate>%aditoprj%/entity/SalesprojectClassificationEntry_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TYPE.value</element>
-        <element>NAME.value</element>
-        <element>VALUE.value</element>
-        <element>POINTS.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectClassificationEntry_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>SalesprojectClassificatonEntries</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>jdito</recordContainer>
+      <children>
+        <entityParameter>
+          <name>ClassId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ClassId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>UID</name>
+      <title>Uid</title>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+      <title>Value</title>
+      <dropDownProcess>%aditoprj%/entity/SalesprojectClassificationEntry_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <state>INVISIBLE</state>
+    </entityField>
+    <entityField>
+      <name>POINTS</name>
+      <contentType>NUMBER</contentType>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/SalesprojectClassificationEntry_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onUpdate>%aditoprj%/entity/SalesprojectClassificationEntry_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TYPE.value</element>
+        <element>NAME.value</element>
+        <element>VALUE.value</element>
+        <element>POINTS.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
deleted file mode 100644
index 378cf5cbeb82a62f5bdab32594787d940701b536..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectClassification_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Classification</title>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>CLASSNAME</name>
-    </entityField>
-    <entityConsumer>
-      <name>SalesprojectClassificationEntries</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectClassificationEntry_entity</entityName>
-        <fieldName>SalesprojectClassificatonEntries</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ClassId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>SalesprojectClassifications</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <titlePlural>Classification</titlePlural>
-      <recordContainer>jdito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>a56beadb-61a5-4065-a64a-f9f136dd4996</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectClassifications</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>POINTS</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>CLASSNAME.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/SalesprojectClassification_entity/contentProcess.js b/entity/SalesprojectClassification_entity/contentProcess.js
deleted file mode 100644
index bb0a011684fcc7b40aefaaac225bd985aa83c0ec..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/contentProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-var keyword = LegacyKeywordUtils.createKeyword("SALESPROJECT.CLASS");
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
-    var idValues = vars.get("$local.idvalues");
-    
-    if (idValues.length > 0) {
-        keyword.filter(function(id) {
-            return id == idValues[0];
-        });
-    }
-}
-result.object(keyword.toArray(["id", "name"]));
-
-
-//TODO correct db if kewords changed
diff --git a/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js b/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js
deleted file mode 100644
index 5b74382810fde5dda8a728acd2e9c6ce0b1709bf..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/entityfields/points/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// TODO: load from Entry. Currently this is not possible.
-result.object(50); // return dummy value
\ No newline at end of file
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js b/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index 098d87cfa55579898b8da11975f3fb345672247f..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file
diff --git a/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index bb0a011684fcc7b40aefaaac225bd985aa83c0ec..0000000000000000000000000000000000000000
--- a/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-var keyword = LegacyKeywordUtils.createKeyword("SALESPROJECT.CLASS");
-
-if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
-    var idValues = vars.get("$local.idvalues");
-    
-    if (idValues.length > 0) {
-        keyword.filter(function(id) {
-            return id == idValues[0];
-        });
-    }
-}
-result.object(keyword.toArray(["id", "name"]));
-
-
-//TODO correct db if kewords changed
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 2d8448c99a72f2801c09efe300a352b088ced8b3..d51e6a29bff24ff3e3a028853d79589d1458e671 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -1,350 +1,346 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectCompetition_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Competition</title>
-  <titlePlural>Competitors</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DATE_CANCELLED</name>
-      <title>Excreted</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Info</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>REASON</name>
-      <title>Reason</title>
-      <consumer>KeywordWonLost</consumer>
-      <selectionMode>SINGLE</selectionMode>
-      <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_COMPETITIONID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesproject_competitionid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>State</title>
-      <consumer>KeywordStates</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>SalesprojectCompetitions</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>c6884f8d-283b-4338-830f-b20dda9b8aa5</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectCompetitions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Company</title>
-      <consumer>Organisations</consumer>
-      <linkedContext>Organisation</linkedContext>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>ORGANISATION_NAME</name>
-      <state>READONLY</state>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>ORG_ORGID</name>
-      <state>AUTO</state>
-    </entityField>
-    <entityConsumer>
-      <name>Organisation</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/ContactId_param/valueProcess.js</valueProcess>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>WithAttribute</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AttributeKeyId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordWonLost</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>PHASE</name>
-      <title>Phase</title>
-      <consumer>KeywordPhases</consumer>
-      <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordPricePolitics</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordWeaknesses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordStrenghts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPhases</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <state>DISABLED</state>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>DisplaySimpleName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>FilteredAttributes_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>d34f0a49-d8c1-4024-84ef-fdd1a7acd326</name>
-          <tableName>SALESPROJECT_COMPETITION</tableName>
-          <primaryKey>SALESPROJECT_COMPETITIONID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>c1f6867a-e913-4f3f-a0b8-ea0a44f71d3c</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE_CANCELLED.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.DATE_CANCELLED</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORG_ORGID.value</name>
-          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REASON.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.REASON</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_COMPETITIONID.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.SALESPROJECT_COMPETITIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.displayValue</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REASON.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PHASE.value</name>
-          <recordfield>SALESPROJECT_COMPETITION.PHASE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PHASE.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectCompetition_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Competition</title>
+  <titlePlural>Competitors</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DATE_CANCELLED</name>
+      <title>Excreted</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Info</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>REASON</name>
+      <title>Reason</title>
+      <consumer>KeywordWonLost</consumer>
+      <selectionMode>SINGLE</selectionMode>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_COMPETITIONID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesproject_competitionid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>State</title>
+      <consumer>KeywordStates</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>SalesprojectCompetitions</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>c6884f8d-283b-4338-830f-b20dda9b8aa5</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectCompetitions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Company</title>
+      <consumer>Organisations</consumer>
+      <linkedContext>Organisation</linkedContext>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_NAME</name>
+      <state>READONLY</state>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>ORG_ORGID</name>
+      <state>AUTO</state>
+    </entityField>
+    <entityConsumer>
+      <name>Organisation</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/ContactId_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordWonLost</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>PHASE</name>
+      <title>Phase</title>
+      <consumer>KeywordPhases</consumer>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordPricePolitics</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordWeaknesses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStrenghts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPhases</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <state>DISABLED</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>FilteredAttributes_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>d34f0a49-d8c1-4024-84ef-fdd1a7acd326</name>
+          <tableName>SALESPROJECT_COMPETITION</tableName>
+          <primaryKey>SALESPROJECT_COMPETITIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>c1f6867a-e913-4f3f-a0b8-ea0a44f71d3c</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_CANCELLED.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.DATE_CANCELLED</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORG_ORGID.value</name>
+          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REASON.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.REASON</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_COMPETITIONID.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.SALESPROJECT_COMPETITIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REASON.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.value</name>
+          <recordfield>SALESPROJECT_COMPETITION.PHASE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
deleted file mode 100644
index 645b2d936511e365614a516e8292c1f34bb3a51f..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Target Group (Zielgruppe)
-result.string("5d1a2b05-f04e-4ad7-9fd0-8efa09a33a53");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
deleted file mode 100644
index ca41e6e2608d46ef8e47125ee72c25b51d271bd8..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-// Competitor
-result.string("fc09afd5-5f74-4e48-af26-3600bb4c9610");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..47b950fc1ae42270522a57fb9feab4355ec2f8e6
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.organisationType$competitor());
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 28de92474c3e28b729a09beccc36f5c07455d7da..84a2b3c9710ad29d8a9d5c1c30a8f62c5c646aca 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -1,139 +1,139 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectForecast_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>${FORECAST_ENGLISH}</title>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DATE_START</name>
-      <title>Planned</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/date_start/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>GROUPCODE</name>
-      <title>Commodity group</title>
-      <consumer>KeywordProductGroupcodes</consumer>
-      <displayValueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Info</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_FORECASTID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/salesproject_forecastid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-    </entityField>
-    <entityField>
-      <name>VOLUME</name>
-      <titleProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js</titleProcess>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>SalesprojectForecasts</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>a3d7f5e9-465c-4ded-9220-3569b63925ab</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectForecasts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>KeywordProductGroupcodes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>29b759fb-1d0a-4262-b6af-0da5f3985eb3</name>
-          <tableName>SALESPROJECT_FORECAST</tableName>
-          <primaryKey>SALESPROJECT_FORECASTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE_START.value</name>
-          <recordfield>SALESPROJECT_FORECAST.DATE_START</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODE.value</name>
-          <recordfield>SALESPROJECT_FORECAST.GROUPCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>SALESPROJECT_FORECAST.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_FORECASTID.value</name>
-          <recordfield>SALESPROJECT_FORECAST.SALESPROJECT_FORECASTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>SALESPROJECT_FORECAST.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>SALESPROJECT_FORECAST.TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VOLUME.value</name>
-          <recordfield>SALESPROJECT_FORECAST.VOLUME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>GROUPCODE.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectForecast_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>${FORECAST_ENGLISH}</title>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DATE_START</name>
+      <title>Planned</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/date_start/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>GROUPCODE</name>
+      <title>Commodity group</title>
+      <consumer>KeywordProductGroupcodes</consumer>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Info</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_FORECASTID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/salesproject_forecastid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+    </entityField>
+    <entityField>
+      <name>VOLUME</name>
+      <titleProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js</titleProcess>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>SalesprojectForecasts</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>a3d7f5e9-465c-4ded-9220-3569b63925ab</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectForecasts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>KeywordProductGroupcodes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>29b759fb-1d0a-4262-b6af-0da5f3985eb3</name>
+          <tableName>SALESPROJECT_FORECAST</tableName>
+          <primaryKey>SALESPROJECT_FORECASTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_START.value</name>
+          <recordfield>SALESPROJECT_FORECAST.DATE_START</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODE.value</name>
+          <recordfield>SALESPROJECT_FORECAST.GROUPCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>SALESPROJECT_FORECAST.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_FORECASTID.value</name>
+          <recordfield>SALESPROJECT_FORECAST.SALESPROJECT_FORECASTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>SALESPROJECT_FORECAST.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>SALESPROJECT_FORECAST.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VOLUME.value</name>
+          <recordfield>SALESPROJECT_FORECAST.VOLUME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODE.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 4c38bd8ea36e97e23ff21fb5597df02345d57728..bea324220a61336f1e57d6d958d542cb5709e6d7 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -1,298 +1,298 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectMember_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>${SALESPROJECT_MEMBER}</title>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Person</title>
-      <consumer>Contacts</consumer>
-      <linkedContext>Person</linkedContext>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_MEMBERID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_memberid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ROLE</name>
-      <title>Role</title>
-      <consumer>KeywordMemberRoles</consumer>
-      <displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityProvider>
-      <name>SalesprojectMembers</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>TARGETCONTEXT</targetContextField>
-      <targetIdField>CONTACT_ID</targetIdField>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>c33d46e7-a7be-4548-a036-0ac58888504c</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectMembers</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>ORGANISATION_NAME</name>
-      <title>Company</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>ORG_ORGID</name>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>PERSON_FIRSTNAME</name>
-      <title>Firstname</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>PERSON_LASTNAME</name>
-      <title>Lastname</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>PERSON_PERSID</name>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>PERSON_SALUTATION</name>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>PERSON_TITLE</name>
-      <title>title</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityConsumer>
-      <name>CurrentContact</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>Contact</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>PERSON_FULL_NAME</name>
-      <title>Name</title>
-      <consumer>CurrentContact</consumer>
-      <linkedContext>Person</linkedContext>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>RELATIONSHIP</name>
-      <title>Relationship</title>
-      <description>Overrules CONTACT_RELATIONSHIP
-
-TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus contact angezeigt</description>
-      <contentType>NUMBER</contentType>
-      <displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>CONTACT_RELATIONSHIP</name>
-      <title>Relationship</title>
-      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
-      <contentType>NUMBER</contentType>
-    </entityField>
-    <entityConsumer>
-      <name>Contacts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>Contacts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ExcludedContactIds_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordMemberRoles</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>TARGETCONTEXT</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACTROLE</name>
-      <title>Function</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>DEPARTMENT</name>
-      <title>Department</title>
-      <state>READONLY</state>
-    </entityField>
-    <entityField>
-      <name>POSITION</name>
-      <title>Position</title>
-      <state>READONLY</state>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>642ee877-9b75-42df-ade2-40f65f8a9ee5</name>
-          <tableName>SALESPROJECT_MEMBER</tableName>
-          <primaryKey>SALESPROJECT_MEMBERID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>d158535e-ce3a-4660-91c7-d0ec8a7cbafc</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>d794504f-52b7-4da0-abbe-ea3f6eabe996</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>6b4e762c-8316-47d2-8ff0-67d8b1ff58bd</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ORGANISATION_NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORG_ORGID.value</name>
-          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_FIRSTNAME.value</name>
-          <recordfield>PERSON.FIRSTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_LASTNAME.value</name>
-          <recordfield>PERSON.LASTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_PERSID.value</name>
-          <recordfield>PERSON.PERSONID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_SALUTATION.value</name>
-          <recordfield>PERSON.SALUTATION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_TITLE.value</name>
-          <recordfield>PERSON.TITLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>SALESPROJECT_MEMBER.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>SALESPROJECT_MEMBER.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_MEMBERID.value</name>
-          <recordfield>SALESPROJECT_MEMBER.SALESPROJECT_MEMBERID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ROLE.value</name>
-          <recordfield>SALESPROJECT_MEMBER.SALESPROJECT_ROLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RELATIONSHIP.value</name>
-          <recordfield>SALESPROJECT_MEMBER.RELATIONSHIP</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_RELATIONSHIP.value</name>
-          <recordfield>CONTACT.RELATIONSHIP</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ROLE.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DEPARTMENT.value</name>
-          <recordfield>CONTACT.DEPARTMENT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACTROLE.value</name>
-          <recordfield>CONTACT.CONTACTROLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>POSITION.value</name>
-          <recordfield>CONTACT.POSITION</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectMember_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>${SALESPROJECT_MEMBER}</title>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Person</title>
+      <consumer>Contacts</consumer>
+      <linkedContext>Person</linkedContext>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_MEMBERID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_memberid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ROLE</name>
+      <title>Role</title>
+      <consumer>KeywordMemberRoles</consumer>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>SalesprojectMembers</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TARGETCONTEXT</targetContextField>
+      <targetIdField>CONTACT_ID</targetIdField>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>c33d46e7-a7be-4548-a036-0ac58888504c</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectMembers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>ORGANISATION_NAME</name>
+      <title>Company</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>ORG_ORGID</name>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>PERSON_FIRSTNAME</name>
+      <title>Firstname</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>PERSON_LASTNAME</name>
+      <title>Lastname</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>PERSON_PERSID</name>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>PERSON_SALUTATION</name>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>PERSON_TITLE</name>
+      <title>title</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityConsumer>
+      <name>CurrentContact</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contact</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>PERSON_FULL_NAME</name>
+      <title>Name</title>
+      <consumer>CurrentContact</consumer>
+      <linkedContext>Person</linkedContext>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>RELATIONSHIP</name>
+      <title>Relationship</title>
+      <description>Overrules CONTACT_RELATIONSHIP
+
+TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus contact angezeigt</description>
+      <contentType>NUMBER</contentType>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>CONTACT_RELATIONSHIP</name>
+      <title>Relationship</title>
+      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityConsumer>
+      <name>Contacts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contacts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordMemberRoles</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>TARGETCONTEXT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACTROLE</name>
+      <title>Function</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>DEPARTMENT</name>
+      <title>Department</title>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>POSITION</name>
+      <title>Position</title>
+      <state>READONLY</state>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>642ee877-9b75-42df-ade2-40f65f8a9ee5</name>
+          <tableName>SALESPROJECT_MEMBER</tableName>
+          <primaryKey>SALESPROJECT_MEMBERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>d158535e-ce3a-4660-91c7-d0ec8a7cbafc</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>d794504f-52b7-4da0-abbe-ea3f6eabe996</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>6b4e762c-8316-47d2-8ff0-67d8b1ff58bd</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORG_ORGID.value</name>
+          <recordfield>ORGANISATION.ORGANISATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_FIRSTNAME.value</name>
+          <recordfield>PERSON.FIRSTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_LASTNAME.value</name>
+          <recordfield>PERSON.LASTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_PERSID.value</name>
+          <recordfield>PERSON.PERSONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_SALUTATION.value</name>
+          <recordfield>PERSON.SALUTATION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_TITLE.value</name>
+          <recordfield>PERSON.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>SALESPROJECT_MEMBER.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>SALESPROJECT_MEMBER.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_MEMBERID.value</name>
+          <recordfield>SALESPROJECT_MEMBER.SALESPROJECT_MEMBERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ROLE.value</name>
+          <recordfield>SALESPROJECT_MEMBER.SALESPROJECT_ROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RELATIONSHIP.value</name>
+          <recordfield>SALESPROJECT_MEMBER.RELATIONSHIP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_RELATIONSHIP.value</name>
+          <recordfield>CONTACT.RELATIONSHIP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ROLE.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+          <recordfield>CONTACT.DEPARTMENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTROLE.value</name>
+          <recordfield>CONTACT.CONTACTROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>POSITION.value</name>
+          <recordfield>CONTACT.POSITION</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 68fbbe37233ad49e3b2dc87b5c5fa7d22d6c1722..33e3032cbbe0ac0a185350174309debb777ac602 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,189 +1,189 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectMilestone_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title></title>
-  <contentTitleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/contentTitleProcess.js</contentTitleProcess>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>DATE_END</name>
-      <title>End date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <searchable v="true" />
-    </entityField>
-    <entityField>
-      <name>DATE_START</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_MILESTONEID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>Type</title>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>VALUE</name>
-      <consumer>Keywords</consumer>
-      <mandatory v="true" />
-      <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js</titleProcess>
-      <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>SalesprojectMilestones</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>Type_param</name>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>DaysCount</name>
-      <title>Days count</title>
-      <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/dayscount/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PARENT</name>
-    </entityField>
-    <entityConsumer>
-      <name>Keywords</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>Type_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>StateMilestones</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>da87708b-e998-4694-81ae-d0068f789a89</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectStateMilestones</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>Type_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityProvider>
-      <name>PhaseMilestones</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectPhaseMilestones</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>Type_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <title></title>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBUpdate>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <linkInformation>
-        <linkInformation>
-          <name>464f1fd7-e5b6-4cfc-92f8-4873d4e10ce3</name>
-          <tableName>SALESPROJECT_MILESTONE</tableName>
-          <primaryKey>SALESPROJECT_MILESTONEID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE_END.value</name>
-          <recordfield>SALESPROJECT_MILESTONE.DATE_END</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_START.value</name>
-          <recordfield>SALESPROJECT_MILESTONE.DATE_START</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_MILESTONEID.value</name>
-          <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>SALESPROJECT_MILESTONE.TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VALUE.value</name>
-          <recordfield>SALESPROJECT_MILESTONE.VALUE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PARENT.value</name>
-          <expression>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/recordfieldmappings/parent.value/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectMilestone_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title></title>
+  <contentTitleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/contentTitleProcess.js</contentTitleProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DATE_END</name>
+      <title>End date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <searchable v="true" />
+    </entityField>
+    <entityField>
+      <name>DATE_START</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_MILESTONEID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+      <consumer>Keywords</consumer>
+      <mandatory v="true" />
+      <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>SalesprojectMilestones</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>Type_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>DaysCount</name>
+      <title>Days count</title>
+      <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/dayscount/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+    </entityField>
+    <entityConsumer>
+      <name>Keywords</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>Type_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>StateMilestones</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>da87708b-e998-4694-81ae-d0068f789a89</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectStateMilestones</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Type_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityProvider>
+      <name>PhaseMilestones</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectPhaseMilestones</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>Type_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <title></title>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBUpdate>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <linkInformation>
+        <linkInformation>
+          <name>464f1fd7-e5b6-4cfc-92f8-4873d4e10ce3</name>
+          <tableName>SALESPROJECT_MILESTONE</tableName>
+          <primaryKey>SALESPROJECT_MILESTONEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_END.value</name>
+          <recordfield>SALESPROJECT_MILESTONE.DATE_END</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_START.value</name>
+          <recordfield>SALESPROJECT_MILESTONE.DATE_START</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_MILESTONEID.value</name>
+          <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>SALESPROJECT_MILESTONE.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VALUE.value</name>
+          <recordfield>SALESPROJECT_MILESTONE.VALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT.value</name>
+          <expression>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/recordfieldmappings/parent.value/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index a0a49415a9352676be23d15bd1afe2a1ede03485..e2530c573e6a435337cccd2ec758115859745b96 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,127 +1,127 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalesprojectSource_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Touchpoint</title>
-  <titlePlural>Touchpoints</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>SalesprojectSouces</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>c1628437-2813-464f-b91c-71b1c6bb63a4</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>SalesprojectSources</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>ENTRYDATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Info</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_ID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECT_SOURCEID</name>
-      <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>SOURCE</name>
-      <title>Touchpoint</title>
-      <consumer>KeywordSources</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordSources</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>cbe646de-9bc8-4008-8a2f-41fa5728d85e</name>
-          <tableName>SALESPROJECT_SOURCE</tableName>
-          <primaryKey>SALESPROJECT_SOURCEID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ENTRYDATE.value</name>
-          <recordfield>SALESPROJECT_SOURCE.ENTRYDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_ID.value</name>
-          <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECT_SOURCEID.value</name>
-          <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_SOURCEID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SOURCE.value</name>
-          <recordfield>SALESPROJECT_SOURCE.SOURCE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SOURCE.displayValue</name>
-          <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalesprojectSource_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Touchpoint</title>
+  <titlePlural>Touchpoints</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>SalesprojectSouces</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>c1628437-2813-464f-b91c-71b1c6bb63a4</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectSources</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>SalesprojectId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>ENTRYDATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Info</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_ID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECT_SOURCEID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>SOURCE</name>
+      <title>Touchpoint</title>
+      <consumer>KeywordSources</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordSources</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>cbe646de-9bc8-4008-8a2f-41fa5728d85e</name>
+          <tableName>SALESPROJECT_SOURCE</tableName>
+          <primaryKey>SALESPROJECT_SOURCEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ENTRYDATE.value</name>
+          <recordfield>SALESPROJECT_SOURCE.ENTRYDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ID.value</name>
+          <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_SOURCEID.value</name>
+          <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_SOURCEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SOURCE.value</name>
+          <recordfield>SALESPROJECT_SOURCE.SOURCE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SOURCE.displayValue</name>
+          <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 32daef8da67b83896e9b672e94695ae06f8849b6..91259a51f6f8838e54c3a7a7f2d2cde1a98d0084 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,710 +1,724 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Salesproject_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Salesproject</title>
-  <contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
-  <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
-  <iconId>VAADIN:BOOK_DOLLAR</iconId>
-  <titlePlural>Salesprojects</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <dependencies>
-        <entityDependency>
-          <name>497657f7-ebd7-4c9c-b8ab-da447a1556e5</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Salesprojects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>f010781d-453d-4df3-b330-75c1336e4d4c</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Salesprojects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>ENDDATE</name>
-      <title>Rollout</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Information</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>PHASE</name>
-      <title>Phase</title>
-      <consumer>KeywordPhases</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>PROJECTCODE</name>
-      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/documentation.adoc</documentation>
-      <title>Project number</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>PROJECTTITLE</name>
-      <title>Project title</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Company</title>
-      <consumer>Organisations</consumer>
-      <linkedContext>Organisation</linkedContext>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>SALESPROJECTID</name>
-      <searchable v="false" />
-      <state>AUTO</state>
-    </entityField>
-    <entityField>
-      <name>STARTDATE</name>
-      <title>Project start</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startdate/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/startdate/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>STATE</name>
-      <title>Status</title>
-      <consumer>KeywordStates</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/state/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>VOLUME</name>
-      <title>Volume</title>
-      <description>The displayValue from the recoord container adds T € (translated)</description>
-      <contentType>NUMBER</contentType>
-      <outputFormat>0</outputFormat>
-      <inputFormat>0</inputFormat>
-      <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/titleProcess.js</titleProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Organisations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>Organisations</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityField>
-      <name>PROBABILITY</name>
-      <title>Probability</title>
-      <consumer>KeywordProbabilties</consumer>
-      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>SalesprojectSources</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectSource_entity</entityName>
-        <fieldName>SalesprojectSouces</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>SalesprojectPhaseMilestones</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectMilestone_entity</entityName>
-        <fieldName>PhaseMilestones</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>SalesprojectForecasts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectForecast_entity</entityName>
-        <fieldName>SalesprojectForecasts</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>SalesprojectCompetitions</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectCompetition_entity</entityName>
-        <fieldName>SalesprojectCompetitions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>SalesprojectOffers</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offer_entity</entityName>
-        <fieldName>SalesprojectOffers</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Activities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>SalesprojectMembers</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectMember_entity</entityName>
-        <fieldName>SalesprojectMembers</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>SalesprojectClassifications</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectClassification_entity</entityName>
-        <fieldName>SalesprojectClassifications</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newOffer</name>
-      <fieldType>ACTION</fieldType>
-      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
-      <title>New offer</title>
-      <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
-      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CART</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Timetrackings</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Timetracking_entity</entityName>
-        <fieldName>Timetrackings</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/objectid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>ObjectRelations</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-    </entityConsumer>
-    <entityField>
-      <name>TIMETRACKINGSUM</name>
-      <title>Time expenses</title>
-      <description>the total hours of all time trackings related to the salesproject</description>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>MainDocuments</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newTimetracking</name>
-      <fieldType>ACTION</fieldType>
-      <title>New time tracking</title>
-      <description>Opens the time tracking context in new-mode for the selected salesproject</description>
-      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:STOPWATCH</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>KeywordProbabilties</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <title></title>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPhases</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityField>
-      <name>InactiveTime</name>
-      <title>Days inactive</title>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordWonLost</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <selectionMode>MULTI</selectionMode>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>REASONS</name>
-      <title>Reason</title>
-      <mandatoryProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js</mandatoryProcess>
-      <dropDownProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/dropDownProcess.js</dropDownProcess>
-      <searchable v="true" />
-      <selectionMode>MULTI</selectionMode>
-      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/stateProcess.js</stateProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityProvider>
-      <name>Salesprojects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Salesprojects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>openSalesprojects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Salesprojects</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>State_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>State_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>SalesprojectStateMilestones</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectMilestone_entity</entityName>
-        <fieldName>StateMilestones</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>RemainingTime</name>
-      <title>Days remaining</title>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/remainingtime/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>RunTime</name>
-      <title>Days running</title>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/runtime/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBInsert>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
-      <onDBUpdate>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
-      <onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>02eb2f4c-3b85-409f-ac13-c8b26804da44</name>
-          <tableName>SALESPROJECT</tableName>
-          <primaryKey>SALESPROJECTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>485af2f8-d91d-442f-89c7-c44915dda990</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ENDDATE.value</name>
-          <recordfield>SALESPROJECT.ENDDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>SALESPROJECT.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PHASE.value</name>
-          <recordfield>SALESPROJECT.PHASE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROBABILITY.value</name>
-          <recordfield>SALESPROJECT.PROBABILITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROJECTCODE.value</name>
-          <recordfield>SALESPROJECT.PROJECTCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROJECTTITLE.value</name>
-          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SALESPROJECTID.value</name>
-          <recordfield>SALESPROJECT.SALESPROJECTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STARTDATE.value</name>
-          <recordfield>SALESPROJECT.STARTDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.value</name>
-          <recordfield>SALESPROJECT.STATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>VOLUME.value</name>
-          <recordfield>SALESPROJECT.VOLUME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>SALESPROJECT.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.displayValue</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROBABILITY.displayValue</name>
-          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.displayValue</name>
-          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PHASE.displayValue</name>
-          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REASONS.value</name>
-          <recordfield>SALESPROJECT.REASONS</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Salesproject_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Salesproject</title>
+  <contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/Salesproject_entity/onValidation.js</onValidation>
+  <afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
+  <iconId>VAADIN:BOOK_DOLLAR</iconId>
+  <titlePlural>Salesprojects</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <entityDependency>
+          <name>497657f7-ebd7-4c9c-b8ab-da447a1556e5</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Salesprojects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f010781d-453d-4df3-b330-75c1336e4d4c</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Salesprojects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>ENDDATE</name>
+      <title>Rollout</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Information</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>PHASE</name>
+      <title>Phase</title>
+      <consumer>KeywordPhases</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>PROJECTCODE</name>
+      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/documentation.adoc</documentation>
+      <title>Project number</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/projectcode/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>PROJECTTITLE</name>
+      <title>Project title</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Company</title>
+      <consumer>Organisations</consumer>
+      <linkedContext>Organisation</linkedContext>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SALESPROJECTID</name>
+      <searchable v="false" />
+      <state>AUTO</state>
+    </entityField>
+    <entityField>
+      <name>STARTDATE</name>
+      <title>Project start</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startdate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>Status</title>
+      <consumer>KeywordStates</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/state/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>VOLUME</name>
+      <title>Volume</title>
+      <description>The displayValue from the recoord container adds T € (translated)</description>
+      <contentType>NUMBER</contentType>
+      <outputFormat>0</outputFormat>
+      <inputFormat>0</inputFormat>
+      <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>PROBABILITY</name>
+      <title>Probability</title>
+      <consumer>KeywordProbabilties</consumer>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>SalesprojectSources</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectSource_entity</entityName>
+        <fieldName>SalesprojectSouces</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>SalesprojectPhaseMilestones</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectMilestone_entity</entityName>
+        <fieldName>PhaseMilestones</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>SalesprojectForecasts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectForecast_entity</entityName>
+        <fieldName>SalesprojectForecasts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>SalesprojectCompetitions</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectCompetition_entity</entityName>
+        <fieldName>SalesprojectCompetitions</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>SalesprojectOffers</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>SalesprojectOffers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>SalesprojectMembers</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectMember_entity</entityName>
+        <fieldName>SalesprojectMembers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOffer</name>
+      <fieldType>ACTION</fieldType>
+      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
+      <title>New offer</title>
+      <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
+      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CART</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Timetrackings</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Timetracking_entity</entityName>
+        <fieldName>Timetrackings</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/objectid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>ObjectRelations</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>TIMETRACKINGSUM</name>
+      <title>Time expenses</title>
+      <description>the total hours of all time trackings related to the salesproject</description>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>MainDocuments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newTimetracking</name>
+      <fieldType>ACTION</fieldType>
+      <title>New time tracking</title>
+      <description>Opens the time tracking context in new-mode for the selected salesproject</description>
+      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:STOPWATCH</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>KeywordProbabilties</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPhases</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityField>
+      <name>InactiveTime</name>
+      <title>Days inactive</title>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordWonLost</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>REASONS</name>
+      <title>Reason</title>
+      <mandatoryProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js</mandatoryProcess>
+      <dropDownProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/dropDownProcess.js</dropDownProcess>
+      <searchable v="true" />
+      <selectionMode>MULTI</selectionMode>
+      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/reasons/stateProcess.js</stateProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityProvider>
+      <name>Salesprojects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Salesprojects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>openSalesprojects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Salesprojects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>State_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>State_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>SalesprojectStateMilestones</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectMilestone_entity</entityName>
+        <fieldName>StateMilestones</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Classifications</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Classification_entity</entityName>
+        <fieldName>Classifications</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowid_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ClassificationType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>RemainingTime</name>
+      <title>Days remaining</title>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/remainingtime/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>RunTime</name>
+      <title>Days running</title>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/runtime/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ClassificationResult</name>
+      <title>Classification</title>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <onDBUpdate>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>02eb2f4c-3b85-409f-ac13-c8b26804da44</name>
+          <tableName>SALESPROJECT</tableName>
+          <primaryKey>SALESPROJECTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>485af2f8-d91d-442f-89c7-c44915dda990</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ENDDATE.value</name>
+          <recordfield>SALESPROJECT.ENDDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>SALESPROJECT.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.value</name>
+          <recordfield>SALESPROJECT.PHASE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROBABILITY.value</name>
+          <recordfield>SALESPROJECT.PROBABILITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROJECTCODE.value</name>
+          <recordfield>SALESPROJECT.PROJECTCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROJECTTITLE.value</name>
+          <recordfield>SALESPROJECT.PROJECTTITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECTID.value</name>
+          <recordfield>SALESPROJECT.SALESPROJECTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STARTDATE.value</name>
+          <recordfield>SALESPROJECT.STARTDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <recordfield>SALESPROJECT.STATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VOLUME.value</name>
+          <recordfield>SALESPROJECT.VOLUME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>SALESPROJECT.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROBABILITY.displayValue</name>
+          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.displayValue</name>
+          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.displayValue</name>
+          <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REASONS.value</name>
+          <recordfield>SALESPROJECT.REASONS</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Salesproject_entity/afterOperatingState.js b/entity/Salesproject_entity/afterOperatingState.js
index fb90fb67eb08a580d37ed8302a987d8e56df034c..e93da299eeb50537fa1fa0d5c1ad736528772b82 100644
--- a/entity/Salesproject_entity/afterOperatingState.js
+++ b/entity/Salesproject_entity/afterOperatingState.js
@@ -1,6 +1,8 @@
 import("system.vars");
 import("system.neon");
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW) 
-{
-    neon.refresh();
-}
\ No newline at end of file
+
+//TODO: error on save, why should be  a refresh necessary
+//if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW) 
+//{
+//    neon.refresh();
+//}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/attributes/onValidation.js b/entity/Salesproject_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca9cf00a30589c25dcb79bc116cdef263f6b526c
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/attributes/onValidation.js
@@ -0,0 +1,6 @@
+import("Context_lib");
+import("system.vars");
+import("Attribute_lib");
+import("system.result");
+
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aa00d635b63e157cb00b3861bf412fc79b426e16
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
@@ -0,0 +1,7 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("Classification_lib")
+import("Context_lib")
+
+result.string(ClassificationUtils.getClass($KeywordRegistry.classificationType$salesproject(), ContextUtils.getCurrentContextId(), vars.get("$sys.uid")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7915763a4b4a052218cd5ac386eae20fa55a6ef5
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.classificationType$salesproject());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..533f8ec837ea2f9b588ddf05545ac47cdda23d18
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classifications/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/classifications/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/enddate/onValidation.js b/entity/Salesproject_entity/entityfields/enddate/onValidation.js
deleted file mode 100644
index b0d366439e1675011f3f46479831feea4338f133..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/enddate/onValidation.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Entity_lib");
-
-var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ENDDATE"));
-
-if (DateUtils.validateBeginnBeforeEnd(vars.get("$field.STARTDATE"), cEnd) === false)
-    result.string(DateUtils.getValidationFailString());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/enddate/valueProcess.js b/entity/Salesproject_entity/entityfields/enddate/valueProcess.js
index 7dc9d7054adde5e1a16d29b1090f4f52e4e273bb..4cfebdb8acb8403994a4c535f0319cca81bd7017 100644
--- a/entity/Salesproject_entity/entityfields/enddate/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/enddate/valueProcess.js
@@ -1,11 +1,9 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Date_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
-{
-    result.string(DateUtils.getDateIncrementedByYears(DateUtils.getTodayUTC(), 1));
-}
-else
-    result.string(vars.get("$this.value"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Date_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    result.string(DateUtils.getDateIncrementedByYears(DateUtils.getTodayUTC(), 1));
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a19da02962159545a287ddc773e7320d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/startdate/onValidation.js b/entity/Salesproject_entity/entityfields/startdate/onValidation.js
deleted file mode 100644
index b0a33138854ec850d53dffde982d4970dfd55af2..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/startdate/onValidation.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Entity_lib");
-
-var cStart = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.STARTDATE"));
-
-if (DateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.ENDDATE")) === false)
-    result.string(DateUtils.getValidationFailString());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/startdate/valueProcess.js b/entity/Salesproject_entity/entityfields/startdate/valueProcess.js
index ca8dba6244410a798f6b9b014cec006703259d9a..e4ef3a804fc5b107cf7312e8133b2ee149882fdd 100644
--- a/entity/Salesproject_entity/entityfields/startdate/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/startdate/valueProcess.js
@@ -1,11 +1,9 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Date_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
-{
-    result.string(DateUtils.getTodayUTC());
-}
-else
-    result.string(vars.get("$this.value"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Date_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    result.string(DateUtils.getTodayUTC());
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
index abb032b5aee7f5975d2638190fb6f782adc4e219..9836e0f1a934f72506ef3e4bbb4c513c7441ee6e 100644
--- a/entity/Salesproject_entity/entityfields/state/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -1,6 +1,7 @@
+import("system.logging");
 import("system.neon");
 import("system.vars");
 import("system.result");
-
+logging.log(vars.get("$field.STARTDATE"))
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
     result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712"); //Open
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/titleProcess.js b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
index 1a6ace2c3d8c008ae506a1c6b9f615e6d945777a..2c5d74cb558030ed298322cba971cba3dbfdd032 100644
--- a/entity/Salesproject_entity/entityfields/volume/titleProcess.js
+++ b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("system.translate");
 
-result.string(translate.text("Volume") + " (" + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
+result.string(translate.text("Volume") + " (" + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/onValidation.js b/entity/Salesproject_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..de8d3eaf90926cec053f92d16e35d4b8d5fd9fab
--- /dev/null
+++ b/entity/Salesproject_entity/onValidation.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Date_lib");
+import("system.vars");
+
+var startDate = vars.get("$field.STARTDATE");
+var endDate = vars.get("$field.ENDDATE");
+
+if (DateUtils.validateBeginnBeforeEnd(startDate, endDate) === false)
+    result.string(DateUtils.getValidationFailString());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index 65d94ab76dadcf8189255ca1a84187d9132b9f1f..63f1823605ffbd72027c574e96024582fd2dc7fb 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -1,6 +1,7 @@
 import("system.db");
 import("system.vars");
 import("Sql_lib");
+import("Context_lib");
 
 var currentId = vars.getString("$field.SALESPROJECTID");
 
@@ -8,7 +9,6 @@ if (currentId)
 {
     var toDelete = [
         "SALESPROJECT_COMPETITION",
-        "SALESPROJECT_CLASSIFICATION",
         "SALESPROJECT_MILESTONE",
         "SALESPROJECT_FORECAST",
         "SALESPROJECT_MEMBER",
@@ -20,6 +20,9 @@ if (currentId)
         return [pTable, SqlCondition.equals(pTable + ".SALESPROJECT_ID", currentId, "1=2")]
     });
     
+    toDelete.push(["CLASSIFICATION", sqlCondition.begin()
+                                                 .andPrepare("CLASSIFICATION.OBJECT_TYPE", ContextUtils.getCurrentContextId())
+                                                 .andPrepare("CLASSIFICATION.OBJECT_ROWID", currentId).build("1=2")])
     db.deletes(toDelete);
     
     // TODO: auch Dokumente, Aktivitäten, Aufgaben, Zeiterfassungen löschen?
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 16715031baec431c7f569ae74fd70c7ee377acf2..069b426c0213d451650e749108b4e5e04eab164d 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,41 +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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalutationDistinct_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
-  <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>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalutationDistinct_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
+  <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/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 142709b6c4663daf6cc9af212cd284a6a2e56877..92c9b8c1062650520cec69fbc661448a77e712bf 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,51 +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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>SalutationTitleDistinct_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
-  <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>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>SalutationTitleDistinct_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
+  <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/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index b0c86b865b42555846264842008de0b811dfff3c..4972a52ffe3e4e15b4b99e2826a9ecb73cba762b 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,35 +1,35 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Social_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Social Media</title>
-  <entityFields>
-    <entityField>
-      <name>TWITTER_TIMELINE</name>
-      <contentType>HTML</contentType>
-      <valueProcess>%aditoprj%/entity/Social_entity/entityfields/twitter_timeline/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>FACEBOOK_TIMELINE</name>
-      <contentType>HTML</contentType>
-      <valueProcess>%aditoprj%/entity/Social_entity/entityfields/facebook_timeline/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>YOUTUBE</name>
-      <contentType>HTML</contentType>
-      <valueProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>Account_param</name>
-      <title>Benutzer</title>
-      <expose v="true" />
-      <description>Benutzer</description>
-    </entityParameter>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-  </entityFields>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Social_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Social Media</title>
+  <entityFields>
+    <entityField>
+      <name>TWITTER_TIMELINE</name>
+      <contentType>HTML</contentType>
+      <valueProcess>%aditoprj%/entity/Social_entity/entityfields/twitter_timeline/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>FACEBOOK_TIMELINE</name>
+      <contentType>HTML</contentType>
+      <valueProcess>%aditoprj%/entity/Social_entity/entityfields/facebook_timeline/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>YOUTUBE</name>
+      <contentType>HTML</contentType>
+      <valueProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>Account_param</name>
+      <title>Benutzer</title>
+      <expose v="true" />
+      <description>Benutzer</description>
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+  </entityFields>
+</entity>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 326a31a55ae9b0031c6d0aa9fd76105cb42a1000..24dfec1025cb9795f70dfcbaccc775ff7fe886f4 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,167 +1,167 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Stock_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
-  <title>Stock</title>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>ENTRYDATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>IN_OUT</name>
-      <title>I / O</title>
-      <contentType>TEXT</contentType>
-      <mandatory v="true" />
-      <dropDownProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/dropDownProcess.js</dropDownProcess>
-    </entityField>
-    <entityField>
-      <name>PRODUCT_ID</name>
-      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/product_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>QUANTITY</name>
-      <title>Quantity</title>
-      <contentType>TEXT</contentType>
-      <outputFormat>#.##0</outputFormat>
-      <inputFormat>#.##0</inputFormat>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>REFNUMBER</name>
-      <title>Reference</title>
-    </entityField>
-    <entityField>
-      <name>STOCKID</name>
-      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>WAREHOUSE</name>
-      <title>Warehouse</title>
-      <consumer>KeywordWarehouses</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityProvider>
-      <name>Stocks</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Stocks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>StockCounts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STOCKCOUNT</name>
-      <title>Stock</title>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockcount/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>ProductId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityConsumer>
-      <name>KeywordWarehouses</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <maximumDbRows v="0" />
-      <conditionProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>d291e552-0b6a-48e1-a830-1558beb5f58e</name>
-          <tableName>STOCK</tableName>
-          <primaryKey>STOCKID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ENTRYDATE.value</name>
-          <recordfield>STOCK.ENTRYDATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>IN_OUT.value</name>
-          <recordfield>STOCK.IN_OUT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.value</name>
-          <recordfield>STOCK.PRODUCT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>QUANTITY.value</name>
-          <recordfield>STOCK.QUANTITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REFNUMBER.value</name>
-          <recordfield>STOCK.REFNUMBER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STOCKID.value</name>
-          <recordfield>STOCK.STOCKID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>WAREHOUSE.value</name>
-          <recordfield>STOCK.WAREHOUSE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>WAREHOUSE.displayValue</name>
-          <expression>%aditoprj%/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Stock_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
+  <title>Stock</title>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>ENTRYDATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IN_OUT</name>
+      <title>I / O</title>
+      <contentType>TEXT</contentType>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>PRODUCT_ID</name>
+      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/product_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>QUANTITY</name>
+      <title>Quantity</title>
+      <contentType>TEXT</contentType>
+      <outputFormat>#.##0</outputFormat>
+      <inputFormat>#.##0</inputFormat>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>REFNUMBER</name>
+      <title>Reference</title>
+    </entityField>
+    <entityField>
+      <name>STOCKID</name>
+      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>WAREHOUSE</name>
+      <title>Warehouse</title>
+      <consumer>KeywordWarehouses</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Stocks</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Stocks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>StockCounts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ProductId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STOCKCOUNT</name>
+      <title>Stock</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockcount/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ProductId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityConsumer>
+      <name>KeywordWarehouses</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <maximumDbRows v="0" />
+      <conditionProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>d291e552-0b6a-48e1-a830-1558beb5f58e</name>
+          <tableName>STOCK</tableName>
+          <primaryKey>STOCKID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ENTRYDATE.value</name>
+          <recordfield>STOCK.ENTRYDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>IN_OUT.value</name>
+          <recordfield>STOCK.IN_OUT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.value</name>
+          <recordfield>STOCK.PRODUCT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>QUANTITY.value</name>
+          <recordfield>STOCK.QUANTITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REFNUMBER.value</name>
+          <recordfield>STOCK.REFNUMBER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STOCKID.value</name>
+          <recordfield>STOCK.STOCKID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>WAREHOUSE.value</name>
+          <recordfield>STOCK.WAREHOUSE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>WAREHOUSE.displayValue</name>
+          <expression>%aditoprj%/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 676f11b86c9e320c78a494c2cf52214f073d2505..b60b318cee9c893803c1bbb19055e66c8494c5c3 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,123 +1,123 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>TaskLink_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Connection</title>
-  <titlePlural>Connections</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>TASKLINKID</name>
-      <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/tasklinkid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TASK_ID</name>
-      <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/task_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>OBJECT_TYPE</name>
-      <title>{$OBJECTLINK_TYPE}</title>
-      <consumer>Contexts</consumer>
-      <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>OBJECT_ROWID</name>
-      <title>{$OBJECTLINK_OBJECT}</title>
-      <consumer>Objects</consumer>
-      <linkedContextProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
-      <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityProvider>
-      <name>Link</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <targetContextField>OBJECT_TYPE</targetContextField>
-      <targetIdField>OBJECT_ROWID</targetIdField>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
-          <entityName>Task_entity</entityName>
-          <fieldName>Links</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>TaskId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>TaskId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Contexts</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>TaskLinkable</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Objects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Object_entity</entityName>
-        <fieldName>AllObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>75141ff0-c6de-4dfd-ad35-6bf2fc931fb9</name>
-          <tableName>TASKLINK</tableName>
-          <primaryKey>TASKLINKID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ROWID.value</name>
-          <recordfield>TASKLINK.OBJECT_ROWID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_TYPE.value</name>
-          <recordfield>TASKLINK.OBJECT_TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TASK_ID.value</name>
-          <recordfield>TASKLINK.TASK_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TASKLINKID.value</name>
-          <recordfield>TASKLINK.TASKLINKID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ROWID.displayValue</name>
-          <expression>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>TaskLink_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Connection</title>
+  <titlePlural>Connections</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>TASKLINKID</name>
+      <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/tasklinkid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TASK_ID</name>
+      <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/task_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <title>{$OBJECTLINK_TYPE}</title>
+      <consumer>Contexts</consumer>
+      <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <title>{$OBJECTLINK_OBJECT}</title>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+      <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Link</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>OBJECT_TYPE</targetContextField>
+      <targetIdField>OBJECT_ROWID</targetIdField>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>Links</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>TaskId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>TaskId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Contexts</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>TaskLinkable</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Objects</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>75141ff0-c6de-4dfd-ad35-6bf2fc931fb9</name>
+          <tableName>TASKLINK</tableName>
+          <primaryKey>TASKLINKID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+          <recordfield>TASKLINK.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>TASKLINK.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TASK_ID.value</name>
+          <recordfield>TASKLINK.TASK_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TASKLINKID.value</name>
+          <recordfield>TASKLINK.TASKLINKID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.displayValue</name>
+          <expression>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index c4404dce8c007bc366fa67e4a1cc75a8fcb81a03..52b6e08f5f900d7c4c516ac246fa59ebad7207b0 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,569 +1,569 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Task_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
-  <title>Task</title>
-  <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
-  <iconId>VAADIN:TASKS</iconId>
-  <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
-  <titlePlural>Tasks</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>CODE</name>
-      <documentation>%aditoprj%/entity/Task_entity/entityfields/code/documentation.adoc</documentation>
-      <title>task number</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>0000000</outputFormat>
-      <inputFormat>0000000</inputFormat>
-      <searchable v="false" />
-      <state>DISABLED</state>
-    </entityField>
-    <entityField>
-      <name>SUBJECT</name>
-      <title>subject</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>STATUS</name>
-      <title>{$TASK_STATUS}</title>
-      <colorProcess>%aditoprj%/entity/Task_entity/entityfields/status/colorProcess.js</colorProcess>
-      <consumer>KeywordStates</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/status/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>PRIORITY</name>
-      <title>priority</title>
-      <consumer>KeywordPriorities</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>REQUESTOR_CONTACT_ID</name>
-      <title>{$TASK_REQUESTOR}</title>
-      <consumer>ContactRequestors</consumer>
-      <linkedContext>Person</linkedContext>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/requestor_contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/requestor_contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>EDITOR_CONTACT_ID</name>
-      <title>{$TASK_EDITOR}</title>
-      <consumer>ContactEditors</consumer>
-      <linkedContext>Person</linkedContext>
-      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>START_DATE</name>
-      <title>Begin</title>
-      <contentType>DATE</contentType>
-      <resolution>MINUTE</resolution>
-      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
-      <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>MATURITY_DATE</name>
-      <title>Maturity</title>
-      <contentType>DATE</contentType>
-      <resolution>MINUTE</resolution>
-      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
-      <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>TYPE</name>
-      <title>type</title>
-      <consumer>KeywordTypes</consumer>
-      <searchable v="false" />
-      <groupable v="false" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityField>
-      <name>PROTECTIONLEVEL</name>
-      <title>Protected</title>
-      <contentType>BOOLEAN</contentType>
-      <contentTypeProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/contentTypeProcess.js</contentTypeProcess>
-      <dropDownProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/dropDownProcess.js</dropDownProcess>
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TASKID</name>
-      <mandatory v="true" />
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/taskid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>ContactEditors</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContactRequestors</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <stateProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordStates</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ModuleTrees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>ModuleTree_entity</entityName>
-        <fieldName>TreeProviders</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ID_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <mandatory v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ContextName_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <mandatory v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>PARENT_CONTEXT</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_context/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>PARENT_ID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>ParentId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ParentContext_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityActionField>
-      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <actionOrder v="1" />
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityParameter>
-      <name>RowId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>ObjectId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordPriorities</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordpriorities/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newOffer</name>
-      <fieldType>ACTION</fieldType>
-      <title>New offer</title>
-      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
-      <actionOrder v="0" />
-      <iconId>VAADIN:CART</iconId>
-    </entityActionField>
-    <entityField>
-      <name>PROGRESS</name>
-      <title>Progress</title>
-      <consumer>KeywordProgress</consumer>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/progress/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/progress/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordProgress</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Links</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>TaskLink_entity</entityName>
-        <fieldName>Link</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>TaskId_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/links/children/taskid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>LinkedObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>dc29832e-15da-4f64-b17a-f1dd978ef47b</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>c6507834-cd91-4202-bdf7-6566f968edb4</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>26b9b221-de02-40ef-a400-d4b5e356da0b</name>
-          <entityName>Offer_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>b2bb448a-b647-40c8-baec-16356f3e23f5</name>
-          <entityName>Order_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>a93f1e7e-f929-438f-8f37-21e4af8b53b6</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>2b0c15eb-fa9a-4ee8-a8b1-5d0f344ddad6</name>
-          <entityName>Contract_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>335e31ad-ab67-4567-b4ea-3668f04922b2</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>fbaa2f6c-0ba1-4c93-acae-d7b636581679</name>
-          <entityName>CampaignStep_entity</entityName>
-          <fieldName>Tasks</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ParentId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ParentContext_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>PresetLinks_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Task_entity/entityfields/presetlinks_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>SUBJECT_DETAILS</name>
-      <title>subject</title>
-      <linkedContext>Task</linkedContext>
-    </entityField>
-    <entityParameter>
-      <name>FilterOnlyOwnTask_param</name>
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/filteronlyowntask_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>PRIORITY_ICON</name>
-      <colorProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/colorProcess.js</colorProcess>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>LogHistories</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBDelete>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <linkInformation>
-        <linkInformation>
-          <name>47e1b4a5-6901-48b0-85ba-bec39b86a2d7</name>
-          <tableName>TASK</tableName>
-          <primaryKey>TASKID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CODE.value</name>
-          <recordfield>TASK.CODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DESCRIPTION.value</name>
-          <recordfield>TASK.DESCRIPTION</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>EDITOR_CONTACT_ID.value</name>
-          <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MATURITY_DATE.value</name>
-          <recordfield>TASK.MATURITY_DATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRIORITY.value</name>
-          <recordfield>TASK.PRIORITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROTECTIONLEVEL.value</name>
-          <recordfield>TASK.PROTECTIONLEVEL</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REQUESTOR_CONTACT_ID.value</name>
-          <recordfield>TASK.REQUESTOR_CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>START_DATE.value</name>
-          <recordfield>TASK.START_DATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.value</name>
-          <recordfield>TASK.STATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SUBJECT.value</name>
-          <recordfield>TASK.SUBJECT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TASKID.value</name>
-          <recordfield>TASK.TASKID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.value</name>
-          <recordfield>TASK.TYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>EDITOR_CONTACT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REQUESTOR_CONTACT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TYPE.displayValue</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATUS.displayValue</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PARENT_CONTEXT.value</name>
-          <recordfield>TASK.PARENT_CONTEXT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PARENT_ID.value</name>
-          <recordfield>TASK.PARENT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRIORITY.displayValue</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROGRESS.value</name>
-          <recordfield>TASK.PROGRESS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PROGRESS.displayValue</name>
-          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>SUBJECT_DETAILS.value</name>
-          <recordfield>TASK.SUBJECT</recordfield>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Task_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
+  <title>Task</title>
+  <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
+  <iconId>VAADIN:TASKS</iconId>
+  <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
+  <titlePlural>Tasks</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>CODE</name>
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/code/documentation.adoc</documentation>
+      <title>task number</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>0000000</outputFormat>
+      <inputFormat>0000000</inputFormat>
+      <searchable v="false" />
+      <state>DISABLED</state>
+    </entityField>
+    <entityField>
+      <name>SUBJECT</name>
+      <title>subject</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>{$TASK_STATUS}</title>
+      <colorProcess>%aditoprj%/entity/Task_entity/entityfields/status/colorProcess.js</colorProcess>
+      <consumer>KeywordStates</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>PRIORITY</name>
+      <title>priority</title>
+      <consumer>KeywordPriorities</consumer>
+      <mandatory v="true" />
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>REQUESTOR_CONTACT_ID</name>
+      <title>{$TASK_REQUESTOR}</title>
+      <consumer>ContactRequestors</consumer>
+      <linkedContext>Person</linkedContext>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/requestor_contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/requestor_contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>EDITOR_CONTACT_ID</name>
+      <title>{$TASK_EDITOR}</title>
+      <consumer>ContactEditors</consumer>
+      <linkedContext>Person</linkedContext>
+      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/editor_contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>START_DATE</name>
+      <title>Begin</title>
+      <contentType>DATE</contentType>
+      <resolution>MINUTE</resolution>
+      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+      <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
+      <groupable v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>MATURITY_DATE</name>
+      <title>Maturity</title>
+      <contentType>DATE</contentType>
+      <resolution>MINUTE</resolution>
+      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+      <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>type</title>
+      <consumer>KeywordTypes</consumer>
+      <searchable v="false" />
+      <groupable v="false" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>PROTECTIONLEVEL</name>
+      <title>Protected</title>
+      <contentType>BOOLEAN</contentType>
+      <contentTypeProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/contentTypeProcess.js</contentTypeProcess>
+      <dropDownProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/dropDownProcess.js</dropDownProcess>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TASKID</name>
+      <mandatory v="true" />
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/taskid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ContactEditors</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContactRequestors</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <stateProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ModuleTrees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ModuleTree_entity</entityName>
+        <fieldName>TreeProviders</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ID_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <mandatory v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContextName_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <mandatory v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT_ID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ParentId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ParentContext_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>newActivity</name>
+      <fieldType>ACTION</fieldType>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>NEON:HISTORY</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <actionOrder v="1" />
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>RowId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordPriorities</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordpriorities/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOffer</name>
+      <fieldType>ACTION</fieldType>
+      <title>New offer</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+      <actionOrder v="0" />
+      <iconId>VAADIN:CART</iconId>
+    </entityActionField>
+    <entityField>
+      <name>PROGRESS</name>
+      <title>Progress</title>
+      <consumer>KeywordProgress</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/progress/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/progress/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordProgress</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Links</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>TaskLink_entity</entityName>
+        <fieldName>Link</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>TaskId_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/links/children/taskid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>LinkedObjects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>dc29832e-15da-4f64-b17a-f1dd978ef47b</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>c6507834-cd91-4202-bdf7-6566f968edb4</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>26b9b221-de02-40ef-a400-d4b5e356da0b</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b2bb448a-b647-40c8-baec-16356f3e23f5</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>a93f1e7e-f929-438f-8f37-21e4af8b53b6</name>
+          <entityName>Product_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2b0c15eb-fa9a-4ee8-a8b1-5d0f344ddad6</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>335e31ad-ab67-4567-b4ea-3668f04922b2</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>fbaa2f6c-0ba1-4c93-acae-d7b636581679</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>PresetLinks_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/presetlinks_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>SUBJECT_DETAILS</name>
+      <title>subject</title>
+      <linkedContext>Task</linkedContext>
+    </entityField>
+    <entityParameter>
+      <name>FilterOnlyOwnTask_param</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/filteronlyowntask_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>PRIORITY_ICON</name>
+      <colorProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/colorProcess.js</colorProcess>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>LogHistories</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBDelete>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <linkInformation>
+        <linkInformation>
+          <name>47e1b4a5-6901-48b0-85ba-bec39b86a2d7</name>
+          <tableName>TASK</tableName>
+          <primaryKey>TASKID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CODE.value</name>
+          <recordfield>TASK.CODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>TASK.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EDITOR_CONTACT_ID.value</name>
+          <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MATURITY_DATE.value</name>
+          <recordfield>TASK.MATURITY_DATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRIORITY.value</name>
+          <recordfield>TASK.PRIORITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROTECTIONLEVEL.value</name>
+          <recordfield>TASK.PROTECTIONLEVEL</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REQUESTOR_CONTACT_ID.value</name>
+          <recordfield>TASK.REQUESTOR_CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>START_DATE.value</name>
+          <recordfield>TASK.START_DATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>TASK.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SUBJECT.value</name>
+          <recordfield>TASK.SUBJECT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TASKID.value</name>
+          <recordfield>TASK.TASKID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>TASK.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EDITOR_CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REQUESTOR_CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+          <recordfield>TASK.PARENT_CONTEXT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+          <recordfield>TASK.PARENT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRIORITY.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROGRESS.value</name>
+          <recordfield>TASK.PROGRESS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PROGRESS.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SUBJECT_DETAILS.value</name>
+          <recordfield>TASK.SUBJECT</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 4130f69640ea67988951ae393c3563f97607f351..074d349bbb9db6829152fb36f453e57ff7c574a2 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,165 +1,165 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Timetracking_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Timetracking</title>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>INFO</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>MINUTES</name>
-      <title>Time</title>
-      <contentType>TEXT</contentType>
-      <mandatory v="true" />
-      <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
-      <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>OBJECT_ID</name>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/object_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ROW_ID</name>
-      <title>Connection</title>
-      <linkedContextProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <title>Creator</title>
-      <consumer>Employees</consumer>
-      <linkedContext>Person</linkedContext>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>TIMETRACKINGID</name>
-    </entityField>
-    <entityField>
-      <name>DATE</name>
-      <title>Date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>ObjectId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>RowId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>Timetrackings</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Timetrackings</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Employees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
-      </dependency>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <fromClauseProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>56c74a11-cd33-44e3-9d41-da54d64a997c</name>
-          <tableName>TIMETRACKING</tableName>
-          <primaryKey>TIMETRACKINGID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>DATE.value</name>
-          <recordfield>TIMETRACKING.DATE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>INFO.value</name>
-          <recordfield>TIMETRACKING.INFO</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>MINUTES.value</name>
-          <recordfield>TIMETRACKING.MINUTES</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ID.value</name>
-          <recordfield>TIMETRACKING.OBJECT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>TIMETRACKING.CONTACT_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ROW_ID.value</name>
-          <recordfield>TIMETRACKING.ROW_ID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TIMETRACKINGID.value</name>
-          <recordfield>TIMETRACKING.TIMETRACKINGID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Timetracking_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Timetracking</title>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INFO</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>MINUTES</name>
+      <title>Time</title>
+      <contentType>TEXT</contentType>
+      <mandatory v="true" />
+      <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ID</name>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/object_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ROW_ID</name>
+      <title>Connection</title>
+      <linkedContextProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Creator</title>
+      <consumer>Employees</consumer>
+      <linkedContext>Person</linkedContext>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TIMETRACKINGID</name>
+    </entityField>
+    <entityField>
+      <name>DATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ObjectId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>RowId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>Timetrackings</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Timetrackings</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Employees</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>56c74a11-cd33-44e3-9d41-da54d64a997c</name>
+          <tableName>TIMETRACKING</tableName>
+          <primaryKey>TIMETRACKINGID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE.value</name>
+          <recordfield>TIMETRACKING.DATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>TIMETRACKING.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MINUTES.value</name>
+          <recordfield>TIMETRACKING.MINUTES</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ID.value</name>
+          <recordfield>TIMETRACKING.OBJECT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>TIMETRACKING.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ROW_ID.value</name>
+          <recordfield>TIMETRACKING.ROW_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TIMETRACKINGID.value</name>
+          <recordfield>TIMETRACKING.TIMETRACKINGID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index e1b0b3403fb6535d39c738287c484bc32b04b033..2ca883802a4a9f538cfb513f842cfc6944888228 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,104 +1,104 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>TurnoverTree_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Tree</title>
-  <iconId>NEON:LOGO</iconId>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>CATEGORY</name>
-      <groupable v="true" />
-    </entityField>
-    <entityField>
-      <name>TURNOVERPRICE</name>
-      <title>Turnover</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-    </entityField>
-    <entityParameter>
-      <name>YearCountToShow_param</name>
-      <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>MaxYear_param</name>
-      <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>FilteredTurnovers</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
-          <entityName>Turnover_entity</entityName>
-          <fieldName>Turnover_tree</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>YearCountToShow_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityField>
-      <name>PARENT</name>
-    </entityField>
-    <entityField>
-      <name>GROUP</name>
-      <title>Product group</title>
-    </entityField>
-    <entityField>
-      <name>FORECASTPRICE</name>
-      <title>Forecast</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-    </entityField>
-    <entityField>
-      <name>YEAR</name>
-    </entityField>
-    <entityField>
-      <name>MONTH</name>
-    </entityField>
-    <entityField>
-      <name>LAYER</name>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT.value</element>
-        <element>GROUP.value</element>
-        <element>CATEGORY.value</element>
-        <element>TURNOVERPRICE.value</element>
-        <element>FORECASTPRICE.value</element>
-        <element>YEAR.value</element>
-        <element>MONTH.value</element>
-        <element>LAYER.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>TurnoverTree_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Tree</title>
+  <iconId>NEON:LOGO</iconId>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+      <groupable v="true" />
+    </entityField>
+    <entityField>
+      <name>TURNOVERPRICE</name>
+      <title>Turnover</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+    </entityField>
+    <entityParameter>
+      <name>YearCountToShow_param</name>
+      <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>MaxYear_param</name>
+      <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>FilteredTurnovers</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
+          <entityName>Turnover_entity</entityName>
+          <fieldName>Turnover_tree</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>YearCountToShow_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>PARENT</name>
+    </entityField>
+    <entityField>
+      <name>GROUP</name>
+      <title>Product group</title>
+    </entityField>
+    <entityField>
+      <name>FORECASTPRICE</name>
+      <title>Forecast</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+    </entityField>
+    <entityField>
+      <name>YEAR</name>
+    </entityField>
+    <entityField>
+      <name>MONTH</name>
+    </entityField>
+    <entityField>
+      <name>LAYER</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>PARENT.value</element>
+        <element>GROUP.value</element>
+        <element>CATEGORY.value</element>
+        <element>TURNOVERPRICE.value</element>
+        <element>FORECASTPRICE.value</element>
+        <element>YEAR.value</element>
+        <element>MONTH.value</element>
+        <element>LAYER.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index f8a95705b77ce42b09e4f85dc0231f6152e66bad..b0196fbf00240fb6a70de017db5fc26be78edc1e 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,101 +1,101 @@
-<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
-  <name>Turnover_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
-  <title>Turnover</title>
-  <iconId>VAADIN:CHART</iconId>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>jdito</recordContainer>
-    </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <title>Year</title>
-    </entityField>
-    <entityField>
-      <name>Y</name>
-      <titleProcess>%aditoprj%/entity/Turnover_entity/entityfields/y/titleProcess.js</titleProcess>
-    </entityField>
-    <entityField>
-      <name>PARENT</name>
-      <title>Parent</title>
-    </entityField>
-    <entityField>
-      <name>CATEGORY</name>
-      <title>Category</title>
-    </entityField>
-    <entityField>
-      <name>X</name>
-      <title>Year</title>
-      <contentType>TEXT</contentType>
-    </entityField>
-    <entityParameter>
-      <name>YearCountToShow_param</name>
-      <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>MaxYear_param</name>
-      <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <documentation>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/documentation.adoc</documentation>
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>FilteredTurnovers</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <children>
-        <entityParameter>
-          <name>MaxYear_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>YearCountToShow_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Turnover_tree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>TurnoverTree_entity</entityName>
-        <fieldName>FilteredTurnovers</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>MaxYear_param</name>
-          <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>YearCountToShow_param</name>
-          <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT.value</element>
-        <element>CATEGORY.value</element>
-        <element>X.value</element>
-        <element>Y.value</element>
-      </recordFields>
-    </jDitoRecordContainer>
-  </recordContainers>
-</entity>
+<?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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+  <name>Turnover_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
+  <title>Turnover</title>
+  <iconId>VAADIN:CHART</iconId>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <title>Year</title>
+    </entityField>
+    <entityField>
+      <name>Y</name>
+      <titleProcess>%aditoprj%/entity/Turnover_entity/entityfields/y/titleProcess.js</titleProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+      <title>Parent</title>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+      <title>Category</title>
+    </entityField>
+    <entityField>
+      <name>X</name>
+      <title>Year</title>
+      <contentType>TEXT</contentType>
+    </entityField>
+    <entityParameter>
+      <name>YearCountToShow_param</name>
+      <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>MaxYear_param</name>
+      <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <documentation>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>FilteredTurnovers</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <children>
+        <entityParameter>
+          <name>MaxYear_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>YearCountToShow_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Turnover_tree</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>TurnoverTree_entity</entityName>
+        <fieldName>FilteredTurnovers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>MaxYear_param</name>
+          <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>YearCountToShow_param</name>
+          <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>PARENT.value</element>
+        <element>CATEGORY.value</element>
+        <element>X.value</element>
+        <element>Y.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 0c6857d078c2ea3a197ba953269c2fba6bdd6f3c..deba142e875a8bd727afd00d122d5f4e40080947 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1,3617 +1,3852 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language 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/language/1.2.0">
-  <name>_____LANGUAGE_EXTRA</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <keyValueMap>
-    <entry>
-      <key>Company</key>
-    </entry>
-    <entry>
-      <key>E-Mail</key>
-    </entry>
-    <entry>
-      <key>Male</key>
-    </entry>
-    <entry>
-      <key>Activity</key>
-    </entry>
-    <entry>
-      <key>Name</key>
-    </entry>
-    <entry>
-      <key>Austria</key>
-    </entry>
-    <entry>
-      <key>Customercode</key>
-    </entry>
-    <entry>
-      <key>Status</key>
-    </entry>
-    <entry>
-      <key>Active</key>
-    </entry>
-    <entry>
-      <key>Medium</key>
-    </entry>
-    <entry>
-      <key>Internet</key>
-    </entry>
-    <entry>
-      <key>Germany</key>
-    </entry>
-    <entry>
-      <key>Online-Meeting</key>
-    </entry>
-    <entry>
-      <key>Social Media</key>
-    </entry>
-    <entry>
-      <key>Visit</key>
-    </entry>
-    <entry>
-      <key>Information</key>
-    </entry>
-    <entry>
-      <key>Language</key>
-    </entry>
-    <entry>
-      <key>Phone</key>
-    </entry>
-    <entry>
-      <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
-    </entry>
-    <entry>
-      <key>Activities</key>
-    </entry>
-    <entry>
-      <key>Female</key>
-    </entry>
-    <entry>
-      <key>Contactmanagement</key>
-    </entry>
-    <entry>
-      <key>Mobile</key>
-    </entry>
-    <entry>
-      <key>Office address</key>
-    </entry>
-    <entry>
-      <key>Contact</key>
-    </entry>
-    <entry>
-      <key>Home address</key>
-    </entry>
-    <entry>
-      <key>Type</key>
-    </entry>
-    <entry>
-      <key>Contacts</key>
-    </entry>
-    <entry>
-      <key>Norway</key>
-    </entry>
-    <entry>
-      <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
-    </entry>
-    <entry>
-      <key>Address</key>
-    </entry>
-    <entry>
-      <key>Addresses</key>
-    </entry>
-    <entry>
-      <key>${COMM_ADDRESS}</key>
-    </entry>
-    <entry>
-      <key>Gender</key>
-    </entry>
-    <entry>
-      <key>Date of birth</key>
-    </entry>
-    <entry>
-      <key>Lastname</key>
-    </entry>
-    <entry>
-      <key>Salutation</key>
-    </entry>
-    <entry>
-      <key>Middlename</key>
-    </entry>
-    <entry>
-      <key>Title</key>
-    </entry>
-    <entry>
-      <key>Addresstype</key>
-    </entry>
-    <entry>
-      <key>Firstname</key>
-    </entry>
-    <entry>
-      <key>Description</key>
-    </entry>
-    <entry>
-      <key>Direction</key>
-    </entry>
-    <entry>
-      <key>Entrydate</key>
-    </entry>
-    <entry>
-      <key>Subject</key>
-    </entry>
-    <entry>
-      <key>Post office box</key>
-    </entry>
-    <entry>
-      <key>Delivery address</key>
-    </entry>
-    <entry>
-      <key>House number</key>
-    </entry>
-    <entry>
-      <key>Country</key>
-    </entry>
-    <entry>
-      <key>Communication</key>
-    </entry>
-    <entry>
-      <key>postcode</key>
-    </entry>
-    <entry>
-      <key>City</key>
-    </entry>
-    <entry>
-      <key>State</key>
-    </entry>
-    <entry>
-      <key>Region</key>
-    </entry>
-    <entry>
-      <key>District</key>
-    </entry>
-    <entry>
-      <key>Switzerland</key>
-    </entry>
-    <entry>
-      <key>Internal (2)</key>
-    </entry>
-    <entry>
-      <key>Company Addresses</key>
-    </entry>
-    <entry>
-      <key>yyyyMMdd</key>
-    </entry>
-    <entry>
-      <key>standard address</key>
-    </entry>
-    <entry>
-      <key>PP</key>
-    </entry>
-    <entry>
-      <key>VAT</key>
-    </entry>
-    <entry>
-      <key>The expiry date must be after the start date!</key>
-    </entry>
-    <entry>
-      <key>Product</key>
-    </entry>
-    <entry>
-      <key>Developer</key>
-    </entry>
-    <entry>
-      <key>Valid until</key>
-    </entry>
-    <entry>
-      <key>Price list</key>
-    </entry>
-    <entry>
-      <key>Currency</key>
-    </entry>
-    <entry>
-      <key>Payment method</key>
-    </entry>
-    <entry>
-      <key>Price list / Company</key>
-    </entry>
-    <entry>
-      <key>Curr. sales price</key>
-    </entry>
-    <entry>
-      <key>Contract</key>
-    </entry>
-    <entry>
-      <key>Stock</key>
-    </entry>
-    <entry>
-      <key>PP/SP</key>
-    </entry>
-    <entry>
-      <key>Next due date</key>
-    </entry>
-    <entry>
-      <key>Discount</key>
-    </entry>
-    <entry>
-      <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
-    </entry>
-    <entry>
-      <key>Sales</key>
-    </entry>
-    <entry>
-      <key>Contract number</key>
-    </entry>
-    <entry>
-      <key>Min. stock</key>
-    </entry>
-    <entry>
-      <key>SP</key>
-    </entry>
-    <entry>
-      <key>Commodity group 3</key>
-    </entry>
-    <entry>
-      <key>Commodity group 2</key>
-    </entry>
-    <entry>
-      <key>Commodity group 1</key>
-    </entry>
-    <entry>
-      <key>Contract start date</key>
-    </entry>
-    <entry>
-      <key>Spare parts</key>
-    </entry>
-    <entry>
-      <key>Unit</key>
-    </entry>
-    <entry>
-      <key>Contract expiry date</key>
-    </entry>
-    <entry>
-      <key>Yes</key>
-    </entry>
-    <entry>
-      <key>Type of contract</key>
-    </entry>
-    <entry>
-      <key>No</key>
-    </entry>
-    <entry>
-      <key>Service</key>
-    </entry>
-    <entry>
-      <key>Cancelled</key>
-    </entry>
-    <entry>
-      <key>Advertising material</key>
-    </entry>
-    <entry>
-      <key>Valid from</key>
-    </entry>
-    <entry>
-      <key>Product name</key>
-    </entry>
-    <entry>
-      <key>Product group</key>
-    </entry>
-    <entry>
-      <key>${CONTRACT_STATUS}</key>
-    </entry>
-    <entry>
-      <key>From no. of units</key>
-    </entry>
-    <entry>
-      <key>Price</key>
-    </entry>
-    <entry>
-      <key>Conditions</key>
-    </entry>
-    <entry>
-      <key>Standard</key>
-    </entry>
-    <entry>
-      <key>I / O</key>
-    </entry>
-    <entry>
-      <key>Date</key>
-    </entry>
-    <entry>
-      <key>IN</key>
-    </entry>
-    <entry>
-      <key>OUT</key>
-    </entry>
-    <entry>
-      <key>Warehouse</key>
-    </entry>
-    <entry>
-      <key>Reference</key>
-    </entry>
-    <entry>
-      <key>The contract number already exists!</key>
-    </entry>
-    <entry>
-      <key>The product number already exists!</key>
-    </entry>
-    <entry>
-      <key>Quantity</key>
-    </entry>
-    <entry>
-      <key>Salesproject</key>
-    </entry>
-    <entry>
-      <key>Rollout</key>
-    </entry>
-    <entry>
-      <key>Phase</key>
-    </entry>
-    <entry>
-      <key>Product number</key>
-    </entry>
-    <entry>
-      <key>Project number</key>
-    </entry>
-    <entry>
-      <key>Project title</key>
-    </entry>
-    <entry>
-      <key>Project start</key>
-    </entry>
-    <entry>
-      <key>Volume</key>
-    </entry>
-    <entry>
-      <key>Partial order</key>
-    </entry>
-    <entry>
-      <key>Open</key>
-    </entry>
-    <entry>
-      <key>Lost</key>
-    </entry>
-    <entry>
-      <key>Order</key>
-    </entry>
-    <entry>
-      <key>Postponed</key>
-    </entry>
-    <entry>
-      <key>Aborted</key>
-    </entry>
-    <entry>
-      <key>Negotiation</key>
-    </entry>
-    <entry>
-      <key>Workshop</key>
-    </entry>
-    <entry>
-      <key>Presentation preparation</key>
-    </entry>
-    <entry>
-      <key>Specifications in progress</key>
-    </entry>
-    <entry>
-      <key>Project decision</key>
-    </entry>
-    <entry>
-      <key>Lead</key>
-    </entry>
-    <entry>
-      <key>Total net</key>
-    </entry>
-    <entry>
-      <key>Offer</key>
-    </entry>
-    <entry>
-      <key>Offer number</key>
-    </entry>
-    <entry>
-      <key>Probability</key>
-    </entry>
-    <entry>
-      <key>Total VAT</key>
-    </entry>
-    <entry>
-      <key>The offer number already exists!</key>
-    </entry>
-    <entry>
-      <key>0 %</key>
-    </entry>
-    <entry>
-      <key>75 %</key>
-    </entry>
-    <entry>
-      <key>100 %</key>
-    </entry>
-    <entry>
-      <key>25 %</key>
-    </entry>
-    <entry>
-      <key>50 %</key>
-    </entry>
-    <entry>
-      <key>Won</key>
-    </entry>
-    <entry>
-      <key>Checked</key>
-    </entry>
-    <entry>
-      <key>Sent</key>
-    </entry>
-    <entry>
-      <key>Offeritems</key>
-    </entry>
-    <entry>
-      <key>Header text</key>
-    </entry>
-    <entry>
-      <key>Commodity group</key>
-    </entry>
-    <entry>
-      <key>Footer text</key>
-    </entry>
-    <entry>
-      <key>Designation</key>
-    </entry>
-    <entry>
-      <key>Position</key>
-    </entry>
-    <entry>
-      <key>Optional</key>
-    </entry>
-    <entry>
-      <key>Article</key>
-    </entry>
-    <entry>
-      <key>Offeritem</key>
-    </entry>
-    <entry>
-      <key>Sum</key>
-    </entry>
-    <entry>
-      <key>Option4</key>
-    </entry>
-    <entry>
-      <key>Option3</key>
-    </entry>
-    <entry>
-      <key>Option2</key>
-    </entry>
-    <entry>
-      <key>Option1</key>
-    </entry>
-    <entry>
-      <key>Countries</key>
-    </entry>
-    <entry>
-      <key>Options</key>
-    </entry>
-    <entry>
-      <key>Total gross</key>
-    </entry>
-    <entry>
-      <key>Identical price list found!</key>
-    </entry>
-    <entry>
-      <key>Parts list</key>
-    </entry>
-    <entry>
-      <key>${THOUSAND_SHORT}</key>
-    </entry>
-    <entry>
-      <key>Deliver opinion</key>
-    </entry>
-    <entry>
-      <key>Presentation follow-up</key>
-    </entry>
-    <entry>
-      <key>Waiting for requirements</key>
-    </entry>
-    <entry>
-      <key>Parent</key>
-    </entry>
-    <entry>
-      <key>${EURO_SIGN}</key>
-    </entry>
-    <entry>
-      <key>Planned</key>
-    </entry>
-    <entry>
-      <key>Info</key>
-    </entry>
-    <entry>
-      <key>${VOLUME_MONEY}</key>
-    </entry>
-    <entry>
-      <key>Milestones</key>
-    </entry>
-    <entry>
-      <key>Milestone</key>
-    </entry>
-    <entry>
-      <key>Excreted</key>
-    </entry>
-    <entry>
-      <key>Reason</key>
-    </entry>
-    <entry>
-      <key>Document</key>
-    </entry>
-    <entry>
-      <key>Competition</key>
-    </entry>
-    <entry>
-      <key>Forecast</key>
-    </entry>
-    <entry>
-      <key>Datei</key>
-    </entry>
-    <entry>
-      <key>Role</key>
-    </entry>
-    <entry>
-      <key>End date</key>
-    </entry>
-    <entry>
-      <key>Documents</key>
-    </entry>
-    <entry>
-      <key>New offer version</key>
-    </entry>
-    <entry>
-      <key>Copy offer</key>
-    </entry>
-    <entry>
-      <key>Vers. no.</key>
-    </entry>
-    <entry>
-      <key>Curr. purchase price</key>
-    </entry>
-    <entry>
-      <key>Contracts</key>
-    </entry>
-    <entry>
-      <key>Classification</key>
-    </entry>
-    <entry>
-      <key>Class A</key>
-    </entry>
-    <entry>
-      <key>Class C</key>
-    </entry>
-    <entry>
-      <key>Class B</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
-    </entry>
-    <entry>
-      <key>High price strategy</key>
-    </entry>
-    <entry>
-      <key>Low price strategy</key>
-    </entry>
-    <entry>
-      <key>Uid</key>
-    </entry>
-    <entry>
-      <key>in 6 Months</key>
-    </entry>
-    <entry>
-      <key>Budget (Project)</key>
-    </entry>
-    <entry>
-      <key>to</key>
-    </entry>
-    <entry>
-      <key>Other</key>
-    </entry>
-    <entry>
-      <key>Individual</key>
-    </entry>
-    <entry>
-      <key>Organisation</key>
-    </entry>
-    <entry>
-      <key>Base</key>
-    </entry>
-    <entry>
-      <key>in 12 Months</key>
-    </entry>
-    <entry>
-      <key>Standard / Individual</key>
-    </entry>
-    <entry>
-      <key>Please update the ${FORECAST_ENGLISH}.</key>
-    </entry>
-    <entry>
-      <key>no Project planned</key>
-    </entry>
-    <entry>
-      <key>Strength 3</key>
-    </entry>
-    <entry>
-      <key>Strength 1</key>
-    </entry>
-    <entry>
-      <key>Strength 2</key>
-    </entry>
-    <entry>
-      <key>Value</key>
-    </entry>
-    <entry>
-      <key>Weakness 1</key>
-    </entry>
-    <entry>
-      <key>Weakness 2</key>
-    </entry>
-    <entry>
-      <key>Weakness 3</key>
-    </entry>
-    <entry>
-      <key>Projectstart</key>
-    </entry>
-    <entry>
-      <key>no valid format</key>
-    </entry>
-    <entry>
-      <key>Pos.</key>
-    </entry>
-    <entry>
-      <key>ISO 3166-1 alpha-3</key>
-    </entry>
-    <entry>
-      <key>ISO 3166-1 alpha-2</key>
-    </entry>
-    <entry>
-      <key>0.00</key>
-    </entry>
-    <entry>
-      <key>Relationship</key>
-    </entry>
-    <entry>
-      <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
-    </entry>
-    <entry>
-      <key>Native Name</key>
-    </entry>
-    <entry>
-      <key>#,##0</key>
-    </entry>
-    <entry>
-      <key>New offer</key>
-    </entry>
-    <entry>
-      <key>dd.MM.yyyy</key>
-    </entry>
-    <entry>
-      <key>Edit defaults</key>
-    </entry>
-    <entry>
-      <key>no valid mail-address format</key>
-    </entry>
-    <entry>
-      <key>#,##0.00</key>
-    </entry>
-    <entry>
-      <key>Latin Name</key>
-    </entry>
-    <entry>
-      <key>Organisation name</key>
-    </entry>
-    <entry>
-      <key>Connection</key>
-    </entry>
-    <entry>
-      <key>standard email</key>
-    </entry>
-    <entry>
-      <key>Creator</key>
-    </entry>
-    <entry>
-      <key>Timetracking</key>
-    </entry>
-    <entry>
-      <key>Further informations</key>
-    </entry>
-    <entry>
-      <key>asdf</key>
-    </entry>
-    <entry>
-      <key>Social</key>
-    </entry>
-    <entry>
-      <key>Facebook Feed</key>
-    </entry>
-    <entry>
-      <key>Group1</key>
-    </entry>
-    <entry>
-      <key>Group2</key>
-    </entry>
-    <entry>
-      <key>Details</key>
-    </entry>
-    <entry>
-      <key>Prices</key>
-    </entry>
-    <entry>
-      <key>Twitter</key>
-    </entry>
-    <entry>
-      <key>Connections</key>
-    </entry>
-    <entry>
-      <key>Object</key>
-    </entry>
-    <entry>
-      <key>Attributes</key>
-    </entry>
-    <entry>
-      <key>Facebook</key>
-    </entry>
-    <entry>
-      <key>Creation date</key>
-    </entry>
-    <entry>
-      <key>Maindocuments</key>
-    </entry>
-    <entry>
-      <key>Receipt</key>
-    </entry>
-    <entry>
-      <key>Receipt number</key>
-    </entry>
-    <entry>
-      <key>Year</key>
-    </entry>
-    <entry>
-      <key>New receipt version</key>
-    </entry>
-    <entry>
-      <key>Orderitems</key>
-    </entry>
-    <entry>
-      <key>Sent receipts</key>
-    </entry>
-    <entry>
-      <key>Copy receipt</key>
-    </entry>
-    <entry>
-      <key>Orderitem</key>
-    </entry>
-    <entry>
-      <key>The order number already exists!</key>
-    </entry>
-    <entry>
-      <key>New activity</key>
-    </entry>
-    <entry>
-      <key>Turnover</key>
-    </entry>
-    <entry>
-      <key>Sent offers</key>
-    </entry>
-    <entry>
-      <key>Show all activities</key>
-    </entry>
-    <entry>
-      <key>Offers</key>
-    </entry>
-    <entry>
-      <key>Show all sent offers</key>
-    </entry>
-    <entry>
-      <key>Show my activities</key>
-    </entry>
-    <entry>
-      <key>Show all receipts</key>
-    </entry>
-    <entry>
-      <key>Receipts</key>
-    </entry>
-    <entry>
-      <key>My Activities</key>
-    </entry>
-    <entry>
-      <key>Show all offers</key>
-    </entry>
-    <entry>
-      <key>Show all products</key>
-    </entry>
-    <entry>
-      <key>Show all Facebook posts of a user</key>
-    </entry>
-    <entry>
-      <key>Show all tweets of a user</key>
-    </entry>
-    <entry>
-      <key>Show all companies</key>
-    </entry>
-    <entry>
-      <key>Show all tweets of ADITO</key>
-    </entry>
-    <entry>
-      <key>Show all sent receipts</key>
-    </entry>
-    <entry>
-      <key>Products</key>
-    </entry>
-    <entry>
-      <key>Show all Facebook posts of ADITO</key>
-    </entry>
-    <entry>
-      <key>Companies</key>
-    </entry>
-    <entry>
-      <key>Show all contacts</key>
-    </entry>
-    <entry>
-      <key>Show open salesprojects</key>
-    </entry>
-    <entry>
-      <key>Show all contracts</key>
-    </entry>
-    <entry>
-      <key>Salesprojects</key>
-    </entry>
-    <entry>
-      <key>Show all salesprojects</key>
-    </entry>
-    <entry>
-      <key>Open salesprojects</key>
-    </entry>
-    <entry>
-      <key>July</key>
-    </entry>
-    <entry>
-      <key>ADITO Facebook Feed</key>
-    </entry>
-    <entry>
-      <key>ADITO Twitter Feed</key>
-    </entry>
-    <entry>
-      <key>June</key>
-    </entry>
-    <entry>
-      <key>October</key>
-    </entry>
-    <entry>
-      <key>Take price</key>
-    </entry>
-    <entry>
-      <key>Twitter Feed</key>
-    </entry>
-    <entry>
-      <key>November</key>
-    </entry>
-    <entry>
-      <key>December</key>
-    </entry>
-    <entry>
-      <key>May</key>
-    </entry>
-    <entry>
-      <key>April</key>
-    </entry>
-    <entry>
-      <key>January</key>
-    </entry>
-    <entry>
-      <key>March</key>
-    </entry>
-    <entry>
-      <key>September</key>
-    </entry>
-    <entry>
-      <key>August</key>
-    </entry>
-    <entry>
-      <key>Category</key>
-    </entry>
-    <entry>
-      <key>February</key>
-    </entry>
-    <entry>
-      <key>Abomodel</key>
-    </entry>
-    <entry>
-      <key>Confirmed</key>
-    </entry>
-    <entry>
-      <key>OutOfOffice</key>
-    </entry>
-    <entry>
-      <key>Articledescription</key>
-    </entry>
-    <entry>
-      <key>Articlenumber</key>
-    </entry>
-    <entry>
-      <key>Industry 3</key>
-    </entry>
-    <entry>
-      <key>Industry 2</key>
-    </entry>
-    <entry>
-      <key>Industry 1</key>
-    </entry>
-    <entry>
-      <key>Industry</key>
-    </entry>
-    <entry>
-      <key>Put Reciever Into To</key>
-    </entry>
-    <entry>
-      <key>Unitprice</key>
-    </entry>
-    <entry>
-      <key>Free</key>
-    </entry>
-    <entry>
-      <key>From</key>
-    </entry>
-    <entry>
-      <key>Total</key>
-    </entry>
-    <entry>
-      <key>yearly series not specified</key>
-    </entry>
-    <entry>
-      <key>no standard email office</key>
-    </entry>
-    <entry>
-      <key>Conditions of payment</key>
-    </entry>
-    <entry>
-      <key>Number</key>
-    </entry>
-    <entry>
-      <key>Amount</key>
-    </entry>
-    <entry>
-      <key>Deliveryspecification</key>
-    </entry>
-    <entry>
-      <key>Ignore daily series</key>
-    </entry>
-    <entry>
-      <key>Tentative</key>
-    </entry>
-    <entry>
-      <key>Ignore series</key>
-    </entry>
-    <entry>
-      <key>Plus Salestax</key>
-    </entry>
-    <entry>
-      <key>Choose address</key>
-    </entry>
-    <entry>
-      <key>Customer Base Sheet</key>
-    </entry>
-    <entry>
-      <key>{$TASK_STATUS}</key>
-    </entry>
-    <entry>
-      <key>Task</key>
-    </entry>
-    <entry>
-      <key>subject</key>
-    </entry>
-    <entry>
-      <key>{$TASK_REQUESTOR}</key>
-    </entry>
-    <entry>
-      <key>task number</key>
-    </entry>
-    <entry>
-      <key>{$TASK_EDITOR}</key>
-    </entry>
-    <entry>
-      <key>description</key>
-    </entry>
-    <entry>
-      <key>priority</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_HIGH}</key>
-    </entry>
-    <entry>
-      <key>Seite</key>
-    </entry>
-    <entry>
-      <key>Senden per E-Mail</key>
-    </entry>
-    <entry>
-      <key>Hauptdokument</key>
-    </entry>
-    <entry>
-      <key>Betreff</key>
-    </entry>
-    <entry>
-      <key>title</key>
-    </entry>
-    <entry>
-      <key>von</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_LOW}</key>
-    </entry>
-    <entry>
-      <key>Nur Eigene anzeigen</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_NORMAL}</key>
-    </entry>
-    <entry>
-      <key>Beschreibung</key>
-    </entry>
-    <entry>
-      <key>Unit price</key>
-    </entry>
-    <entry>
-      <key>Firma</key>
-    </entry>
-    <entry>
-      <key>type</key>
-    </entry>
-    <entry>
-      <key>Benutzer</key>
-    </entry>
-    <entry>
-      <key>Schlüsselwort</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_NONE}</key>
-    </entry>
-    <entry>
-      <key>Termin</key>
-    </entry>
-    <entry>
-      <key>Vorschau</key>
-    </entry>
-    <entry>
-      <key>Angebot</key>
-    </entry>
-    <entry>
-      <key>details</key>
-    </entry>
-    <entry>
-      <key>Contact type</key>
-    </entry>
-    <entry>
-      <key>Communication data</key>
-    </entry>
-    <entry>
-      <key>Remark</key>
-    </entry>
-    <entry>
-      <key>Department</key>
-    </entry>
-    <entry>
-      <key>Tasks</key>
-    </entry>
-    <entry>
-      <key>Employee</key>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_MEMBER}</key>
-    </entry>
-    <entry>
-      <key>responsible</key>
-    </entry>
-    <entry>
-      <key>Kundenstammblatt</key>
-    </entry>
-    <entry>
-      <key>Person</key>
-    </entry>
-    <entry>
-      <key>Detail</key>
-    </entry>
-    <entry>
-      <key>Object 2</key>
-    </entry>
-    <entry>
-      <key>Object 1</key>
-    </entry>
-    <entry>
-      <key>Type 2</key>
-    </entry>
-    <entry>
-      <key>Type 1</key>
-    </entry>
-    <entry>
-      <key>Relations</key>
-    </entry>
-    <entry>
-      <key>${FORECAST_ENGLISH}</key>
-    </entry>
-    <entry>
-      <key>Usage</key>
-    </entry>
-    <entry>
-      <key>Maximal Count</key>
-    </entry>
-    <entry>
-      <key>Minimal Count</key>
-    </entry>
-    <entry>
-      <key>${ADDRESS_STATE}</key>
-    </entry>
-    <entry>
-      <key>Title (original language)</key>
-    </entry>
-    <entry>
-      <key>Attribute Relation</key>
-    </entry>
-    <entry>
-      <key>Attribute Usage</key>
-    </entry>
-    <entry>
-      <key>Key</key>
-    </entry>
-    <entry>
-      <key>Attribute</key>
-    </entry>
-    <entry>
-      <key>Container</key>
-    </entry>
-    <entry>
-      <key>Administration</key>
-    </entry>
-    <entry>
-      <key>Keyword</key>
-    </entry>
-    <entry>
-      <key>Sorting</key>
-    </entry>
-    <entry>
-      <key>jdito</key>
-    </entry>
-    <entry>
-      <key>Time expenses</key>
-    </entry>
-    <entry>
-      <key>Context id</key>
-    </entry>
-    <entry>
-      <key>Context name</key>
-    </entry>
-    <entry>
-      <key>Cambodia</key>
-    </entry>
-    <entry>
-      <key>Resigned</key>
-    </entry>
-    <entry>
-      <key>Customer</key>
-    </entry>
-    <entry>
-      <key>Outgoing</key>
-    </entry>
-    <entry>
-      <key>Paraguay</key>
-    </entry>
-    <entry>
-      <key>Solomon Islands</key>
-    </entry>
-    <entry>
-      <key>Montserrat</key>
-    </entry>
-    <entry>
-      <key>Guadeloupe</key>
-    </entry>
-    <entry>
-      <key>Product_technic</key>
-    </entry>
-    <entry>
-      <key>Moldova (Republic of)</key>
-    </entry>
-    <entry>
-      <key>Seychelles</key>
-    </entry>
-    <entry>
-      <key>Canadian dollar</key>
-    </entry>
-    <entry>
-      <key>Bahrain</key>
-    </entry>
-    <entry>
-      <key>Comoros</key>
-    </entry>
-    <entry>
-      <key>Faroe Islands</key>
-    </entry>
-    <entry>
-      <key>Finland</key>
-    </entry>
-    <entry>
-      <key>Project_duration</key>
-    </entry>
-    <entry>
-      <key>Company_internationality</key>
-    </entry>
-    <entry>
-      <key>Eritrea</key>
-    </entry>
-    <entry>
-      <key>Puerto Rico</key>
-    </entry>
-    <entry>
-      <key>Viet Nam</key>
-    </entry>
-    <entry>
-      <key>Libya</key>
-    </entry>
-    <entry>
-      <key>French</key>
-    </entry>
-    <entry>
-      <key>Cocos (Keeling) Islands</key>
-    </entry>
-    <entry>
-      <key>Saint Helena, Ascension and Tristan da Cunha</key>
-    </entry>
-    <entry>
-      <key>Liechtenstein</key>
-    </entry>
-    <entry>
-      <key>Product_functionality</key>
-    </entry>
-    <entry>
-      <key>Bulgaria</key>
-    </entry>
-    <entry>
-      <key>Jordan</key>
-    </entry>
-    <entry>
-      <key>Côte d'Ivoire</key>
-    </entry>
-    <entry>
-      <key>United Arab Emirates</key>
-    </entry>
-    <entry>
-      <key>Kenya</key>
-    </entry>
-    <entry>
-      <key>None, individual count</key>
-    </entry>
-    <entry>
-      <key>French Polynesia</key>
-    </entry>
-    <entry>
-      <key>Djibouti</key>
-    </entry>
-    <entry>
-      <key>Cuba</key>
-    </entry>
-    <entry>
-      <key>Saint Lucia</key>
-    </entry>
-    <entry>
-      <key>Mayotte</key>
-    </entry>
-    <entry>
-      <key>Israel</key>
-    </entry>
-    <entry>
-      <key>San Marino</key>
-    </entry>
-    <entry>
-      <key>Tajikistan</key>
-    </entry>
-    <entry>
-      <key>Warehouse 2</key>
-    </entry>
-    <entry>
-      <key>Warehouse 1</key>
-    </entry>
-    <entry>
-      <key>Gibraltar</key>
-    </entry>
-    <entry>
-      <key>Warehouse 3</key>
-    </entry>
-    <entry>
-      <key>Cyprus</key>
-    </entry>
-    <entry>
-      <key>Semiannually</key>
-    </entry>
-    <entry>
-      <key>Northern Mariana Islands</key>
-    </entry>
-    <entry>
-      <key>Malaysia</key>
-    </entry>
-    <entry>
-      <key>Armenia</key>
-    </entry>
-    <entry>
-      <key>Brazil</key>
-    </entry>
-    <entry>
-      <key>Turks and Caicos Islands</key>
-    </entry>
-    <entry>
-      <key>Cabo Verde</key>
-    </entry>
-    <entry>
-      <key>Ecuador</key>
-    </entry>
-    <entry>
-      <key>Iran (Islamic Republic of)</key>
-    </entry>
-    <entry>
-      <key>Decision maker</key>
-    </entry>
-    <entry>
-      <key>Lao People's Democratic Republic</key>
-    </entry>
-    <entry>
-      <key>Maintenance contract</key>
-    </entry>
-    <entry>
-      <key>United States Minor Outlying Islands</key>
-    </entry>
-    <entry>
-      <key>Italy</key>
-    </entry>
-    <entry>
-      <key>${ORGTYPE_OTHER}</key>
-    </entry>
-    <entry>
-      <key>Haiti</key>
-    </entry>
-    <entry>
-      <key>Afghanistan</key>
-    </entry>
-    <entry>
-      <key>Russian Federation</key>
-    </entry>
-    <entry>
-      <key>waiting</key>
-    </entry>
-    <entry>
-      <key>American Samoa</key>
-    </entry>
-    <entry>
-      <key>Korea (Democratic People's Republic of)</key>
-    </entry>
-    <entry>
-      <key>United States dollar</key>
-    </entry>
-    <entry>
-      <key>Kyrgyzstan</key>
-    </entry>
-    <entry>
-      <key>Togo</key>
-    </entry>
-    <entry>
-      <key>Other_existing Customer</key>
-    </entry>
-    <entry>
-      <key>Uzbekistan</key>
-    </entry>
-    <entry>
-      <key>Dominica</key>
-    </entry>
-    <entry>
-      <key>Benin</key>
-    </entry>
-    <entry>
-      <key>Liter</key>
-    </entry>
-    <entry>
-      <key>Virgin Islands (British)</key>
-    </entry>
-    <entry>
-      <key>Sudan</key>
-    </entry>
-    <entry>
-      <key>Portugal</key>
-    </entry>
-    <entry>
-      <key>Grenada</key>
-    </entry>
-    <entry>
-      <key>Latvia</key>
-    </entry>
-    <entry>
-      <key>Mongolia</key>
-    </entry>
-    <entry>
-      <key>Morocco</key>
-    </entry>
-    <entry>
-      <key>Guatemala</key>
-    </entry>
-    <entry>
-      <key>Pieces</key>
-    </entry>
-    <entry>
-      <key>Heard Island and McDonald Islands</key>
-    </entry>
-    <entry>
-      <key>Incoming</key>
-    </entry>
-    <entry>
-      <key>Ghana</key>
-    </entry>
-    <entry>
-      <key>Holy See</key>
-    </entry>
-    <entry>
-      <key>India</key>
-    </entry>
-    <entry>
-      <key>Canada</key>
-    </entry>
-    <entry>
-      <key>Maldives</key>
-    </entry>
-    <entry>
-      <key>Service contract</key>
-    </entry>
-    <entry>
-      <key>Taiwan</key>
-    </entry>
-    <entry>
-      <key>Central African Republic</key>
-    </entry>
-    <entry>
-      <key>Fiji</key>
-    </entry>
-    <entry>
-      <key>Guinea</key>
-    </entry>
-    <entry>
-      <key>Somalia</key>
-    </entry>
-    <entry>
-      <key>Sao Tome and Principe</key>
-    </entry>
-    <entry>
-      <key>United Kingdom of Great Britain and Northern Ireland</key>
-    </entry>
-    <entry>
-      <key>Equatorial Guinea</key>
-    </entry>
-    <entry>
-      <key>Kiribati</key>
-    </entry>
-    <entry>
-      <key>Costa Rica</key>
-    </entry>
-    <entry>
-      <key>Supplier</key>
-    </entry>
-    <entry>
-      <key>Nigeria</key>
-    </entry>
-    <entry>
-      <key>Syrian Arab Republic</key>
-    </entry>
-    <entry>
-      <key>Timor-Leste</key>
-    </entry>
-    <entry>
-      <key>Product_mobile use</key>
-    </entry>
-    <entry>
-      <key>Samoa</key>
-    </entry>
-    <entry>
-      <key>Spain</key>
-    </entry>
-    <entry>
-      <key>Palau</key>
-    </entry>
-    <entry>
-      <key>Prospect</key>
-    </entry>
-    <entry>
-      <key>Estonia</key>
-    </entry>
-    <entry>
-      <key>Not signed yet</key>
-    </entry>
-    <entry>
-      <key>Niue</key>
-    </entry>
-    <entry>
-      <key>Mozambique</key>
-    </entry>
-    <entry>
-      <key>El Salvador</key>
-    </entry>
-    <entry>
-      <key>Guam</key>
-    </entry>
-    <entry>
-      <key>Lesotho</key>
-    </entry>
-    <entry>
-      <key>Tonga</key>
-    </entry>
-    <entry>
-      <key>Western Sahara</key>
-    </entry>
-    <entry>
-      <key>new</key>
-    </entry>
-    <entry>
-      <key>Adviser</key>
-    </entry>
-    <entry>
-      <key>Company_size</key>
-    </entry>
-    <entry>
-      <key>Republic of Kosovo</key>
-    </entry>
-    <entry>
-      <key>South Sudan</key>
-    </entry>
-    <entry>
-      <key>Mauritius</key>
-    </entry>
-    <entry>
-      <key>Bouvet Island</key>
-    </entry>
-    <entry>
-      <key>Bolivia (Plurinational State of)</key>
-    </entry>
-    <entry>
-      <key>Norfolk Island</key>
-    </entry>
-    <entry>
-      <key>Sint Maarten (Dutch part)</key>
-    </entry>
-    <entry>
-      <key>Micronesia (Federated States of)</key>
-    </entry>
-    <entry>
-      <key>Product_industry knowhow</key>
-    </entry>
-    <entry>
-      <key>United States of America</key>
-    </entry>
-    <entry>
-      <key>In review</key>
-    </entry>
-    <entry>
-      <key>Address purchase</key>
-    </entry>
-    <entry>
-      <key>Malta</key>
-    </entry>
-    <entry>
-      <key>Project_volume</key>
-    </entry>
-    <entry>
-      <key>Ireland</key>
-    </entry>
-    <entry>
-      <key>Inactive</key>
-    </entry>
-    <entry>
-      <key>France</key>
-    </entry>
-    <entry>
-      <key>Lithuania</key>
-    </entry>
-    <entry>
-      <key>Korea (Republic of)</key>
-    </entry>
-    <entry>
-      <key>${PRICELIST_SERVICE}</key>
-    </entry>
-    <entry>
-      <key>English</key>
-    </entry>
-    <entry>
-      <key>Nicaragua</key>
-    </entry>
-    <entry>
-      <key>Macao</key>
-    </entry>
-    <entry>
-      <key>Mexico</key>
-    </entry>
-    <entry>
-      <key>Uganda</key>
-    </entry>
-    <entry>
-      <key>Suriname</key>
-    </entry>
-    <entry>
-      <key>Greenland</key>
-    </entry>
-    <entry>
-      <key>Papua New Guinea</key>
-    </entry>
-    <entry>
-      <key>Kazakhstan</key>
-    </entry>
-    <entry>
-      <key>Ã…land Islands</key>
-    </entry>
-    <entry>
-      <key>Bahamas</key>
-    </entry>
-    <entry>
-      <key>Mali</key>
-    </entry>
-    <entry>
-      <key>Marshall Islands</key>
-    </entry>
-    <entry>
-      <key>Panama</key>
-    </entry>
-    <entry>
-      <key>Bonaire, Sint Eustatius and Saba</key>
-    </entry>
-    <entry>
-      <key>Tanzania, United Republic of</key>
-    </entry>
-    <entry>
-      <key>Argentina</key>
-    </entry>
-    <entry>
-      <key>Belize</key>
-    </entry>
-    <entry>
-      <key>Zambia</key>
-    </entry>
-    <entry>
-      <key>Congo</key>
-    </entry>
-    <entry>
-      <key>Guinea-Bissau</key>
-    </entry>
-    <entry>
-      <key>Namibia</key>
-    </entry>
-    <entry>
-      <key>External sales manager</key>
-    </entry>
-    <entry>
-      <key>Georgia</key>
-    </entry>
-    <entry>
-      <key>Saint Kitts and Nevis</key>
-    </entry>
-    <entry>
-      <key>Yemen</key>
-    </entry>
-    <entry>
-      <key>Aruba</key>
-    </entry>
-    <entry>
-      <key>Madagascar</key>
-    </entry>
-    <entry>
-      <key>Valid, unlimited</key>
-    </entry>
-    <entry>
-      <key>Svalbard and Jan Mayen</key>
-    </entry>
-    <entry>
-      <key>South Georgia and the South Sandwich Islands</key>
-    </entry>
-    <entry>
-      <key>Sweden</key>
-    </entry>
-    <entry>
-      <key>Malawi</key>
-    </entry>
-    <entry>
-      <key>Andorra</key>
-    </entry>
-    <entry>
-      <key>Poland</key>
-    </entry>
-    <entry>
-      <key>Tunisia</key>
-    </entry>
-    <entry>
-      <key>Tuvalu</key>
-    </entry>
-    <entry>
-      <key>Lebanon</key>
-    </entry>
-    <entry>
-      <key>Azerbaijan</key>
-    </entry>
-    <entry>
-      <key>Czech Republic</key>
-    </entry>
-    <entry>
-      <key>Mauritania</key>
-    </entry>
-    <entry>
-      <key>Guernsey</key>
-    </entry>
-    <entry>
-      <key>Kgs</key>
-    </entry>
-    <entry>
-      <key>Australia</key>
-    </entry>
-    <entry>
-      <key>Myanmar</key>
-    </entry>
-    <entry>
-      <key>Cameroon</key>
-    </entry>
-    <entry>
-      <key>Iceland</key>
-    </entry>
-    <entry>
-      <key>Oman</key>
-    </entry>
-    <entry>
-      <key>Gabon</key>
-    </entry>
-    <entry>
-      <key>Luxembourg</key>
-    </entry>
-    <entry>
-      <key>Algeria</key>
-    </entry>
-    <entry>
-      <key>Jersey</key>
-    </entry>
-    <entry>
-      <key>Slovenia</key>
-    </entry>
-    <entry>
-      <key>Antigua and Barbuda</key>
-    </entry>
-    <entry>
-      <key>Annually</key>
-    </entry>
-    <entry>
-      <key>Colombia</key>
-    </entry>
-    <entry>
-      <key>Project_reference</key>
-    </entry>
-    <entry>
-      <key>Vanuatu</key>
-    </entry>
-    <entry>
-      <key>Valid, limited</key>
-    </entry>
-    <entry>
-      <key>Honduras</key>
-    </entry>
-    <entry>
-      <key>Antarctica</key>
-    </entry>
-    <entry>
-      <key>Nauru</key>
-    </entry>
-    <entry>
-      <key>Burundi</key>
-    </entry>
-    <entry>
-      <key>Project manager</key>
-    </entry>
-    <entry>
-      <key>Singapore</key>
-    </entry>
-    <entry>
-      <key>French Guiana</key>
-    </entry>
-    <entry>
-      <key>Hours</key>
-    </entry>
-    <entry>
-      <key>Christmas Island</key>
-    </entry>
-    <entry>
-      <key>Netherlands</key>
-    </entry>
-    <entry>
-      <key>Product_flexibility</key>
-    </entry>
-    <entry>
-      <key>China</key>
-    </entry>
-    <entry>
-      <key>Martinique</key>
-    </entry>
-    <entry>
-      <key>Own website</key>
-    </entry>
-    <entry>
-      <key>Saint Pierre and Miquelon</key>
-    </entry>
-    <entry>
-      <key>Bhutan</key>
-    </entry>
-    <entry>
-      <key>Romania</key>
-    </entry>
-    <entry>
-      <key>Falkland Islands (Malvinas)</key>
-    </entry>
-    <entry>
-      <key>Philippines</key>
-    </entry>
-    <entry>
-      <key>Pitcairn</key>
-    </entry>
-    <entry>
-      <key>Zimbabwe</key>
-    </entry>
-    <entry>
-      <key>British Indian Ocean Territory</key>
-    </entry>
-    <entry>
-      <key>Montenegro</key>
-    </entry>
-    <entry>
-      <key>Quarterly</key>
-    </entry>
-    <entry>
-      <key>Indonesia</key>
-    </entry>
-    <entry>
-      <key>Angola</key>
-    </entry>
-    <entry>
-      <key>Internal</key>
-    </entry>
-    <entry>
-      <key>Key account</key>
-    </entry>
-    <entry>
-      <key>Brunei Darussalam</key>
-    </entry>
-    <entry>
-      <key>New Caledonia</key>
-    </entry>
-    <entry>
-      <key>Cayman Islands</key>
-    </entry>
-    <entry>
-      <key>Congo (Democratic Republic of the)</key>
-    </entry>
-    <entry>
-      <key>Greece</key>
-    </entry>
-    <entry>
-      <key>Guyana</key>
-    </entry>
-    <entry>
-      <key>Project assistant</key>
-    </entry>
-    <entry>
-      <key>Iraq</key>
-    </entry>
-    <entry>
-      <key>Chile</key>
-    </entry>
-    <entry>
-      <key>Nepal</key>
-    </entry>
-    <entry>
-      <key>${PRICELIST_DEFAULT}</key>
-    </entry>
-    <entry>
-      <key>Customer recommendation</key>
-    </entry>
-    <entry>
-      <key>Other_unknown</key>
-    </entry>
-    <entry>
-      <key>Isle of Man</key>
-    </entry>
-    <entry>
-      <key>Ukraine</key>
-    </entry>
-    <entry>
-      <key>Curaçao</key>
-    </entry>
-    <entry>
-      <key>Anguilla</key>
-    </entry>
-    <entry>
-      <key>Euro</key>
-    </entry>
-    <entry>
-      <key>Product_GUI</key>
-    </entry>
-    <entry>
-      <key>${GENDER_OTHER}</key>
-    </entry>
-    <entry>
-      <key>Turkey</key>
-    </entry>
-    <entry>
-      <key>Belgium</key>
-    </entry>
-    <entry>
-      <key>South Africa</key>
-    </entry>
-    <entry>
-      <key>Trinidad and Tobago</key>
-    </entry>
-    <entry>
-      <key>Bermuda</key>
-    </entry>
-    <entry>
-      <key>Jamaica</key>
-    </entry>
-    <entry>
-      <key>Peru</key>
-    </entry>
-    <entry>
-      <key>Turkmenistan</key>
-    </entry>
-    <entry>
-      <key>Venezuela (Bolivarian Republic of)</key>
-    </entry>
-    <entry>
-      <key>Tokelau</key>
-    </entry>
-    <entry>
-      <key>Hong Kong</key>
-    </entry>
-    <entry>
-      <key>Chad</key>
-    </entry>
-    <entry>
-      <key>German</key>
-    </entry>
-    <entry>
-      <key>Thailand</key>
-    </entry>
-    <entry>
-      <key>in process</key>
-    </entry>
-    <entry>
-      <key>Saint Martin (French part)</key>
-    </entry>
-    <entry>
-      <key>Kuwait</key>
-    </entry>
-    <entry>
-      <key>Palestine, State of</key>
-    </entry>
-    <entry>
-      <key>Croatia</key>
-    </entry>
-    <entry>
-      <key>Cook Islands</key>
-    </entry>
-    <entry>
-      <key>Fair</key>
-    </entry>
-    <entry>
-      <key>Sri Lanka</key>
-    </entry>
-    <entry>
-      <key>Uruguay</key>
-    </entry>
-    <entry>
-      <key>Liberia</key>
-    </entry>
-    <entry>
-      <key>Burkina Faso</key>
-    </entry>
-    <entry>
-      <key>Swiss franc</key>
-    </entry>
-    <entry>
-      <key>Swaziland</key>
-    </entry>
-    <entry>
-      <key>ended</key>
-    </entry>
-    <entry>
-      <key>Saint Barthélemy</key>
-    </entry>
-    <entry>
-      <key>Wallis and Futuna</key>
-    </entry>
-    <entry>
-      <key>Company_industry knowhow</key>
-    </entry>
-    <entry>
-      <key>Monaco</key>
-    </entry>
-    <entry>
-      <key>Spanish</key>
-    </entry>
-    <entry>
-      <key>Hungary</key>
-    </entry>
-    <entry>
-      <key>Réunion</key>
-    </entry>
-    <entry>
-      <key>Japan</key>
-    </entry>
-    <entry>
-      <key>Belarus</key>
-    </entry>
-    <entry>
-      <key>Albania</key>
-    </entry>
-    <entry>
-      <key>Internal sales manager</key>
-    </entry>
-    <entry>
-      <key>Virgin Islands (U.S.)</key>
-    </entry>
-    <entry>
-      <key>New Zealand</key>
-    </entry>
-    <entry>
-      <key>Senegal</key>
-    </entry>
-    <entry>
-      <key>Ethiopia</key>
-    </entry>
-    <entry>
-      <key>Macedonia (the former Yugoslav Republic of)</key>
-    </entry>
-    <entry>
-      <key>Egypt</key>
-    </entry>
-    <entry>
-      <key>Sierra Leone</key>
-    </entry>
-    <entry>
-      <key>Saudi Arabia</key>
-    </entry>
-    <entry>
-      <key>Pakistan</key>
-    </entry>
-    <entry>
-      <key>Gambia</key>
-    </entry>
-    <entry>
-      <key>Qatar</key>
-    </entry>
-    <entry>
-      <key>Slovakia</key>
-    </entry>
-    <entry>
-      <key>Serbia</key>
-    </entry>
-    <entry>
-      <key>Bosnia and Herzegovina</key>
-    </entry>
-    <entry>
-      <key>Framework contract</key>
-    </entry>
-    <entry>
-      <key>Niger</key>
-    </entry>
-    <entry>
-      <key>Rwanda</key>
-    </entry>
-    <entry>
-      <key>French Southern Territories</key>
-    </entry>
-    <entry>
-      <key>Bangladesh</key>
-    </entry>
-    <entry>
-      <key>Barbados</key>
-    </entry>
-    <entry>
-      <key>Botswana</key>
-    </entry>
-    <entry>
-      <key>Saint Vincent and the Grenadines</key>
-    </entry>
-    <entry>
-      <key>Denmark</key>
-    </entry>
-    <entry>
-      <key>Dominican Republic</key>
-    </entry>
-    <entry>
-      <key>Cover letter</key>
-    </entry>
-    <entry>
-      <key>Create receipt</key>
-    </entry>
-    <entry>
-      <key>New time tracking</key>
-    </entry>
-    <entry>
-      <key>MAL</key>
-    </entry>
-    <entry>
-      <key>SQO</key>
-    </entry>
-    <entry>
-      <key>NQC</key>
-    </entry>
-    <entry>
-      <key>MQL</key>
-    </entry>
-    <entry>
-      <key>SAL</key>
-    </entry>
-    <entry>
-      <key>Checkbox</key>
-    </entry>
-    <entry>
-      <key>Numeric value</key>
-    </entry>
-    <entry>
-      <key>decline</key>
-    </entry>
-    <entry>
-      <key>Text</key>
-    </entry>
-    <entry>
-      <key>Group</key>
-    </entry>
-    <entry>
-      <key>Combobox</key>
-    </entry>
-    <entry>
-      <key>tentative</key>
-    </entry>
-    <entry>
-      <key>${NUMBER}</key>
-    </entry>
-    <entry>
-      <key>Name \"%0\" already used for container \"%1\"</key>
-    </entry>
-    <entry>
-      <key>CHAR_VALUE</key>
-    </entry>
-    <entry>
-      <key>Keyword Attribute</key>
-    </entry>
-    <entry>
-      <key>in</key>
-    </entry>
-    <entry>
-      <key>Keyword Attribute Values</key>
-    </entry>
-    <entry>
-      <key>Boolean value</key>
-    </entry>
-    <entry>
-      <key>accept</key>
-    </entry>
-    <entry>
-      <key>The ZIP code does not match the format of the country.</key>
-    </entry>
-    <entry>
-      <key>String value</key>
-    </entry>
-    <entry>
-      <key>The code number is not a valid number.</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
-    </entry>
-    <entry>
-      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
-    </entry>
-    <entry>
-      <key>Object type</key>
-    </entry>
-    <entry>
-      <key>Level</key>
-    </entry>
-    <entry>
-      <key>Print Offer</key>
-    </entry>
-    <entry>
-      <key>Touchpoints</key>
-    </entry>
-    <entry>
-      <key>Days inactive</key>
-    </entry>
-    <entry>
-      <key>Touchpoint</key>
-    </entry>
-    <entry>
-      <key>Combobox Value</key>
-    </entry>
-    <entry>
-      <key>relations</key>
-    </entry>
-    <entry>
-      <key>Time</key>
-    </entry>
-    <entry>
-      <key>New task</key>
-    </entry>
-    <entry>
-      <key>MyTasks</key>
-    </entry>
-    <entry>
-      <key>Show my tasks</key>
-    </entry>
-    <entry>
-      <key>the specified key has to be unique for that container but does already exist</key>
-    </entry>
-    <entry>
-      <key>Tree Entity</key>
-    </entry>
-    <entry>
-      <key>Relationtype</key>
-    </entry>
-    <entry>
-      <key>Tree</key>
-    </entry>
-    <entry>
-      <key>100%</key>
-    </entry>
-    <entry>
-      <key>Mobil</key>
-    </entry>
-    <entry>
-      <key>25%</key>
-    </entry>
-    <entry>
-      <key>50%</key>
-    </entry>
-    <entry>
-      <key>75%</key>
-    </entry>
-    <entry>
-      <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
-    </entry>
-    <entry>
-      <key>competitor</key>
-    </entry>
-    <entry>
-      <key>0%</key>
-    </entry>
-    <entry>
-      <key>acquainted with</key>
-    </entry>
-    <entry>
-      <key>collaboration with</key>
-    </entry>
-    <entry>
-      <key>parent company</key>
-    </entry>
-    <entry>
-      <key>society</key>
-    </entry>
-    <entry>
-      <key>ankle of</key>
-    </entry>
-    <entry>
-      <key>solicits</key>
-    </entry>
-    <entry>
-      <key>child of</key>
-    </entry>
-    <entry>
-      <key>supervisor of</key>
-    </entry>
-    <entry>
-      <key>reports to</key>
-    </entry>
-    <entry>
-      <key>subsidiary</key>
-    </entry>
-    <entry>
-      <key>supported by</key>
-    </entry>
-    <entry>
-      <key>member</key>
-    </entry>
-    <entry>
-      <key>promotion target of</key>
-    </entry>
-    <entry>
-      <key>supports</key>
-    </entry>
-    <entry>
-      <key>parent of</key>
-    </entry>
-    <entry>
-      <key>grandparents of</key>
-    </entry>
-    <entry>
-      <key>Entrydate (Month)</key>
-    </entry>
-    <entry>
-      <key>Entrydate (Day)</key>
-    </entry>
-    <entry>
-      <key>My Dashboard</key>
-    </entry>
-    <entry>
-      <key>Salesdashboard</key>
-    </entry>
-    <entry>
-      <key>Discount %</key>
-    </entry>
-    <entry>
-      <key>Memo</key>
-    </entry>
-    <entry>
-      <key>Function</key>
-    </entry>
-    <entry>
-      <key>Relational</key>
-    </entry>
-    <entry>
-      <key>Only numbers are allowed.</key>
-    </entry>
-    <entry>
-      <key>Superordinate Attribute</key>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_OFFER}</key>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_NEGOTIATION}</key>
-    </entry>
-    <entry>
-      <key>Filesize</key>
-    </entry>
-    <entry>
-      <key>Filename</key>
-    </entry>
-    <entry>
-      <key>Filetype</key>
-    </entry>
-    <entry>
-      <key>Special price list</key>
-    </entry>
-    <entry>
-      <key>New attribute</key>
-    </entry>
-    <entry>
-      <key>MQC</key>
-    </entry>
-    <entry>
-      <key>History</key>
-    </entry>
-    <entry>
-      <key>Progress</key>
-    </entry>
-    <entry>
-      <key>Module</key>
-    </entry>
-    <entry>
-      <key>7 days net</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>carriage free</key>
-    </entry>
-    <entry>
-      <key>8 days 2% discount, 30 days net</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>CIF</key>
-    </entry>
-    <entry>
-      <key>ex works</key>
-    </entry>
-    <entry>
-      <key>30 days net</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>Relation tree</key>
-    </entry>
-    <entry>
-      <key>Directly responsible:</key>
-    </entry>
-    <entry>
-      <key>Payment term</key>
-    </entry>
-    <entry>
-      <key>Contactrole</key>
-    </entry>
-    <entry>
-      <key>Object tree</key>
-    </entry>
-    <entry>
-      <key>New appointment</key>
-    </entry>
-    <entry>
-      <key>&amp;Aufg / Term (%0/%1)</key>
-    </entry>
-    <entry>
-      <key>Verschieben auf Datum?</key>
-    </entry>
-    <entry>
-      <key>niedrig</key>
-    </entry>
-    <entry>
-      <key>Gebucht</key>
-    </entry>
-    <entry>
-      <key>Other Contactroles</key>
-    </entry>
-    <entry>
-      <key>Bitte Datumseingabe prüfen!</key>
-    </entry>
-    <entry>
-      <key>In Bearbeitung</key>
-    </entry>
-    <entry>
-      <key>OK</key>
-    </entry>
-    <entry>
-      <key>Nicht begonnen</key>
-    </entry>
-    <entry>
-      <key>Bitte Filterbedingungen setzen</key>
-    </entry>
-    <entry>
-      <key>Bestätigt</key>
-    </entry>
-    <entry>
-      <key>Vorläufig</key>
-    </entry>
-    <entry>
-      <key>keine</key>
-    </entry>
-    <entry>
-      <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
-    </entry>
-    <entry>
-      <key>Aufgaben von</key>
-    </entry>
-    <entry>
-      <key>&amp;Aufgaben (%0)</key>
-    </entry>
-    <entry>
-      <key>erledigt / zurückgestellt</key>
-    </entry>
-    <entry>
-      <key>hoch</key>
-    </entry>
-    <entry>
-      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
-    </entry>
-    <entry>
-      <key>Zurückgestellt</key>
-    </entry>
-    <entry>
-      <key>Erledigt</key>
-    </entry>
-    <entry>
-      <key>Usages</key>
-    </entry>
-    <entry>
-      <key>Abgesagt</key>
-    </entry>
-    <entry>
-      <key>Außer Haus</key>
-    </entry>
-    <entry>
-      <key>Abbrechen</key>
-    </entry>
-    <entry>
-      <key>Benutzer auswählen</key>
-    </entry>
-    <entry>
-      <key>delegiert</key>
-    </entry>
-    <entry>
-      <key>frei</key>
-    </entry>
-    <entry>
-      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
-    </entry>
-    <entry>
-      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
-    </entry>
-    <entry>
-      <key>normal</key>
-    </entry>
-    <entry>
-      <key>Termine von</key>
-    </entry>
-    <entry>
-      <key>nur Verschiebung in die Zukunft erlaubt!</key>
-    </entry>
-    <entry>
-      <key>Kategorie</key>
-    </entry>
-    <entry>
-      <key>Product content</key>
-    </entry>
-    <entry>
-      <key>Know How</key>
-    </entry>
-    <entry>
-      <key>Personal appearance</key>
-    </entry>
-    <entry>
-      <key>Market situation</key>
-    </entry>
-    <entry>
-      <key>Liquidity</key>
-    </entry>
-    <entry>
-      <key>Price policy</key>
-    </entry>
-    <entry>
-      <key>Approved</key>
-    </entry>
-    <entry>
-      <key>Completed</key>
-    </entry>
-    <entry>
-      <key>In planning</key>
-    </entry>
-    <entry>
-      <key>Campaign Step</key>
-    </entry>
-    <entry>
-      <key>Campaign Participant</key>
-    </entry>
-    <entry>
-      <key>Campaign Steps</key>
-    </entry>
-    <entry>
-      <key>360 Degree</key>
-    </entry>
-    <entry>
-      <key>Campaigns</key>
-    </entry>
-    <entry>
-      <key>Campaign</key>
-    </entry>
-    <entry>
-      <key>Auswertung</key>
-    </entry>
-    <entry>
-      <key>Reihenfolge</key>
-    </entry>
-    <entry>
-      <key>Zuständiger</key>
-    </entry>
-    <entry>
-      <key>Schritte</key>
-    </entry>
-    <entry>
-      <key>Teilnehmer</key>
-    </entry>
-    <entry>
-      <key>VAT in %</key>
-    </entry>
-    <entry>
-      <key>Kampagnen Schritte</key>
-    </entry>
-    <entry>
-      <key>Kampagnenschritte</key>
-    </entry>
-    <entry>
-      <key>Marketing</key>
-    </entry>
-    <entry>
-      <key>Die maximale Anzahl Teilnehmer ist erreicht!</key>
-    </entry>
-    <entry>
-      <key>Neuer Kampagnenschritt</key>
-    </entry>
-    <entry>
-      <key>Kontakteasdasd</key>
-    </entry>
-    <entry>
-      <key>Ende</key>
-    </entry>
-    <entry>
-      <key>Neue Kampagne</key>
-    </entry>
-    <entry>
-      <key>Beginn</key>
-    </entry>
-    <entry>
-      <key>${QUANTITY_LOWER_THAN_1}</key>
-    </entry>
-    <entry>
-      <key>This combination of person and organisation does already exist and can not be created once more.</key>
-    </entry>
-    <entry>
-      <key>New module</key>
-    </entry>
-    <entry>
-      <key>Time in minutes</key>
-    </entry>
-    <entry>
-      <key>Sales manager</key>
-    </entry>
-    <entry>
-      <key>IT</key>
-    </entry>
-    <entry>
-      <key>Administrator</key>
-    </entry>
-    <entry>
-      <key>Managing director</key>
-    </entry>
-    <entry>
-      <key>Production manager</key>
-    </entry>
-    <entry>
-      <key>Production</key>
-    </entry>
-    <entry>
-      <key>CEO</key>
-    </entry>
-    <entry>
-      <key>Purchasing manager</key>
-    </entry>
-    <entry>
-      <key>Marketing manager</key>
-    </entry>
-    <entry>
-      <key>IT manager</key>
-    </entry>
-    <entry>
-      <key>CSO</key>
-    </entry>
-    <entry>
-      <key>Executive board</key>
-    </entry>
-    <entry>
-      <key>Supervisory board</key>
-    </entry>
-    <entry>
-      <key>Management</key>
-    </entry>
-    <entry>
-      <key>date of birth must not be in the future</key>
-    </entry>
-    <entry>
-      <key>Manufacturer</key>
-    </entry>
-    <entry>
-      <key>Prospective customer</key>
-    </entry>
-    <entry>
-      <key>Competitor</key>
-    </entry>
-    <entry>
-      <key>Partner</key>
-    </entry>
-    <entry>
-      <key>Attribute Tree</key>
-    </entry>
-    <entry>
-      <key>True</key>
-    </entry>
-    <entry>
-      <key>False</key>
-    </entry>
-    <entry>
-      <key>false</key>
-    </entry>
-    <entry>
-      <key>true</key>
-    </entry>
-    <entry>
-      <key>Protected</key>
-    </entry>
-    <entry>
-      <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
-    </entry>
-    <entry>
-      <key>Password</key>
-    </entry>
-    <entry>
-      <key>Confirm password</key>
-    </entry>
-    <entry>
-      <key>Set password</key>
-    </entry>
-    <entry>
-      <key>Email</key>
-    </entry>
-    <entry>
-      <key>{$OBJECTLINK_TYPE}</key>
-    </entry>
-    <entry>
-      <key>{$OBJECTLINK_OBJECT}</key>
-    </entry>
-    <entry>
-      <key>Roles</key>
-    </entry>
-    <entry>
-      <key>Password and confirmation must be the same!</key>
-    </entry>
-    <entry>
-      <key>Begin</key>
-    </entry>
-    <entry>
-      <key>Maturity</key>
-    </entry>
-    <entry>
-      <key>Stored selections</key>
-    </entry>
-    <entry>
-      <key>Username</key>
-    </entry>
-    <entry>
-      <key>The person is already associated with another employee!</key>
-    </entry>
-    <entry>
-      <key>Username already exists!</key>
-    </entry>
-    <entry>
-      <key>Salesproject Phases</key>
-    </entry>
-    <entry>
-      <key>Turnover actual year</key>
-    </entry>
-    <entry>
-      <key>Forecast actual year</key>
-    </entry>
-    <entry>
-      <key>This private person doeas already exist and can not be created once more.</key>
-    </entry>
-    <entry>
-      <key>Everyone</key>
-    </entry>
-    <entry>
-      <key>Project</key>
-    </entry>
-    <entry>
-      <key>Human resources</key>
-    </entry>
-    <entry>
-      <key>Project management</key>
-    </entry>
-    <entry>
-      <key>Office staff</key>
-    </entry>
-    <entry>
-      <key>Field staff</key>
-    </entry>
-    <entry>
-      <key>Resource</key>
-    </entry>
-    <entry>
-      <key>Human Resources</key>
-    </entry>
-    <entry>
-      <key>The title already exists!</key>
-    </entry>
-    <entry>
-      <key>Note</key>
-    </entry>
-    <entry>
-      <key>Email must be unique!</key>
-    </entry>
-    <entry>
-      <key>Project Management</key>
-    </entry>
-    <entry>
-      <key>Support</key>
-    </entry>
-    <entry>
-      <key>{$ADDRESS_IDENTIFIER}</key>
-    </entry>
-    <entry>
-      <key>Salesproject phases</key>
-    </entry>
-    <entry>
-      <key>Add to Campaign</key>
-    </entry>
-    <entry>
-      <key>Choose a campaign and a step to add the contact to a  campaign</key>
-    </entry>
-    <entry>
-      <key>Max participants</key>
-    </entry>
-    <entry>
-      <key>Participants</key>
-    </entry>
-    <entry>
-      <key>Add the selection to a campaign</key>
-    </entry>
-    <entry>
-      <key>protected</key>
-    </entry>
-    <entry>
-      <key>participants will be added to the selected campaign step</key>
-    </entry>
-    <entry>
-      <key>Add participants to Campaign</key>
-    </entry>
-    <entry>
-      <key>Object type 1</key>
-    </entry>
-    <entry>
-      <key>Object type 2</key>
-    </entry>
-    <entry>
-      <key>Objectrelation type</key>
-    </entry>
-    <entry>
-      <key>Key figures</key>
-    </entry>
-    <entry>
-      <key>Delete all usage</key>
-    </entry>
-    <entry>
-      <key>Deleted all usages of \"%0\".</key>
-    </entry>
-    <entry>
-      <key>promotion target ofc</key>
-    </entry>
-    <entry>
-      <key>Successful</key>
-    </entry>
-    <entry>
-      <key>Relation type 1</key>
-    </entry>
-    <entry>
-      <key>Relation type 2</key>
-    </entry>
-    <entry>
-      <key>Relation type</key>
-    </entry>
-    <entry>
-      <key>Context 1</key>
-    </entry>
-    <entry>
-      <key>Context 2</key>
-    </entry>
-    <entry>
-      <key>Title 1</key>
-    </entry>
-    <entry>
-      <key>Title 2</key>
-    </entry>
-    <entry>
-      <key>Hierarchy</key>
-    </entry>
-    <entry>
-      <key>Object relation</key>
-    </entry>
-    <entry>
-      <key>Type 2 enabled</key>
-    </entry>
-    <entry>
-      <key>test1eee</key>
-    </entry>
-    <entry>
-      <key>Kennzahlen</key>
-    </entry>
-    <entry>
-      <key>Count</key>
-    </entry>
-    <entry>
-      <key>Forecast actual year </key>
-    </entry>
-    <entry>
-      <key>test2</key>
-    </entry>
-    <entry>
-      <key>Picture</key>
-    </entry>
-    <entry>
-      <key>Chart</key>
-    </entry>
-    <entry>
-      <key>Salesproject Charts</key>
-    </entry>
-    <entry>
-      <key>Relation</key>
-    </entry>
-    <entry>
-      <key>Tochter</key>
-    </entry>
-    <entry>
-      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
-    </entry>
-    <entry>
-      <key>Enable relation type 2</key>
-    </entry>
-    <entry>
-      <key>Salesproject Analyses</key>
-    </entry>
-    <entry>
-      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
-    </entry>
-    <entry>
-      <key>ObjectRelationType</key>
-    </entry>
-    <entry>
-      <key>SalesprojectPhase</key>
-    </entry>
-    <entry>
-      <key>SalesprojectState</key>
-    </entry>
-    <entry>
-      <key>Days count</key>
-    </entry>
-    <entry>
-      <key>Clear forecast and set state to \"%0\"?</key>
-    </entry>
-    <entry>
-      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
-    </entry>
-    <entry>
-      <key>Clear forecast and set state to '%0'?</key>
-    </entry>
-    <entry>
-      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
-    </entry>
-    <entry>
-      <key>This cannot be undone!</key>
-    </entry>
-    <entry>
-      <key>Campaign status</key>
-    </entry>
-    <entry>
-      <key>Set campaign step</key>
-    </entry>
-    <entry>
-      <key>Add participant to Campaign</key>
-    </entry>
-    <entry>
-      <key>Steps</key>
-    </entry>
-    <entry>
-      <key>CampaignStep</key>
-    </entry>
-    <entry>
-      <key>Added</key>
-    </entry>
-    <entry>
-      <key>Current participants</key>
-    </entry>
-    <entry>
-      <key>Overdue tasks</key>
-    </entry>
-    <entry>
-      <key>Open tasks</key>
-    </entry>
-    <entry>
-      <key>[%0]the tableName is not a string after interpreting</key>
-    </entry>
-    <entry>
-      <key>[%0]%1 has to be a string or array but it is %2</key>
-    </entry>
-    <entry>
-      <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
-    </entry>
-    <entry>
-      <key>[%0]the columnName is not a string after interpreting</key>
-    </entry>
-    <entry>
-      <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
-    </entry>
-    <entry>
-      <key>Responsible</key>
-    </entry>
-    <entry>
-      <key>New tasks</key>
-    </entry>
-    <entry>
-      <key>Imminent appointments for today</key>
-    </entry>
-    <entry>
-      <key>Analyses</key>
-    </entry>
-    <entry>
-      <key>Imminent appointments for today </key>
-    </entry>
-    <entry>
-      <key>To-Do</key>
-    </entry>
-    <entry>
-      <key>My Tasks</key>
-    </entry>
-    <entry>
-      <key>Calendar</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
-    </entry>
-    <entry>
-      <key>My tasks</key>
-    </entry>
-    <entry>
-      <key>${ATTRIBUTE_VOID}</key>
-    </entry>
-    <entry>
-      <key>Kampagnenzeitraum</key>
-    </entry>
-    <entry>
-      <key>Hauptverantw.</key>
-    </entry>
-    <entry>
-      <key>New campaign step</key>
-    </entry>
-    <entry>
-      <key>Cost</key>
-    </entry>
-    <entry>
-      <key>file '%0' cannot be read</key>
-    </entry>
-    <entry>
-      <key>Campaign costs</key>
-    </entry>
-    <entry>
-      <key>Importer</key>
-    </entry>
-    <entry>
-      <key>Participant</key>
-    </entry>
-    <entry>
-      <key>Printing costs</key>
-    </entry>
-    <entry>
-      <key>Shipping costs</key>
-    </entry>
-    <entry>
-      <key>yyyy-MM-dd HH:mm:ss</key>
-    </entry>
-    <entry>
-      <key>file '%0' does not exist or you have got no permission on this file</key>
-    </entry>
-    <entry>
-      <key>Zip</key>
-    </entry>
-    <entry>
-      <key>Add to campaign</key>
-    </entry>
-    <entry>
-      <key>Layout costs</key>
-    </entry>
-    <entry>
-      <key>Costs</key>
-    </entry>
-    <entry>
-      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
-    </entry>
-    <entry>
-      <key>Step</key>
-    </entry>
-    <entry>
-      <key>Fix cost</key>
-    </entry>
-    <entry>
-      <key>per</key>
-    </entry>
-    <entry>
-      <key>The minimal count can't be larger than the maximal count!</key>
-    </entry>
-    <entry>
-      <key>The max participants count has to be equal or greater than the count of the current participants!</key>
-    </entry>
-    <entry>
-      <key>Variable costs</key>
-    </entry>
-    <entry>
-      <key>Version number</key>
-    </entry>
-    <entry>
-      <key>Id value</key>
-    </entry>
-    <entry>
-      <key>Order executed</key>
-    </entry>
-    <entry>
-      <key>Liquibase</key>
-    </entry>
-    <entry>
-      <key>Number value</key>
-    </entry>
-    <entry>
-      <key>Author</key>
-    </entry>
-    <entry>
-      <key>Position Id</key>
-    </entry>
-    <entry>
-      <key>ISO3</key>
-    </entry>
-    <entry>
-      <key>ISO2</key>
-    </entry>
-    <entry>
-      <key>Communication Id</key>
-    </entry>
-    <entry>
-      <key>Attribute Id</key>
-    </entry>
-    <entry>
-      <key>Modification user</key>
-    </entry>
-    <entry>
-      <key>Headline</key>
-    </entry>
-    <entry>
-      <key>Salesorder Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject milestone Id</key>
-    </entry>
-    <entry>
-      <key>Appointment Id</key>
-    </entry>
-    <entry>
-      <key>Locked</key>
-    </entry>
-    <entry>
-      <key>Timetracking Id</key>
-    </entry>
-    <entry>
-      <key>Salesorder date</key>
-    </entry>
-    <entry>
-      <key>Exec type</key>
-    </entry>
-    <entry>
-      <key>Date value</key>
-    </entry>
-    <entry>
-      <key>NUMBER VALUE</key>
-    </entry>
-    <entry>
-      <key>Salesproject forecast Id</key>
-    </entry>
-    <entry>
-      <key>ID</key>
-    </entry>
-    <entry>
-      <key>Keyword attribute relation Id</key>
-    </entry>
-    <entry>
-      <key>Minimal count</key>
-    </entry>
-    <entry>
-      <key>Id</key>
-    </entry>
-    <entry>
-      <key>Start date</key>
-    </entry>
-    <entry>
-      <key>Object 1 row Id</key>
-    </entry>
-    <entry>
-      <key>Side</key>
-    </entry>
-    <entry>
-      <key>Salesproject Id</key>
-    </entry>
-    <entry>
-      <key>Product Id</key>
-    </entry>
-    <entry>
-      <key>Sort</key>
-    </entry>
-    <entry>
-      <key>Relation Title</key>
-    </entry>
-    <entry>
-      <key>%0 \"%1\"</key>
-    </entry>
-    <entry>
-      <key>Maximal count</key>
-    </entry>
-    <entry>
-      <key>Data executed</key>
-    </entry>
-    <entry>
-      <key>Indexsearch</key>
-    </entry>
-    <entry>
-      <key>Appointment link Id</key>
-    </entry>
-    <entry>
-      <key>Relation Type</key>
-    </entry>
-    <entry>
-      <key>Salesproject member Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject source Id</key>
-    </entry>
-    <entry>
-      <key>Item sort</key>
-    </entry>
-    <entry>
-      <key>%0 modified.</key>
-    </entry>
-    <entry>
-      <key>Contract Id</key>
-    </entry>
-    <entry>
-      <key>Int value</key>
-    </entry>
-    <entry>
-      <key>Object 2 row Id</key>
-    </entry>
-    <entry>
-      <key>Source tablename Id</key>
-    </entry>
-    <entry>
-      <key>Source tablename</key>
-    </entry>
-    <entry>
-      <key>Contact Id</key>
-    </entry>
-    <entry>
-      <key>Sales area</key>
-    </entry>
-    <entry>
-      <key>Parent Id</key>
-    </entry>
-    <entry>
-      <key>Task link Id</key>
-    </entry>
-    <entry>
-      <key>Protection level</key>
-    </entry>
-    <entry>
-      <key>Salesorder code</key>
-    </entry>
-    <entry>
-      <key>Class</key>
-    </entry>
-    <entry>
-      <key>BOOL VALUE</key>
-    </entry>
-    <entry>
-      <key>Keyword attribute Id</key>
-    </entry>
-    <entry>
-      <key>Log type</key>
-    </entry>
-    <entry>
-      <key>Object row Id</key>
-    </entry>
-    <entry>
-      <key>Labels</key>
-    </entry>
-    <entry>
-      <key>%0 deleted.</key>
-    </entry>
-    <entry>
-      <key>Salesproject competition Id</key>
-    </entry>
-    <entry>
-      <key>Activity Id</key>
-    </entry>
-    <entry>
-      <key>Person Id</key>
-    </entry>
-    <entry>
-      <key>Offer item Id</key>
-    </entry>
-    <entry>
-      <key>Offer Id</key>
-    </entry>
-    <entry>
-      <key>Name native</key>
-    </entry>
-    <entry>
-      <key>Flag</key>
-    </entry>
-    <entry>
-      <key>Address Id</key>
-    </entry>
-    <entry>
-      <key>Name latin</key>
-    </entry>
-    <entry>
-      <key>Destination Id</key>
-    </entry>
-    <entry>
-      <key>Sex</key>
-    </entry>
-    <entry>
-      <key>Product price Id</key>
-    </entry>
-    <entry>
-      <key>%0 added.</key>
-    </entry>
-    <entry>
-      <key>Object Relation Type</key>
-    </entry>
-    <entry>
-      <key>Entry date</key>
-    </entry>
-    <entry>
-      <key>Object relation type 2</key>
-    </entry>
-    <entry>
-      <key>Object relation type 1</key>
-    </entry>
-    <entry>
-      <key>Modification date</key>
-    </entry>
-    <entry>
-      <key>Object Type</key>
-    </entry>
-    <entry>
-      <key>%0 from \"%1\" to \"%2\"</key>
-    </entry>
-    <entry>
-      <key>MD5 Sum</key>
-    </entry>
-    <entry>
-      <key>Letter salutation</key>
-    </entry>
-    <entry>
-      <key>Lock granted</key>
-    </entry>
-    <entry>
-      <key>Required fields</key>
-    </entry>
-    <entry>
-      <key>Address addition</key>
-    </entry>
-    <entry>
-      <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
-    </entry>
-    <entry>
-      <key>Attribute usage Id</key>
-    </entry>
-    <entry>
-      <key>LogHistory</key>
-    </entry>
-    <entry>
-      <key>Locked by</key>
-    </entry>
-    <entry>
-      <key>Desciption</key>
-    </entry>
-    <entry>
-      <key>Salutation Id</key>
-    </entry>
-    <entry>
-      <key>Comments</key>
-    </entry>
-    <entry>
-      <key>Task Id</key>
-    </entry>
-    <entry>
-      <key>Valid to</key>
-    </entry>
-    <entry>
-      <key>ZIP regex</key>
-    </entry>
-    <entry>
-      <key>Keyword entry Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject classification Id</key>
-    </entry>
-    <entry>
-      <key>Stop costs</key>
-    </entry>
-    <entry>
-      <key>Contexts</key>
-    </entry>
-    <entry>
-      <key>Assigned to</key>
-    </entry>
-    <entry>
-      <key>%0 from \"%1\" to %2 \"%3\"</key>
-    </entry>
-    <entry>
-      <key>Date start</key>
-    </entry>
-    <entry>
-      <key>Cover Letter</key>
-    </entry>
-    <entry>
-      <key>Deployment Id</key>
-    </entry>
-    <entry>
-      <key>Address format</key>
-    </entry>
-    <entry>
-      <key>Activity link Id</key>
-    </entry>
-    <entry>
-      <key>Date end</key>
-    </entry>
-    <entry>
-      <key>Creation user</key>
-    </entry>
-    <entry>
-      <key>Unit Price</key>
-    </entry>
-    <entry>
-      <key>Object Id</key>
-    </entry>
-    <entry>
-      <key>Is active</key>
-    </entry>
-    <entry>
-      <key>Product relationship</key>
-    </entry>
-    <entry>
-      <key>Salesorder item Id</key>
-    </entry>
-    <entry>
-      <key>Char value</key>
-    </entry>
-    <entry>
-      <key>Attribute relation Id</key>
-    </entry>
-    <entry>
-      <key>Tag</key>
-    </entry>
-    <entry>
-      <key>Title suffix</key>
-    </entry>
-    <entry>
-      <key>Step costs</key>
-    </entry>
-    <entry>
-      <key>Min. Stock</key>
-    </entry>
-    <entry>
-      <key>User</key>
-    </entry>
-    <entry>
-      <key>Stock Id</key>
-    </entry>
-    <entry>
-      <key>Tablename</key>
-    </entry>
-    <entry>
-      <key>CHAR VALUE</key>
-    </entry>
-    <entry>
-      <key>Parent context</key>
-    </entry>
-    <entry>
-      <key>Organisation Id</key>
-    </entry>
-    <entry>
-      <key>Tablename Id</key>
-    </entry>
-    <entry>
-      <key>Offer date</key>
-    </entry>
-    <entry>
-      <key>Competitors</key>
-    </entry>
-    <entry>
-      <key>Notifications</key>
-    </entry>
-    <entry>
-      <key>Overview</key>
-    </entry>
-    <entry>
-      <key>Participated</key>
-    </entry>
-    <entry>
-      <key>Remaining Runtime</key>
-    </entry>
-    <entry>
-      <key>Document Template</key>
-    </entry>
-    <entry>
-      <key>Document Templates</key>
-    </entry>
-    <entry>
-      <key>Text Modular</key>
-    </entry>
-    <entry>
-      <key>Serial</key>
-    </entry>
-    <entry>
-      <key>Campaign Period</key>
-    </entry>
-    <entry>
-      <key>Single</key>
-    </entry>
-    <entry>
-      <key>Attachment</key>
-    </entry>
-    <entry>
-      <key>Attachments</key>
-    </entry>
-    <entry>
-      <key>Letter</key>
-    </entry>
-    <entry>
-      <key>Appointment</key>
-    </entry>
-    <entry>
-      <key>ARCHIEVED</key>
-    </entry>
-    <entry>
-      <key>UNSEEN</key>
-    </entry>
-    <entry>
-      <key>TODELETE</key>
-    </entry>
-    <entry>
-      <key>CONFIRMED</key>
-    </entry>
-    <entry>
-      <key>SEEN</key>
-    </entry>
-    <entry>
-      <key>rebuild Index</key>
-    </entry>
-    <entry>
-      <key>Charts</key>
-    </entry>
-    <entry>
-      <key>Keywords</key>
-    </entry>
-    <entry>
-      <key>Days running</key>
-    </entry>
-    <entry>
-      <key>Logs</key>
-    </entry>
-    <entry>
-      <key>Mail</key>
-    </entry>
-    <entry>
-      <key>Phonecall</key>
-    </entry>
-    <entry>
-      <key>Chart 2</key>
-    </entry>
-    <entry>
-      <key>Log</key>
-    </entry>
-    <entry>
-      <key>Offer Header Text</key>
-    </entry>
-    <entry>
-      <key>Employees</key>
-    </entry>
-    <entry>
-      <key>Todo</key>
-    </entry>
-    <entry>
-      <key>Days remaining</key>
-    </entry>
-    <entry>
-      <key>Offer Footer Text</key>
-    </entry>
-    <entry>
-      <key>Date new</key>
-    </entry>
-    <entry>
-      <key>Date edit</key>
-    </entry>
-    <entry>
-      <key>Keyword Attributes</key>
-    </entry>
-    <entry>
-      <key>HTML</key>
-    </entry>
-  </keyValueMap>
-  <font name="Dialog" style="0" size="11" />
-  <sqlModels>
-    <languageSql>
-      <name>Data_alias</name>
-      <alias>Data_alias</alias>
-      <statements>
-        <element>select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY
-union
-select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE
-union
-select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
-union
-select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE</element>
-      </statements>
-    </languageSql>
-  </sqlModels>
-</language>
+<?xml version="1.0" encoding="UTF-8"?>
+<language 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/language/1.2.0">
+  <name>_____LANGUAGE_EXTRA</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <keyValueMap>
+    <entry>
+      <key>Company</key>
+    </entry>
+    <entry>
+      <key>E-Mail</key>
+    </entry>
+    <entry>
+      <key>Male</key>
+    </entry>
+    <entry>
+      <key>Activity</key>
+    </entry>
+    <entry>
+      <key>Name</key>
+    </entry>
+    <entry>
+      <key>Austria</key>
+    </entry>
+    <entry>
+      <key>Customercode</key>
+    </entry>
+    <entry>
+      <key>Status</key>
+    </entry>
+    <entry>
+      <key>Active</key>
+    </entry>
+    <entry>
+      <key>Medium</key>
+    </entry>
+    <entry>
+      <key>Internet</key>
+    </entry>
+    <entry>
+      <key>Germany</key>
+    </entry>
+    <entry>
+      <key>Online-Meeting</key>
+    </entry>
+    <entry>
+      <key>Social Media</key>
+    </entry>
+    <entry>
+      <key>Visit</key>
+    </entry>
+    <entry>
+      <key>Information</key>
+    </entry>
+    <entry>
+      <key>Language</key>
+    </entry>
+    <entry>
+      <key>Phone</key>
+    </entry>
+    <entry>
+      <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
+    </entry>
+    <entry>
+      <key>Activities</key>
+    </entry>
+    <entry>
+      <key>Female</key>
+    </entry>
+    <entry>
+      <key>Contactmanagement</key>
+    </entry>
+    <entry>
+      <key>Mobile</key>
+    </entry>
+    <entry>
+      <key>Office address</key>
+    </entry>
+    <entry>
+      <key>${HIGHER_THAN_MAX} max: %0</key>
+    </entry>
+    <entry>
+      <key>Contact</key>
+    </entry>
+    <entry>
+      <key>Home address</key>
+    </entry>
+    <entry>
+      <key>Type</key>
+    </entry>
+    <entry>
+      <key>Contacts</key>
+    </entry>
+    <entry>
+      <key>Norway</key>
+    </entry>
+    <entry>
+      <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
+    </entry>
+    <entry>
+      <key>Address</key>
+    </entry>
+    <entry>
+      <key>Addresses</key>
+    </entry>
+    <entry>
+      <key>${COMM_ADDRESS}</key>
+    </entry>
+    <entry>
+      <key>Gender</key>
+    </entry>
+    <entry>
+      <key>Date of birth</key>
+    </entry>
+    <entry>
+      <key>Lastname</key>
+    </entry>
+    <entry>
+      <key>Salutation</key>
+    </entry>
+    <entry>
+      <key>Middlename</key>
+    </entry>
+    <entry>
+      <key>Title</key>
+    </entry>
+    <entry>
+      <key>Addresstype</key>
+    </entry>
+    <entry>
+      <key>Firstname</key>
+    </entry>
+    <entry>
+      <key>Description</key>
+    </entry>
+    <entry>
+      <key>Direction</key>
+    </entry>
+    <entry>
+      <key>Entrydate</key>
+    </entry>
+    <entry>
+      <key>Subject</key>
+    </entry>
+    <entry>
+      <key>Post office box</key>
+    </entry>
+    <entry>
+      <key>Delivery address</key>
+    </entry>
+    <entry>
+      <key>House number</key>
+    </entry>
+    <entry>
+      <key>Country</key>
+    </entry>
+    <entry>
+      <key>Communication</key>
+    </entry>
+    <entry>
+      <key>postcode</key>
+    </entry>
+    <entry>
+      <key>City</key>
+    </entry>
+    <entry>
+      <key>State</key>
+    </entry>
+    <entry>
+      <key>Region</key>
+    </entry>
+    <entry>
+      <key>District</key>
+    </entry>
+    <entry>
+      <key>Switzerland</key>
+    </entry>
+    <entry>
+      <key>Internal (2)</key>
+    </entry>
+    <entry>
+      <key>Company Addresses</key>
+    </entry>
+    <entry>
+      <key>yyyyMMdd</key>
+    </entry>
+    <entry>
+      <key>standard address</key>
+    </entry>
+    <entry>
+      <key>PP</key>
+    </entry>
+    <entry>
+      <key>VAT</key>
+    </entry>
+    <entry>
+      <key>The expiry date must be after the start date!</key>
+    </entry>
+    <entry>
+      <key>Product</key>
+    </entry>
+    <entry>
+      <key>Developer</key>
+    </entry>
+    <entry>
+      <key>Valid until</key>
+    </entry>
+    <entry>
+      <key>Price list</key>
+    </entry>
+    <entry>
+      <key>Currency</key>
+    </entry>
+    <entry>
+      <key>Payment method</key>
+    </entry>
+    <entry>
+      <key>Price list / Company</key>
+    </entry>
+    <entry>
+      <key>Curr. sales price</key>
+    </entry>
+    <entry>
+      <key>Contract</key>
+    </entry>
+    <entry>
+      <key>Stock</key>
+    </entry>
+    <entry>
+      <key>PP/SP</key>
+    </entry>
+    <entry>
+      <key>Next due date</key>
+    </entry>
+    <entry>
+      <key>Discount</key>
+    </entry>
+    <entry>
+      <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
+    </entry>
+    <entry>
+      <key>Sales</key>
+    </entry>
+    <entry>
+      <key>Contract number</key>
+    </entry>
+    <entry>
+      <key>Min. stock</key>
+    </entry>
+    <entry>
+      <key>SP</key>
+    </entry>
+    <entry>
+      <key>Commodity group 3</key>
+    </entry>
+    <entry>
+      <key>Commodity group 2</key>
+    </entry>
+    <entry>
+      <key>Commodity group 1</key>
+    </entry>
+    <entry>
+      <key>Contract start date</key>
+    </entry>
+    <entry>
+      <key>Spare parts</key>
+    </entry>
+    <entry>
+      <key>Unit</key>
+    </entry>
+    <entry>
+      <key>Contract expiry date</key>
+    </entry>
+    <entry>
+      <key>Yes</key>
+    </entry>
+    <entry>
+      <key>Type of contract</key>
+    </entry>
+    <entry>
+      <key>No</key>
+    </entry>
+    <entry>
+      <key>Service</key>
+    </entry>
+    <entry>
+      <key>Cancelled</key>
+    </entry>
+    <entry>
+      <key>Advertising material</key>
+    </entry>
+    <entry>
+      <key>Valid from</key>
+    </entry>
+    <entry>
+      <key>Product name</key>
+    </entry>
+    <entry>
+      <key>Product group</key>
+    </entry>
+    <entry>
+      <key>${CONTRACT_STATUS}</key>
+    </entry>
+    <entry>
+      <key>From no. of units</key>
+    </entry>
+    <entry>
+      <key>Price</key>
+    </entry>
+    <entry>
+      <key>Conditions</key>
+    </entry>
+    <entry>
+      <key>Standard</key>
+    </entry>
+    <entry>
+      <key>I / O</key>
+    </entry>
+    <entry>
+      <key>Date</key>
+    </entry>
+    <entry>
+      <key>IN</key>
+    </entry>
+    <entry>
+      <key>OUT</key>
+    </entry>
+    <entry>
+      <key>Warehouse</key>
+    </entry>
+    <entry>
+      <key>Reference</key>
+    </entry>
+    <entry>
+      <key>The contract number already exists!</key>
+    </entry>
+    <entry>
+      <key>The product number already exists!</key>
+    </entry>
+    <entry>
+      <key>Quantity</key>
+    </entry>
+    <entry>
+      <key>Salesproject</key>
+    </entry>
+    <entry>
+      <key>Rollout</key>
+    </entry>
+    <entry>
+      <key>Phase</key>
+    </entry>
+    <entry>
+      <key>Product number</key>
+    </entry>
+    <entry>
+      <key>Project number</key>
+    </entry>
+    <entry>
+      <key>Project title</key>
+    </entry>
+    <entry>
+      <key>Project start</key>
+    </entry>
+    <entry>
+      <key>Volume</key>
+    </entry>
+    <entry>
+      <key>Partial order</key>
+    </entry>
+    <entry>
+      <key>Open</key>
+    </entry>
+    <entry>
+      <key>Lost</key>
+    </entry>
+    <entry>
+      <key>Order</key>
+    </entry>
+    <entry>
+      <key>Postponed</key>
+    </entry>
+    <entry>
+      <key>Aborted</key>
+    </entry>
+    <entry>
+      <key>Negotiation</key>
+    </entry>
+    <entry>
+      <key>Workshop</key>
+    </entry>
+    <entry>
+      <key>Presentation preparation</key>
+    </entry>
+    <entry>
+      <key>Specifications in progress</key>
+    </entry>
+    <entry>
+      <key>Project decision</key>
+    </entry>
+    <entry>
+      <key>Lead</key>
+    </entry>
+    <entry>
+      <key>Total net</key>
+    </entry>
+    <entry>
+      <key>Offer</key>
+    </entry>
+    <entry>
+      <key>Offer number</key>
+    </entry>
+    <entry>
+      <key>Probability</key>
+    </entry>
+    <entry>
+      <key>Total VAT</key>
+    </entry>
+    <entry>
+      <key>The offer number already exists!</key>
+    </entry>
+    <entry>
+      <key>0 %</key>
+    </entry>
+    <entry>
+      <key>75 %</key>
+    </entry>
+    <entry>
+      <key>100 %</key>
+    </entry>
+    <entry>
+      <key>25 %</key>
+    </entry>
+    <entry>
+      <key>50 %</key>
+    </entry>
+    <entry>
+      <key>Won</key>
+    </entry>
+    <entry>
+      <key>Checked</key>
+    </entry>
+    <entry>
+      <key>Sent</key>
+    </entry>
+    <entry>
+      <key>Offeritems</key>
+    </entry>
+    <entry>
+      <key>Header text</key>
+    </entry>
+    <entry>
+      <key>Commodity group</key>
+    </entry>
+    <entry>
+      <key>Footer text</key>
+    </entry>
+    <entry>
+      <key>Designation</key>
+    </entry>
+    <entry>
+      <key>Position</key>
+    </entry>
+    <entry>
+      <key>Optional</key>
+    </entry>
+    <entry>
+      <key>Article</key>
+    </entry>
+    <entry>
+      <key>Offeritem</key>
+    </entry>
+    <entry>
+      <key>Sum</key>
+    </entry>
+    <entry>
+      <key>Option4</key>
+    </entry>
+    <entry>
+      <key>Option3</key>
+    </entry>
+    <entry>
+      <key>Option2</key>
+    </entry>
+    <entry>
+      <key>Option1</key>
+    </entry>
+    <entry>
+      <key>Countries</key>
+    </entry>
+    <entry>
+      <key>Options</key>
+    </entry>
+    <entry>
+      <key>Total gross</key>
+    </entry>
+    <entry>
+      <key>Identical price list found!</key>
+    </entry>
+    <entry>
+      <key>Parts list</key>
+    </entry>
+    <entry>
+      <key>${THOUSAND_SHORT}</key>
+    </entry>
+    <entry>
+      <key>Deliver opinion</key>
+    </entry>
+    <entry>
+      <key>Presentation follow-up</key>
+    </entry>
+    <entry>
+      <key>Waiting for requirements</key>
+    </entry>
+    <entry>
+      <key>Parent</key>
+    </entry>
+    <entry>
+      <key>${EURO_SIGN}</key>
+    </entry>
+    <entry>
+      <key>Planned</key>
+    </entry>
+    <entry>
+      <key>Info</key>
+    </entry>
+    <entry>
+      <key>${VOLUME_MONEY}</key>
+    </entry>
+    <entry>
+      <key>Milestones</key>
+    </entry>
+    <entry>
+      <key>Milestone</key>
+    </entry>
+    <entry>
+      <key>Excreted</key>
+    </entry>
+    <entry>
+      <key>Reason</key>
+    </entry>
+    <entry>
+      <key>Document</key>
+    </entry>
+    <entry>
+      <key>Competition</key>
+    </entry>
+    <entry>
+      <key>Forecast</key>
+    </entry>
+    <entry>
+      <key>Datei</key>
+    </entry>
+    <entry>
+      <key>Role</key>
+    </entry>
+    <entry>
+      <key>End date</key>
+    </entry>
+    <entry>
+      <key>Documents</key>
+    </entry>
+    <entry>
+      <key>New offer version</key>
+    </entry>
+    <entry>
+      <key>Copy offer</key>
+    </entry>
+    <entry>
+      <key>Vers. no.</key>
+    </entry>
+    <entry>
+      <key>Curr. purchase price</key>
+    </entry>
+    <entry>
+      <key>Contracts</key>
+    </entry>
+    <entry>
+      <key>Classification</key>
+    </entry>
+    <entry>
+      <key>Class A</key>
+    </entry>
+    <entry>
+      <key>Class C</key>
+    </entry>
+    <entry>
+      <key>Class B</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
+    </entry>
+    <entry>
+      <key>High price strategy</key>
+    </entry>
+    <entry>
+      <key>Low price strategy</key>
+    </entry>
+    <entry>
+      <key>Uid</key>
+    </entry>
+    <entry>
+      <key>in 6 Months</key>
+    </entry>
+    <entry>
+      <key>Budget (Project)</key>
+    </entry>
+    <entry>
+      <key>to</key>
+    </entry>
+    <entry>
+      <key>Other</key>
+    </entry>
+    <entry>
+      <key>Individual</key>
+    </entry>
+    <entry>
+      <key>Organisation</key>
+    </entry>
+    <entry>
+      <key>Base</key>
+    </entry>
+    <entry>
+      <key>in 12 Months</key>
+    </entry>
+    <entry>
+      <key>Standard / Individual</key>
+    </entry>
+    <entry>
+      <key>Please update the ${FORECAST_ENGLISH}.</key>
+    </entry>
+    <entry>
+      <key>no Project planned</key>
+    </entry>
+    <entry>
+      <key>Strength 3</key>
+    </entry>
+    <entry>
+      <key>Strength 1</key>
+    </entry>
+    <entry>
+      <key>Strength 2</key>
+    </entry>
+    <entry>
+      <key>Value</key>
+    </entry>
+    <entry>
+      <key>Weakness 1</key>
+    </entry>
+    <entry>
+      <key>Weakness 2</key>
+    </entry>
+    <entry>
+      <key>Weakness 3</key>
+    </entry>
+    <entry>
+      <key>Projectstart</key>
+    </entry>
+    <entry>
+      <key>no valid format</key>
+    </entry>
+    <entry>
+      <key>Pos.</key>
+    </entry>
+    <entry>
+      <key>ISO 3166-1 alpha-3</key>
+    </entry>
+    <entry>
+      <key>ISO 3166-1 alpha-2</key>
+    </entry>
+    <entry>
+      <key>0.00</key>
+    </entry>
+    <entry>
+      <key>Relationship</key>
+    </entry>
+    <entry>
+      <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
+    </entry>
+    <entry>
+      <key>Native Name</key>
+    </entry>
+    <entry>
+      <key>#,##0</key>
+    </entry>
+    <entry>
+      <key>New offer</key>
+    </entry>
+    <entry>
+      <key>dd.MM.yyyy</key>
+    </entry>
+    <entry>
+      <key>Edit defaults</key>
+    </entry>
+    <entry>
+      <key>no valid mail-address format</key>
+    </entry>
+    <entry>
+      <key>#,##0.00</key>
+    </entry>
+    <entry>
+      <key>Latin Name</key>
+    </entry>
+    <entry>
+      <key>Organisation name</key>
+    </entry>
+    <entry>
+      <key>Connection</key>
+    </entry>
+    <entry>
+      <key>standard email</key>
+    </entry>
+    <entry>
+      <key>Creator</key>
+    </entry>
+    <entry>
+      <key>Timetracking</key>
+    </entry>
+    <entry>
+      <key>Further informations</key>
+    </entry>
+    <entry>
+      <key>Social</key>
+    </entry>
+    <entry>
+      <key>Facebook Feed</key>
+    </entry>
+    <entry>
+      <key>Group1</key>
+    </entry>
+    <entry>
+      <key>Group2</key>
+    </entry>
+    <entry>
+      <key>Details</key>
+    </entry>
+    <entry>
+      <key>Prices</key>
+    </entry>
+    <entry>
+      <key>Twitter</key>
+    </entry>
+    <entry>
+      <key>Connections</key>
+    </entry>
+    <entry>
+      <key>Object</key>
+    </entry>
+    <entry>
+      <key>Attributes</key>
+    </entry>
+    <entry>
+      <key>Facebook</key>
+    </entry>
+    <entry>
+      <key>Creation date</key>
+    </entry>
+    <entry>
+      <key>Maindocuments</key>
+    </entry>
+    <entry>
+      <key>Receipt</key>
+    </entry>
+    <entry>
+      <key>Receipt number</key>
+    </entry>
+    <entry>
+      <key>Year</key>
+    </entry>
+    <entry>
+      <key>New receipt version</key>
+    </entry>
+    <entry>
+      <key>Orderitems</key>
+    </entry>
+    <entry>
+      <key>Sent receipts</key>
+    </entry>
+    <entry>
+      <key>Copy receipt</key>
+    </entry>
+    <entry>
+      <key>Orderitem</key>
+    </entry>
+    <entry>
+      <key>The order number already exists!</key>
+    </entry>
+    <entry>
+      <key>New activity</key>
+    </entry>
+    <entry>
+      <key>Turnover</key>
+    </entry>
+    <entry>
+      <key>Sent offers</key>
+    </entry>
+    <entry>
+      <key>Show all activities</key>
+    </entry>
+    <entry>
+      <key>Offers</key>
+    </entry>
+    <entry>
+      <key>Show all sent offers</key>
+    </entry>
+    <entry>
+      <key>Show my activities</key>
+    </entry>
+    <entry>
+      <key>Show all receipts</key>
+    </entry>
+    <entry>
+      <key>Receipts</key>
+    </entry>
+    <entry>
+      <key>My Activities</key>
+    </entry>
+    <entry>
+      <key>Show all offers</key>
+    </entry>
+    <entry>
+      <key>Show all products</key>
+    </entry>
+    <entry>
+      <key>Show all Facebook posts of a user</key>
+    </entry>
+    <entry>
+      <key>Show all tweets of a user</key>
+    </entry>
+    <entry>
+      <key>Show all companies</key>
+    </entry>
+    <entry>
+      <key>Show all tweets of ADITO</key>
+    </entry>
+    <entry>
+      <key>Show all sent receipts</key>
+    </entry>
+    <entry>
+      <key>Products</key>
+    </entry>
+    <entry>
+      <key>Show all Facebook posts of ADITO</key>
+    </entry>
+    <entry>
+      <key>Companies</key>
+    </entry>
+    <entry>
+      <key>Show all contacts</key>
+    </entry>
+    <entry>
+      <key>Show open salesprojects</key>
+    </entry>
+    <entry>
+      <key>Show all contracts</key>
+    </entry>
+    <entry>
+      <key>Salesprojects</key>
+    </entry>
+    <entry>
+      <key>Show all salesprojects</key>
+    </entry>
+    <entry>
+      <key>Open salesprojects</key>
+    </entry>
+    <entry>
+      <key>July</key>
+    </entry>
+    <entry>
+      <key>ADITO Facebook Feed</key>
+    </entry>
+    <entry>
+      <key>ADITO Twitter Feed</key>
+    </entry>
+    <entry>
+      <key>June</key>
+    </entry>
+    <entry>
+      <key>October</key>
+    </entry>
+    <entry>
+      <key>Take price</key>
+    </entry>
+    <entry>
+      <key>Twitter Feed</key>
+    </entry>
+    <entry>
+      <key>November</key>
+    </entry>
+    <entry>
+      <key>December</key>
+    </entry>
+    <entry>
+      <key>May</key>
+    </entry>
+    <entry>
+      <key>April</key>
+    </entry>
+    <entry>
+      <key>January</key>
+    </entry>
+    <entry>
+      <key>March</key>
+    </entry>
+    <entry>
+      <key>September</key>
+    </entry>
+    <entry>
+      <key>August</key>
+    </entry>
+    <entry>
+      <key>Category</key>
+    </entry>
+    <entry>
+      <key>February</key>
+    </entry>
+    <entry>
+      <key>Abomodel</key>
+    </entry>
+    <entry>
+      <key>Confirmed</key>
+    </entry>
+    <entry>
+      <key>OutOfOffice</key>
+    </entry>
+    <entry>
+      <key>Articledescription</key>
+    </entry>
+    <entry>
+      <key>Articlenumber</key>
+    </entry>
+    <entry>
+      <key>Industry 3</key>
+    </entry>
+    <entry>
+      <key>Industry 2</key>
+    </entry>
+    <entry>
+      <key>Industry 1</key>
+    </entry>
+    <entry>
+      <key>Industry</key>
+    </entry>
+    <entry>
+      <key>Put Reciever Into To</key>
+    </entry>
+    <entry>
+      <key>Unitprice</key>
+    </entry>
+    <entry>
+      <key>Free</key>
+    </entry>
+    <entry>
+      <key>From</key>
+    </entry>
+    <entry>
+      <key>Total</key>
+    </entry>
+    <entry>
+      <key>yearly series not specified</key>
+    </entry>
+    <entry>
+      <key>no standard email office</key>
+    </entry>
+    <entry>
+      <key>Conditions of payment</key>
+    </entry>
+    <entry>
+      <key>Number</key>
+    </entry>
+    <entry>
+      <key>Amount</key>
+    </entry>
+    <entry>
+      <key>Deliveryspecification</key>
+    </entry>
+    <entry>
+      <key>Ignore daily series</key>
+    </entry>
+    <entry>
+      <key>Tentative</key>
+    </entry>
+    <entry>
+      <key>Ignore series</key>
+    </entry>
+    <entry>
+      <key>Plus Salestax</key>
+    </entry>
+    <entry>
+      <key>Choose address</key>
+    </entry>
+    <entry>
+      <key>Customer Base Sheet</key>
+    </entry>
+    <entry>
+      <key>{$TASK_STATUS}</key>
+    </entry>
+    <entry>
+      <key>Task</key>
+    </entry>
+    <entry>
+      <key>subject</key>
+    </entry>
+    <entry>
+      <key>{$TASK_REQUESTOR}</key>
+    </entry>
+    <entry>
+      <key>task number</key>
+    </entry>
+    <entry>
+      <key>{$TASK_EDITOR}</key>
+    </entry>
+    <entry>
+      <key>description</key>
+    </entry>
+    <entry>
+      <key>priority</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_HIGH}</key>
+    </entry>
+    <entry>
+      <key>Seite</key>
+    </entry>
+    <entry>
+      <key>Senden per E-Mail</key>
+    </entry>
+    <entry>
+      <key>Hauptdokument</key>
+    </entry>
+    <entry>
+      <key>Betreff</key>
+    </entry>
+    <entry>
+      <key>title</key>
+    </entry>
+    <entry>
+      <key>von</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_LOW}</key>
+    </entry>
+    <entry>
+      <key>Nur Eigene anzeigen</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_NORMAL}</key>
+    </entry>
+    <entry>
+      <key>Beschreibung</key>
+    </entry>
+    <entry>
+      <key>Unit price</key>
+    </entry>
+    <entry>
+      <key>Firma</key>
+    </entry>
+    <entry>
+      <key>type</key>
+    </entry>
+    <entry>
+      <key>Benutzer</key>
+    </entry>
+    <entry>
+      <key>Schlüsselwort</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_NONE}</key>
+    </entry>
+    <entry>
+      <key>Termin</key>
+    </entry>
+    <entry>
+      <key>Vorschau</key>
+    </entry>
+    <entry>
+      <key>Angebot</key>
+    </entry>
+    <entry>
+      <key>details</key>
+    </entry>
+    <entry>
+      <key>Contact type</key>
+    </entry>
+    <entry>
+      <key>Communication data</key>
+    </entry>
+    <entry>
+      <key>Remark</key>
+    </entry>
+    <entry>
+      <key>Department</key>
+    </entry>
+    <entry>
+      <key>Tasks</key>
+    </entry>
+    <entry>
+      <key>Employee</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_MEMBER}</key>
+    </entry>
+    <entry>
+      <key>responsible</key>
+    </entry>
+    <entry>
+      <key>Kundenstammblatt</key>
+    </entry>
+    <entry>
+      <key>Person</key>
+    </entry>
+    <entry>
+      <key>Detail</key>
+    </entry>
+    <entry>
+      <key>Object 2</key>
+    </entry>
+    <entry>
+      <key>Object 1</key>
+    </entry>
+    <entry>
+      <key>Type 2</key>
+    </entry>
+    <entry>
+      <key>Type 1</key>
+    </entry>
+    <entry>
+      <key>Relations</key>
+    </entry>
+    <entry>
+      <key>${FORECAST_ENGLISH}</key>
+    </entry>
+    <entry>
+      <key>Usage</key>
+    </entry>
+    <entry>
+      <key>Maximal Count</key>
+    </entry>
+    <entry>
+      <key>Minimal Count</key>
+    </entry>
+    <entry>
+      <key>${ADDRESS_STATE}</key>
+    </entry>
+    <entry>
+      <key>Title (original language)</key>
+    </entry>
+    <entry>
+      <key>Attribute Relation</key>
+    </entry>
+    <entry>
+      <key>Attribute Usage</key>
+    </entry>
+    <entry>
+      <key>Key</key>
+    </entry>
+    <entry>
+      <key>Attribute</key>
+    </entry>
+    <entry>
+      <key>Container</key>
+    </entry>
+    <entry>
+      <key>Administration</key>
+    </entry>
+    <entry>
+      <key>Keyword</key>
+    </entry>
+    <entry>
+      <key>Sorting</key>
+    </entry>
+    <entry>
+      <key>jdito</key>
+    </entry>
+    <entry>
+      <key>Time expenses</key>
+    </entry>
+    <entry>
+      <key>Context id</key>
+    </entry>
+    <entry>
+      <key>Context name</key>
+    </entry>
+    <entry>
+      <key>Cambodia</key>
+    </entry>
+    <entry>
+      <key>Resigned</key>
+    </entry>
+    <entry>
+      <key>Customer</key>
+    </entry>
+    <entry>
+      <key>Outgoing</key>
+    </entry>
+    <entry>
+      <key>Paraguay</key>
+    </entry>
+    <entry>
+      <key>Solomon Islands</key>
+    </entry>
+    <entry>
+      <key>Montserrat</key>
+    </entry>
+    <entry>
+      <key>Guadeloupe</key>
+    </entry>
+    <entry>
+      <key>Product_technic</key>
+    </entry>
+    <entry>
+      <key>Moldova (Republic of)</key>
+    </entry>
+    <entry>
+      <key>Seychelles</key>
+    </entry>
+    <entry>
+      <key>Canadian dollar</key>
+    </entry>
+    <entry>
+      <key>Bahrain</key>
+    </entry>
+    <entry>
+      <key>Comoros</key>
+    </entry>
+    <entry>
+      <key>Faroe Islands</key>
+    </entry>
+    <entry>
+      <key>Finland</key>
+    </entry>
+    <entry>
+      <key>Project_duration</key>
+    </entry>
+    <entry>
+      <key>Company_internationality</key>
+    </entry>
+    <entry>
+      <key>Eritrea</key>
+    </entry>
+    <entry>
+      <key>Puerto Rico</key>
+    </entry>
+    <entry>
+      <key>Viet Nam</key>
+    </entry>
+    <entry>
+      <key>Libya</key>
+    </entry>
+    <entry>
+      <key>French</key>
+    </entry>
+    <entry>
+      <key>Cocos (Keeling) Islands</key>
+    </entry>
+    <entry>
+      <key>Saint Helena, Ascension and Tristan da Cunha</key>
+    </entry>
+    <entry>
+      <key>Liechtenstein</key>
+    </entry>
+    <entry>
+      <key>Product_functionality</key>
+    </entry>
+    <entry>
+      <key>Bulgaria</key>
+    </entry>
+    <entry>
+      <key>Jordan</key>
+    </entry>
+    <entry>
+      <key>Côte d'Ivoire</key>
+    </entry>
+    <entry>
+      <key>United Arab Emirates</key>
+    </entry>
+    <entry>
+      <key>Kenya</key>
+    </entry>
+    <entry>
+      <key>None, individual count</key>
+    </entry>
+    <entry>
+      <key>French Polynesia</key>
+    </entry>
+    <entry>
+      <key>Djibouti</key>
+    </entry>
+    <entry>
+      <key>Cuba</key>
+    </entry>
+    <entry>
+      <key>Saint Lucia</key>
+    </entry>
+    <entry>
+      <key>Mayotte</key>
+    </entry>
+    <entry>
+      <key>Israel</key>
+    </entry>
+    <entry>
+      <key>San Marino</key>
+    </entry>
+    <entry>
+      <key>Tajikistan</key>
+    </entry>
+    <entry>
+      <key>Warehouse 2</key>
+    </entry>
+    <entry>
+      <key>Warehouse 1</key>
+    </entry>
+    <entry>
+      <key>Gibraltar</key>
+    </entry>
+    <entry>
+      <key>Warehouse 3</key>
+    </entry>
+    <entry>
+      <key>Cyprus</key>
+    </entry>
+    <entry>
+      <key>Semiannually</key>
+    </entry>
+    <entry>
+      <key>Northern Mariana Islands</key>
+    </entry>
+    <entry>
+      <key>Malaysia</key>
+    </entry>
+    <entry>
+      <key>Armenia</key>
+    </entry>
+    <entry>
+      <key>Brazil</key>
+    </entry>
+    <entry>
+      <key>Turks and Caicos Islands</key>
+    </entry>
+    <entry>
+      <key>Cabo Verde</key>
+    </entry>
+    <entry>
+      <key>Ecuador</key>
+    </entry>
+    <entry>
+      <key>Iran (Islamic Republic of)</key>
+    </entry>
+    <entry>
+      <key>Decision maker</key>
+    </entry>
+    <entry>
+      <key>Lao People's Democratic Republic</key>
+    </entry>
+    <entry>
+      <key>Maintenance contract</key>
+    </entry>
+    <entry>
+      <key>United States Minor Outlying Islands</key>
+    </entry>
+    <entry>
+      <key>Italy</key>
+    </entry>
+    <entry>
+      <key>${ORGTYPE_OTHER}</key>
+    </entry>
+    <entry>
+      <key>Haiti</key>
+    </entry>
+    <entry>
+      <key>Afghanistan</key>
+    </entry>
+    <entry>
+      <key>Russian Federation</key>
+    </entry>
+    <entry>
+      <key>waiting</key>
+    </entry>
+    <entry>
+      <key>American Samoa</key>
+    </entry>
+    <entry>
+      <key>Korea (Democratic People's Republic of)</key>
+    </entry>
+    <entry>
+      <key>United States dollar</key>
+    </entry>
+    <entry>
+      <key>Kyrgyzstan</key>
+    </entry>
+    <entry>
+      <key>Togo</key>
+    </entry>
+    <entry>
+      <key>Other_existing Customer</key>
+    </entry>
+    <entry>
+      <key>Uzbekistan</key>
+    </entry>
+    <entry>
+      <key>Dominica</key>
+    </entry>
+    <entry>
+      <key>Benin</key>
+    </entry>
+    <entry>
+      <key>Liter</key>
+    </entry>
+    <entry>
+      <key>Virgin Islands (British)</key>
+    </entry>
+    <entry>
+      <key>Sudan</key>
+    </entry>
+    <entry>
+      <key>Portugal</key>
+    </entry>
+    <entry>
+      <key>Grenada</key>
+    </entry>
+    <entry>
+      <key>Latvia</key>
+    </entry>
+    <entry>
+      <key>Mongolia</key>
+    </entry>
+    <entry>
+      <key>Morocco</key>
+    </entry>
+    <entry>
+      <key>Guatemala</key>
+    </entry>
+    <entry>
+      <key>Pieces</key>
+    </entry>
+    <entry>
+      <key>Heard Island and McDonald Islands</key>
+    </entry>
+    <entry>
+      <key>Incoming</key>
+    </entry>
+    <entry>
+      <key>Ghana</key>
+    </entry>
+    <entry>
+      <key>Holy See</key>
+    </entry>
+    <entry>
+      <key>India</key>
+    </entry>
+    <entry>
+      <key>Canada</key>
+    </entry>
+    <entry>
+      <key>Maldives</key>
+    </entry>
+    <entry>
+      <key>Service contract</key>
+    </entry>
+    <entry>
+      <key>Taiwan</key>
+    </entry>
+    <entry>
+      <key>Central African Republic</key>
+    </entry>
+    <entry>
+      <key>Fiji</key>
+    </entry>
+    <entry>
+      <key>Guinea</key>
+    </entry>
+    <entry>
+      <key>Somalia</key>
+    </entry>
+    <entry>
+      <key>Sao Tome and Principe</key>
+    </entry>
+    <entry>
+      <key>United Kingdom of Great Britain and Northern Ireland</key>
+    </entry>
+    <entry>
+      <key>Equatorial Guinea</key>
+    </entry>
+    <entry>
+      <key>Kiribati</key>
+    </entry>
+    <entry>
+      <key>Costa Rica</key>
+    </entry>
+    <entry>
+      <key>Supplier</key>
+    </entry>
+    <entry>
+      <key>Nigeria</key>
+    </entry>
+    <entry>
+      <key>Syrian Arab Republic</key>
+    </entry>
+    <entry>
+      <key>Timor-Leste</key>
+    </entry>
+    <entry>
+      <key>Product_mobile use</key>
+    </entry>
+    <entry>
+      <key>Samoa</key>
+    </entry>
+    <entry>
+      <key>Spain</key>
+    </entry>
+    <entry>
+      <key>Palau</key>
+    </entry>
+    <entry>
+      <key>Prospect</key>
+    </entry>
+    <entry>
+      <key>Estonia</key>
+    </entry>
+    <entry>
+      <key>Not signed yet</key>
+    </entry>
+    <entry>
+      <key>Niue</key>
+    </entry>
+    <entry>
+      <key>Mozambique</key>
+    </entry>
+    <entry>
+      <key>El Salvador</key>
+    </entry>
+    <entry>
+      <key>Guam</key>
+    </entry>
+    <entry>
+      <key>Lesotho</key>
+    </entry>
+    <entry>
+      <key>Tonga</key>
+    </entry>
+    <entry>
+      <key>Western Sahara</key>
+    </entry>
+    <entry>
+      <key>new</key>
+    </entry>
+    <entry>
+      <key>Adviser</key>
+    </entry>
+    <entry>
+      <key>Company_size</key>
+    </entry>
+    <entry>
+      <key>Republic of Kosovo</key>
+    </entry>
+    <entry>
+      <key>South Sudan</key>
+    </entry>
+    <entry>
+      <key>Mauritius</key>
+    </entry>
+    <entry>
+      <key>Bouvet Island</key>
+    </entry>
+    <entry>
+      <key>Bolivia (Plurinational State of)</key>
+    </entry>
+    <entry>
+      <key>Norfolk Island</key>
+    </entry>
+    <entry>
+      <key>Sint Maarten (Dutch part)</key>
+    </entry>
+    <entry>
+      <key>Micronesia (Federated States of)</key>
+    </entry>
+    <entry>
+      <key>Product_industry knowhow</key>
+    </entry>
+    <entry>
+      <key>United States of America</key>
+    </entry>
+    <entry>
+      <key>In review</key>
+    </entry>
+    <entry>
+      <key>Address purchase</key>
+    </entry>
+    <entry>
+      <key>Malta</key>
+    </entry>
+    <entry>
+      <key>Project_volume</key>
+    </entry>
+    <entry>
+      <key>Ireland</key>
+    </entry>
+    <entry>
+      <key>Inactive</key>
+    </entry>
+    <entry>
+      <key>France</key>
+    </entry>
+    <entry>
+      <key>Lithuania</key>
+    </entry>
+    <entry>
+      <key>Korea (Republic of)</key>
+    </entry>
+    <entry>
+      <key>${PRICELIST_SERVICE}</key>
+    </entry>
+    <entry>
+      <key>English</key>
+    </entry>
+    <entry>
+      <key>Nicaragua</key>
+    </entry>
+    <entry>
+      <key>Macao</key>
+    </entry>
+    <entry>
+      <key>Mexico</key>
+    </entry>
+    <entry>
+      <key>Uganda</key>
+    </entry>
+    <entry>
+      <key>Suriname</key>
+    </entry>
+    <entry>
+      <key>Greenland</key>
+    </entry>
+    <entry>
+      <key>Papua New Guinea</key>
+    </entry>
+    <entry>
+      <key>Kazakhstan</key>
+    </entry>
+    <entry>
+      <key>Ã…land Islands</key>
+    </entry>
+    <entry>
+      <key>Bahamas</key>
+    </entry>
+    <entry>
+      <key>Mali</key>
+    </entry>
+    <entry>
+      <key>Marshall Islands</key>
+    </entry>
+    <entry>
+      <key>Panama</key>
+    </entry>
+    <entry>
+      <key>Bonaire, Sint Eustatius and Saba</key>
+    </entry>
+    <entry>
+      <key>Tanzania, United Republic of</key>
+    </entry>
+    <entry>
+      <key>Argentina</key>
+    </entry>
+    <entry>
+      <key>Belize</key>
+    </entry>
+    <entry>
+      <key>Zambia</key>
+    </entry>
+    <entry>
+      <key>Congo</key>
+    </entry>
+    <entry>
+      <key>Guinea-Bissau</key>
+    </entry>
+    <entry>
+      <key>Namibia</key>
+    </entry>
+    <entry>
+      <key>External sales manager</key>
+    </entry>
+    <entry>
+      <key>Georgia</key>
+    </entry>
+    <entry>
+      <key>Saint Kitts and Nevis</key>
+    </entry>
+    <entry>
+      <key>Yemen</key>
+    </entry>
+    <entry>
+      <key>Aruba</key>
+    </entry>
+    <entry>
+      <key>Madagascar</key>
+    </entry>
+    <entry>
+      <key>Valid, unlimited</key>
+    </entry>
+    <entry>
+      <key>Svalbard and Jan Mayen</key>
+    </entry>
+    <entry>
+      <key>South Georgia and the South Sandwich Islands</key>
+    </entry>
+    <entry>
+      <key>Sweden</key>
+    </entry>
+    <entry>
+      <key>Malawi</key>
+    </entry>
+    <entry>
+      <key>Andorra</key>
+    </entry>
+    <entry>
+      <key>Poland</key>
+    </entry>
+    <entry>
+      <key>Tunisia</key>
+    </entry>
+    <entry>
+      <key>Tuvalu</key>
+    </entry>
+    <entry>
+      <key>Lebanon</key>
+    </entry>
+    <entry>
+      <key>Azerbaijan</key>
+    </entry>
+    <entry>
+      <key>Czech Republic</key>
+    </entry>
+    <entry>
+      <key>Mauritania</key>
+    </entry>
+    <entry>
+      <key>Guernsey</key>
+    </entry>
+    <entry>
+      <key>Kgs</key>
+    </entry>
+    <entry>
+      <key>Australia</key>
+    </entry>
+    <entry>
+      <key>Myanmar</key>
+    </entry>
+    <entry>
+      <key>Cameroon</key>
+    </entry>
+    <entry>
+      <key>Iceland</key>
+    </entry>
+    <entry>
+      <key>Oman</key>
+    </entry>
+    <entry>
+      <key>Gabon</key>
+    </entry>
+    <entry>
+      <key>Luxembourg</key>
+    </entry>
+    <entry>
+      <key>Algeria</key>
+    </entry>
+    <entry>
+      <key>Jersey</key>
+    </entry>
+    <entry>
+      <key>Slovenia</key>
+    </entry>
+    <entry>
+      <key>Antigua and Barbuda</key>
+    </entry>
+    <entry>
+      <key>Annually</key>
+    </entry>
+    <entry>
+      <key>Colombia</key>
+    </entry>
+    <entry>
+      <key>Project_reference</key>
+    </entry>
+    <entry>
+      <key>Vanuatu</key>
+    </entry>
+    <entry>
+      <key>Valid, limited</key>
+    </entry>
+    <entry>
+      <key>Honduras</key>
+    </entry>
+    <entry>
+      <key>Antarctica</key>
+    </entry>
+    <entry>
+      <key>Nauru</key>
+    </entry>
+    <entry>
+      <key>Burundi</key>
+    </entry>
+    <entry>
+      <key>Project manager</key>
+    </entry>
+    <entry>
+      <key>Singapore</key>
+    </entry>
+    <entry>
+      <key>French Guiana</key>
+    </entry>
+    <entry>
+      <key>Hours</key>
+    </entry>
+    <entry>
+      <key>Christmas Island</key>
+    </entry>
+    <entry>
+      <key>Netherlands</key>
+    </entry>
+    <entry>
+      <key>Product_flexibility</key>
+    </entry>
+    <entry>
+      <key>China</key>
+    </entry>
+    <entry>
+      <key>Martinique</key>
+    </entry>
+    <entry>
+      <key>Own website</key>
+    </entry>
+    <entry>
+      <key>Saint Pierre and Miquelon</key>
+    </entry>
+    <entry>
+      <key>Bhutan</key>
+    </entry>
+    <entry>
+      <key>Romania</key>
+    </entry>
+    <entry>
+      <key>Falkland Islands (Malvinas)</key>
+    </entry>
+    <entry>
+      <key>Philippines</key>
+    </entry>
+    <entry>
+      <key>Pitcairn</key>
+    </entry>
+    <entry>
+      <key>Zimbabwe</key>
+    </entry>
+    <entry>
+      <key>British Indian Ocean Territory</key>
+    </entry>
+    <entry>
+      <key>Montenegro</key>
+    </entry>
+    <entry>
+      <key>Quarterly</key>
+    </entry>
+    <entry>
+      <key>Indonesia</key>
+    </entry>
+    <entry>
+      <key>Angola</key>
+    </entry>
+    <entry>
+      <key>Internal</key>
+    </entry>
+    <entry>
+      <key>Key account</key>
+    </entry>
+    <entry>
+      <key>Brunei Darussalam</key>
+    </entry>
+    <entry>
+      <key>New Caledonia</key>
+    </entry>
+    <entry>
+      <key>Cayman Islands</key>
+    </entry>
+    <entry>
+      <key>Congo (Democratic Republic of the)</key>
+    </entry>
+    <entry>
+      <key>Greece</key>
+    </entry>
+    <entry>
+      <key>Guyana</key>
+    </entry>
+    <entry>
+      <key>Project assistant</key>
+    </entry>
+    <entry>
+      <key>Iraq</key>
+    </entry>
+    <entry>
+      <key>Chile</key>
+    </entry>
+    <entry>
+      <key>Nepal</key>
+    </entry>
+    <entry>
+      <key>${PRICELIST_DEFAULT}</key>
+    </entry>
+    <entry>
+      <key>Customer recommendation</key>
+    </entry>
+    <entry>
+      <key>Other_unknown</key>
+    </entry>
+    <entry>
+      <key>Isle of Man</key>
+    </entry>
+    <entry>
+      <key>Ukraine</key>
+    </entry>
+    <entry>
+      <key>Curaçao</key>
+    </entry>
+    <entry>
+      <key>Anguilla</key>
+    </entry>
+    <entry>
+      <key>Euro</key>
+    </entry>
+    <entry>
+      <key>Product_GUI</key>
+    </entry>
+    <entry>
+      <key>${GENDER_OTHER}</key>
+    </entry>
+    <entry>
+      <key>Turkey</key>
+    </entry>
+    <entry>
+      <key>Belgium</key>
+    </entry>
+    <entry>
+      <key>South Africa</key>
+    </entry>
+    <entry>
+      <key>Trinidad and Tobago</key>
+    </entry>
+    <entry>
+      <key>Bermuda</key>
+    </entry>
+    <entry>
+      <key>Jamaica</key>
+    </entry>
+    <entry>
+      <key>Peru</key>
+    </entry>
+    <entry>
+      <key>Turkmenistan</key>
+    </entry>
+    <entry>
+      <key>Venezuela (Bolivarian Republic of)</key>
+    </entry>
+    <entry>
+      <key>Tokelau</key>
+    </entry>
+    <entry>
+      <key>Hong Kong</key>
+    </entry>
+    <entry>
+      <key>Chad</key>
+    </entry>
+    <entry>
+      <key>German</key>
+    </entry>
+    <entry>
+      <key>Thailand</key>
+    </entry>
+    <entry>
+      <key>in process</key>
+    </entry>
+    <entry>
+      <key>Saint Martin (French part)</key>
+    </entry>
+    <entry>
+      <key>Kuwait</key>
+    </entry>
+    <entry>
+      <key>Palestine, State of</key>
+    </entry>
+    <entry>
+      <key>Croatia</key>
+    </entry>
+    <entry>
+      <key>Cook Islands</key>
+    </entry>
+    <entry>
+      <key>Fair</key>
+    </entry>
+    <entry>
+      <key>Sri Lanka</key>
+    </entry>
+    <entry>
+      <key>Uruguay</key>
+    </entry>
+    <entry>
+      <key>Liberia</key>
+    </entry>
+    <entry>
+      <key>Burkina Faso</key>
+    </entry>
+    <entry>
+      <key>Swiss franc</key>
+    </entry>
+    <entry>
+      <key>Swaziland</key>
+    </entry>
+    <entry>
+      <key>ended</key>
+    </entry>
+    <entry>
+      <key>Saint Barthélemy</key>
+    </entry>
+    <entry>
+      <key>Wallis and Futuna</key>
+    </entry>
+    <entry>
+      <key>Company_industry knowhow</key>
+    </entry>
+    <entry>
+      <key>Monaco</key>
+    </entry>
+    <entry>
+      <key>Spanish</key>
+    </entry>
+    <entry>
+      <key>Hungary</key>
+    </entry>
+    <entry>
+      <key>Réunion</key>
+    </entry>
+    <entry>
+      <key>Japan</key>
+    </entry>
+    <entry>
+      <key>Belarus</key>
+    </entry>
+    <entry>
+      <key>Albania</key>
+    </entry>
+    <entry>
+      <key>Internal sales manager</key>
+    </entry>
+    <entry>
+      <key>Virgin Islands (U.S.)</key>
+    </entry>
+    <entry>
+      <key>New Zealand</key>
+    </entry>
+    <entry>
+      <key>Senegal</key>
+    </entry>
+    <entry>
+      <key>Ethiopia</key>
+    </entry>
+    <entry>
+      <key>Macedonia (the former Yugoslav Republic of)</key>
+    </entry>
+    <entry>
+      <key>Egypt</key>
+    </entry>
+    <entry>
+      <key>Sierra Leone</key>
+    </entry>
+    <entry>
+      <key>Saudi Arabia</key>
+    </entry>
+    <entry>
+      <key>Pakistan</key>
+    </entry>
+    <entry>
+      <key>Gambia</key>
+    </entry>
+    <entry>
+      <key>Qatar</key>
+    </entry>
+    <entry>
+      <key>Slovakia</key>
+    </entry>
+    <entry>
+      <key>Serbia</key>
+    </entry>
+    <entry>
+      <key>Bosnia and Herzegovina</key>
+    </entry>
+    <entry>
+      <key>Framework contract</key>
+    </entry>
+    <entry>
+      <key>Niger</key>
+    </entry>
+    <entry>
+      <key>Rwanda</key>
+    </entry>
+    <entry>
+      <key>French Southern Territories</key>
+    </entry>
+    <entry>
+      <key>Bangladesh</key>
+    </entry>
+    <entry>
+      <key>Barbados</key>
+    </entry>
+    <entry>
+      <key>Botswana</key>
+    </entry>
+    <entry>
+      <key>Saint Vincent and the Grenadines</key>
+    </entry>
+    <entry>
+      <key>Denmark</key>
+    </entry>
+    <entry>
+      <key>Dominican Republic</key>
+    </entry>
+    <entry>
+      <key>Cover letter</key>
+    </entry>
+    <entry>
+      <key>Create receipt</key>
+    </entry>
+    <entry>
+      <key>New time tracking</key>
+    </entry>
+    <entry>
+      <key>MAL</key>
+    </entry>
+    <entry>
+      <key>SQO</key>
+    </entry>
+    <entry>
+      <key>NQC</key>
+    </entry>
+    <entry>
+      <key>MQL</key>
+    </entry>
+    <entry>
+      <key>SAL</key>
+    </entry>
+    <entry>
+      <key>Checkbox</key>
+    </entry>
+    <entry>
+      <key>Numeric value</key>
+    </entry>
+    <entry>
+      <key>decline</key>
+    </entry>
+    <entry>
+      <key>Text</key>
+    </entry>
+    <entry>
+      <key>Group</key>
+    </entry>
+    <entry>
+      <key>Combobox</key>
+    </entry>
+    <entry>
+      <key>tentative</key>
+    </entry>
+    <entry>
+      <key>${NUMBER}</key>
+    </entry>
+    <entry>
+      <key>Name \"%0\" already used for container \"%1\"</key>
+    </entry>
+    <entry>
+      <key>CHAR_VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute</key>
+    </entry>
+    <entry>
+      <key>in</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute Values</key>
+    </entry>
+    <entry>
+      <key>Boolean value</key>
+    </entry>
+    <entry>
+      <key>accept</key>
+    </entry>
+    <entry>
+      <key>The ZIP code does not match the format of the country.</key>
+    </entry>
+    <entry>
+      <key>String value</key>
+    </entry>
+    <entry>
+      <key>The code number is not a valid number.</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
+    </entry>
+    <entry>
+      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
+    </entry>
+    <entry>
+      <key>Object type</key>
+    </entry>
+    <entry>
+      <key>Level</key>
+    </entry>
+    <entry>
+      <key>Print Offer</key>
+    </entry>
+    <entry>
+      <key>Touchpoints</key>
+    </entry>
+    <entry>
+      <key>Days inactive</key>
+    </entry>
+    <entry>
+      <key>Touchpoint</key>
+    </entry>
+    <entry>
+      <key>Combobox Value</key>
+    </entry>
+    <entry>
+      <key>relations</key>
+    </entry>
+    <entry>
+      <key>Time</key>
+    </entry>
+    <entry>
+      <key>New task</key>
+    </entry>
+    <entry>
+      <key>MyTasks</key>
+    </entry>
+    <entry>
+      <key>Show my tasks</key>
+    </entry>
+    <entry>
+      <key>the specified key has to be unique for that container but does already exist</key>
+    </entry>
+    <entry>
+      <key>Tree Entity</key>
+    </entry>
+    <entry>
+      <key>Relationtype</key>
+    </entry>
+    <entry>
+      <key>Tree</key>
+    </entry>
+    <entry>
+      <key>100%</key>
+    </entry>
+    <entry>
+      <key>Mobil</key>
+    </entry>
+    <entry>
+      <key>25%</key>
+    </entry>
+    <entry>
+      <key>50%</key>
+    </entry>
+    <entry>
+      <key>75%</key>
+    </entry>
+    <entry>
+      <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
+    </entry>
+    <entry>
+      <key>competitor</key>
+    </entry>
+    <entry>
+      <key>0%</key>
+    </entry>
+    <entry>
+      <key>acquainted with</key>
+    </entry>
+    <entry>
+      <key>collaboration with</key>
+    </entry>
+    <entry>
+      <key>parent company</key>
+    </entry>
+    <entry>
+      <key>society</key>
+    </entry>
+    <entry>
+      <key>ankle of</key>
+    </entry>
+    <entry>
+      <key>solicits</key>
+    </entry>
+    <entry>
+      <key>child of</key>
+    </entry>
+    <entry>
+      <key>supervisor of</key>
+    </entry>
+    <entry>
+      <key>reports to</key>
+    </entry>
+    <entry>
+      <key>subsidiary</key>
+    </entry>
+    <entry>
+      <key>supported by</key>
+    </entry>
+    <entry>
+      <key>member</key>
+    </entry>
+    <entry>
+      <key>promotion target of</key>
+    </entry>
+    <entry>
+      <key>supports</key>
+    </entry>
+    <entry>
+      <key>parent of</key>
+    </entry>
+    <entry>
+      <key>grandparents of</key>
+    </entry>
+    <entry>
+      <key>Entrydate (Month)</key>
+    </entry>
+    <entry>
+      <key>Entrydate (Day)</key>
+    </entry>
+    <entry>
+      <key>My Dashboard</key>
+    </entry>
+    <entry>
+      <key>Salesdashboard</key>
+    </entry>
+    <entry>
+      <key>Discount %</key>
+    </entry>
+    <entry>
+      <key>Memo</key>
+    </entry>
+    <entry>
+      <key>Function</key>
+    </entry>
+    <entry>
+      <key>Relational</key>
+    </entry>
+    <entry>
+      <key>Only numbers are allowed.</key>
+    </entry>
+    <entry>
+      <key>Superordinate Attribute</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_OFFER}</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_NEGOTIATION}</key>
+    </entry>
+    <entry>
+      <key>Filesize</key>
+    </entry>
+    <entry>
+      <key>Filename</key>
+    </entry>
+    <entry>
+      <key>Filetype</key>
+    </entry>
+    <entry>
+      <key>Special price list</key>
+    </entry>
+    <entry>
+      <key>New attribute</key>
+    </entry>
+    <entry>
+      <key>MQC</key>
+    </entry>
+    <entry>
+      <key>History</key>
+    </entry>
+    <entry>
+      <key>Progress</key>
+    </entry>
+    <entry>
+      <key>Module</key>
+    </entry>
+    <entry>
+      <key>7 days net</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>carriage free</key>
+    </entry>
+    <entry>
+      <key>8 days 2% discount, 30 days net</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>CIF</key>
+    </entry>
+    <entry>
+      <key>ex works</key>
+    </entry>
+    <entry>
+      <key>30 days net</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>Relation tree</key>
+    </entry>
+    <entry>
+      <key>Directly responsible:</key>
+    </entry>
+    <entry>
+      <key>Payment term</key>
+    </entry>
+    <entry>
+      <key>Contactrole</key>
+    </entry>
+    <entry>
+      <key>Object tree</key>
+    </entry>
+    <entry>
+      <key>New appointment</key>
+    </entry>
+    <entry>
+      <key>&amp;Aufg / Term (%0/%1)</key>
+    </entry>
+    <entry>
+      <key>Verschieben auf Datum?</key>
+    </entry>
+    <entry>
+      <key>niedrig</key>
+    </entry>
+    <entry>
+      <key>Gebucht</key>
+    </entry>
+    <entry>
+      <key>Other Contactroles</key>
+    </entry>
+    <entry>
+      <key>Bitte Datumseingabe prüfen!</key>
+    </entry>
+    <entry>
+      <key>In Bearbeitung</key>
+    </entry>
+    <entry>
+      <key>OK</key>
+    </entry>
+    <entry>
+      <key>Nicht begonnen</key>
+    </entry>
+    <entry>
+      <key>Bitte Filterbedingungen setzen</key>
+    </entry>
+    <entry>
+      <key>Bestätigt</key>
+    </entry>
+    <entry>
+      <key>Vorläufig</key>
+    </entry>
+    <entry>
+      <key>keine</key>
+    </entry>
+    <entry>
+      <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+    </entry>
+    <entry>
+      <key>Aufgaben von</key>
+    </entry>
+    <entry>
+      <key>&amp;Aufgaben (%0)</key>
+    </entry>
+    <entry>
+      <key>erledigt / zurückgestellt</key>
+    </entry>
+    <entry>
+      <key>hoch</key>
+    </entry>
+    <entry>
+      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+    </entry>
+    <entry>
+      <key>Zurückgestellt</key>
+    </entry>
+    <entry>
+      <key>Erledigt</key>
+    </entry>
+    <entry>
+      <key>Usages</key>
+    </entry>
+    <entry>
+      <key>Abgesagt</key>
+    </entry>
+    <entry>
+      <key>Außer Haus</key>
+    </entry>
+    <entry>
+      <key>Abbrechen</key>
+    </entry>
+    <entry>
+      <key>Benutzer auswählen</key>
+    </entry>
+    <entry>
+      <key>delegiert</key>
+    </entry>
+    <entry>
+      <key>frei</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+    </entry>
+    <entry>
+      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+    </entry>
+    <entry>
+      <key>normal</key>
+    </entry>
+    <entry>
+      <key>Termine von</key>
+    </entry>
+    <entry>
+      <key>nur Verschiebung in die Zukunft erlaubt!</key>
+    </entry>
+    <entry>
+      <key>Kategorie</key>
+    </entry>
+    <entry>
+      <key>Product content</key>
+    </entry>
+    <entry>
+      <key>Know How</key>
+    </entry>
+    <entry>
+      <key>Personal appearance</key>
+    </entry>
+    <entry>
+      <key>Market situation</key>
+    </entry>
+    <entry>
+      <key>Liquidity</key>
+    </entry>
+    <entry>
+      <key>Price policy</key>
+    </entry>
+    <entry>
+      <key>Approved</key>
+    </entry>
+    <entry>
+      <key>Completed</key>
+    </entry>
+    <entry>
+      <key>In planning</key>
+    </entry>
+    <entry>
+      <key>Campaign Step</key>
+    </entry>
+    <entry>
+      <key>Campaign Participant</key>
+    </entry>
+    <entry>
+      <key>Campaign Steps</key>
+    </entry>
+    <entry>
+      <key>360 Degree</key>
+    </entry>
+    <entry>
+      <key>Campaigns</key>
+    </entry>
+    <entry>
+      <key>Campaign</key>
+    </entry>
+    <entry>
+      <key>Auswertung</key>
+    </entry>
+    <entry>
+      <key>Reihenfolge</key>
+    </entry>
+    <entry>
+      <key>Zuständiger</key>
+    </entry>
+    <entry>
+      <key>Schritte</key>
+    </entry>
+    <entry>
+      <key>Teilnehmer</key>
+    </entry>
+    <entry>
+      <key>VAT in %</key>
+    </entry>
+    <entry>
+      <key>Kampagnen Schritte</key>
+    </entry>
+    <entry>
+      <key>Kampagnenschritte</key>
+    </entry>
+    <entry>
+      <key>Marketing</key>
+    </entry>
+    <entry>
+      <key>Die maximale Anzahl Teilnehmer ist erreicht!</key>
+    </entry>
+    <entry>
+      <key>Neuer Kampagnenschritt</key>
+    </entry>
+    <entry>
+      <key>Kontakteasdasd</key>
+    </entry>
+    <entry>
+      <key>Ende</key>
+    </entry>
+    <entry>
+      <key>Neue Kampagne</key>
+    </entry>
+    <entry>
+      <key>Beginn</key>
+    </entry>
+    <entry>
+      <key>${QUANTITY_LOWER_THAN_1}</key>
+    </entry>
+    <entry>
+      <key>This combination of person and organisation does already exist and can not be created once more.</key>
+    </entry>
+    <entry>
+      <key>New module</key>
+    </entry>
+    <entry>
+      <key>Time in minutes</key>
+    </entry>
+    <entry>
+      <key>Sales manager</key>
+    </entry>
+    <entry>
+      <key>IT</key>
+    </entry>
+    <entry>
+      <key>Administrator</key>
+    </entry>
+    <entry>
+      <key>Managing director</key>
+    </entry>
+    <entry>
+      <key>Production manager</key>
+    </entry>
+    <entry>
+      <key>Production</key>
+    </entry>
+    <entry>
+      <key>CEO</key>
+    </entry>
+    <entry>
+      <key>Purchasing manager</key>
+    </entry>
+    <entry>
+      <key>Marketing manager</key>
+    </entry>
+    <entry>
+      <key>IT manager</key>
+    </entry>
+    <entry>
+      <key>CSO</key>
+    </entry>
+    <entry>
+      <key>Executive board</key>
+    </entry>
+    <entry>
+      <key>Supervisory board</key>
+    </entry>
+    <entry>
+      <key>Management</key>
+    </entry>
+    <entry>
+      <key>date of birth must not be in the future</key>
+    </entry>
+    <entry>
+      <key>Manufacturer</key>
+    </entry>
+    <entry>
+      <key>Prospective customer</key>
+    </entry>
+    <entry>
+      <key>Competitor</key>
+    </entry>
+    <entry>
+      <key>Partner</key>
+    </entry>
+    <entry>
+      <key>Attribute Tree</key>
+    </entry>
+    <entry>
+      <key>True</key>
+    </entry>
+    <entry>
+      <key>False</key>
+    </entry>
+    <entry>
+      <key>false</key>
+    </entry>
+    <entry>
+      <key>true</key>
+    </entry>
+    <entry>
+      <key>Protected</key>
+    </entry>
+    <entry>
+      <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
+    </entry>
+    <entry>
+      <key>Password</key>
+    </entry>
+    <entry>
+      <key>Confirm password</key>
+    </entry>
+    <entry>
+      <key>Set password</key>
+    </entry>
+    <entry>
+      <key>Email</key>
+    </entry>
+    <entry>
+      <key>{$OBJECTLINK_TYPE}</key>
+    </entry>
+    <entry>
+      <key>{$OBJECTLINK_OBJECT}</key>
+    </entry>
+    <entry>
+      <key>Roles</key>
+    </entry>
+    <entry>
+      <key>Password and confirmation must be the same!</key>
+    </entry>
+    <entry>
+      <key>Begin</key>
+    </entry>
+    <entry>
+      <key>Maturity</key>
+    </entry>
+    <entry>
+      <key>Stored selections</key>
+    </entry>
+    <entry>
+      <key>Username</key>
+    </entry>
+    <entry>
+      <key>The person is already associated with another employee!</key>
+    </entry>
+    <entry>
+      <key>Username already exists!</key>
+    </entry>
+    <entry>
+      <key>Salesproject Phases</key>
+    </entry>
+    <entry>
+      <key>Turnover actual year</key>
+    </entry>
+    <entry>
+      <key>Forecast actual year</key>
+    </entry>
+    <entry>
+      <key>This private person doeas already exist and can not be created once more.</key>
+    </entry>
+    <entry>
+      <key>Everyone</key>
+    </entry>
+    <entry>
+      <key>Project</key>
+    </entry>
+    <entry>
+      <key>Human resources</key>
+    </entry>
+    <entry>
+      <key>Project management</key>
+    </entry>
+    <entry>
+      <key>Office staff</key>
+    </entry>
+    <entry>
+      <key>Field staff</key>
+    </entry>
+    <entry>
+      <key>Resource</key>
+    </entry>
+    <entry>
+      <key>Human Resources</key>
+    </entry>
+    <entry>
+      <key>The title already exists!</key>
+    </entry>
+    <entry>
+      <key>Note</key>
+    </entry>
+    <entry>
+      <key>Email must be unique!</key>
+    </entry>
+    <entry>
+      <key>Project Management</key>
+    </entry>
+    <entry>
+      <key>Support</key>
+    </entry>
+    <entry>
+      <key>{$ADDRESS_IDENTIFIER}</key>
+    </entry>
+    <entry>
+      <key>Salesproject phases</key>
+    </entry>
+    <entry>
+      <key>Add to Campaign</key>
+    </entry>
+    <entry>
+      <key>Choose a campaign and a step to add the contact to a  campaign</key>
+    </entry>
+    <entry>
+      <key>Max participants</key>
+    </entry>
+    <entry>
+      <key>Participants</key>
+    </entry>
+    <entry>
+      <key>Add the selection to a campaign</key>
+    </entry>
+    <entry>
+      <key>protected</key>
+    </entry>
+    <entry>
+      <key>participants will be added to the selected campaign step</key>
+    </entry>
+    <entry>
+      <key>Add participants to Campaign</key>
+    </entry>
+    <entry>
+      <key>Object type 1</key>
+    </entry>
+    <entry>
+      <key>Object type 2</key>
+    </entry>
+    <entry>
+      <key>Objectrelation type</key>
+    </entry>
+    <entry>
+      <key>Key figures</key>
+    </entry>
+    <entry>
+      <key>Delete all usage</key>
+    </entry>
+    <entry>
+      <key>Deleted all usages of \"%0\".</key>
+    </entry>
+    <entry>
+      <key>promotion target ofc</key>
+    </entry>
+    <entry>
+      <key>Successful</key>
+    </entry>
+    <entry>
+      <key>Relation type 1</key>
+    </entry>
+    <entry>
+      <key>Relation type 2</key>
+    </entry>
+    <entry>
+      <key>Relation type</key>
+    </entry>
+    <entry>
+      <key>Context 1</key>
+    </entry>
+    <entry>
+      <key>Context 2</key>
+    </entry>
+    <entry>
+      <key>Title 1</key>
+    </entry>
+    <entry>
+      <key>Title 2</key>
+    </entry>
+    <entry>
+      <key>Hierarchy</key>
+    </entry>
+    <entry>
+      <key>Object relation</key>
+    </entry>
+    <entry>
+      <key>Type 2 enabled</key>
+    </entry>
+    <entry>
+      <key>Kennzahlen</key>
+    </entry>
+    <entry>
+      <key>Count</key>
+    </entry>
+    <entry>
+      <key>Forecast actual year </key>
+    </entry>
+    <entry>
+      <key>Picture</key>
+    </entry>
+    <entry>
+      <key>Chart</key>
+    </entry>
+    <entry>
+      <key>Salesproject Charts</key>
+    </entry>
+    <entry>
+      <key>Relation</key>
+    </entry>
+    <entry>
+      <key>Tochter</key>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+    </entry>
+    <entry>
+      <key>Enable relation type 2</key>
+    </entry>
+    <entry>
+      <key>Salesproject Analyses</key>
+    </entry>
+    <entry>
+      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+    </entry>
+    <entry>
+      <key>ObjectRelationType</key>
+    </entry>
+    <entry>
+      <key>SalesprojectPhase</key>
+    </entry>
+    <entry>
+      <key>SalesprojectState</key>
+    </entry>
+    <entry>
+      <key>Days count</key>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to '%0'?</key>
+    </entry>
+    <entry>
+      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
+    </entry>
+    <entry>
+      <key>This cannot be undone!</key>
+    </entry>
+    <entry>
+      <key>Campaign status</key>
+    </entry>
+    <entry>
+      <key>Set campaign step</key>
+    </entry>
+    <entry>
+      <key>Add participant to Campaign</key>
+    </entry>
+    <entry>
+      <key>Steps</key>
+    </entry>
+    <entry>
+      <key>CampaignStep</key>
+    </entry>
+    <entry>
+      <key>Added</key>
+    </entry>
+    <entry>
+      <key>Current participants</key>
+    </entry>
+    <entry>
+      <key>Overdue tasks</key>
+    </entry>
+    <entry>
+      <key>Open tasks</key>
+    </entry>
+    <entry>
+      <key>[%0]the tableName is not a string after interpreting</key>
+    </entry>
+    <entry>
+      <key>[%0]%1 has to be a string or array but it is %2</key>
+    </entry>
+    <entry>
+      <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+    </entry>
+    <entry>
+      <key>[%0]the columnName is not a string after interpreting</key>
+    </entry>
+    <entry>
+      <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+    </entry>
+    <entry>
+      <key>Responsible</key>
+    </entry>
+    <entry>
+      <key>New tasks</key>
+    </entry>
+    <entry>
+      <key>Imminent appointments for today</key>
+    </entry>
+    <entry>
+      <key>Analyses</key>
+    </entry>
+    <entry>
+      <key>Imminent appointments for today </key>
+    </entry>
+    <entry>
+      <key>To-Do</key>
+    </entry>
+    <entry>
+      <key>My Tasks</key>
+    </entry>
+    <entry>
+      <key>Calendar</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
+    </entry>
+    <entry>
+      <key>My tasks</key>
+    </entry>
+    <entry>
+      <key>${ATTRIBUTE_VOID}</key>
+    </entry>
+    <entry>
+      <key>Kampagnenzeitraum</key>
+    </entry>
+    <entry>
+      <key>Hauptverantw.</key>
+    </entry>
+    <entry>
+      <key>New campaign step</key>
+    </entry>
+    <entry>
+      <key>Cost</key>
+    </entry>
+    <entry>
+      <key>file '%0' cannot be read</key>
+    </entry>
+    <entry>
+      <key>Campaign costs</key>
+    </entry>
+    <entry>
+      <key>Importer</key>
+    </entry>
+    <entry>
+      <key>Participant</key>
+    </entry>
+    <entry>
+      <key>Printing costs</key>
+    </entry>
+    <entry>
+      <key>Shipping costs</key>
+    </entry>
+    <entry>
+      <key>yyyy-MM-dd HH:mm:ss</key>
+    </entry>
+    <entry>
+      <key>file '%0' does not exist or you have got no permission on this file</key>
+    </entry>
+    <entry>
+      <key>Zip</key>
+    </entry>
+    <entry>
+      <key>Add to campaign</key>
+    </entry>
+    <entry>
+      <key>Layout costs</key>
+    </entry>
+    <entry>
+      <key>Costs</key>
+    </entry>
+    <entry>
+      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+    </entry>
+    <entry>
+      <key>Step</key>
+    </entry>
+    <entry>
+      <key>Fix cost</key>
+    </entry>
+    <entry>
+      <key>per</key>
+    </entry>
+    <entry>
+      <key>The minimal count can't be larger than the maximal count!</key>
+    </entry>
+    <entry>
+      <key>The max participants count has to be equal or greater than the count of the current participants!</key>
+    </entry>
+    <entry>
+      <key>Variable costs</key>
+    </entry>
+    <entry>
+      <key>Version number</key>
+    </entry>
+    <entry>
+      <key>Id value</key>
+    </entry>
+    <entry>
+      <key>Order executed</key>
+    </entry>
+    <entry>
+      <key>Liquibase</key>
+    </entry>
+    <entry>
+      <key>Number value</key>
+    </entry>
+    <entry>
+      <key>Author</key>
+    </entry>
+    <entry>
+      <key>Position Id</key>
+    </entry>
+    <entry>
+      <key>ISO3</key>
+    </entry>
+    <entry>
+      <key>ISO2</key>
+    </entry>
+    <entry>
+      <key>Communication Id</key>
+    </entry>
+    <entry>
+      <key>Attribute Id</key>
+    </entry>
+    <entry>
+      <key>Modification user</key>
+    </entry>
+    <entry>
+      <key>Headline</key>
+    </entry>
+    <entry>
+      <key>Salesorder Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject milestone Id</key>
+    </entry>
+    <entry>
+      <key>Appointment Id</key>
+    </entry>
+    <entry>
+      <key>Locked</key>
+    </entry>
+    <entry>
+      <key>Timetracking Id</key>
+    </entry>
+    <entry>
+      <key>Salesorder date</key>
+    </entry>
+    <entry>
+      <key>Exec type</key>
+    </entry>
+    <entry>
+      <key>Date value</key>
+    </entry>
+    <entry>
+      <key>NUMBER VALUE</key>
+    </entry>
+    <entry>
+      <key>Salesproject forecast Id</key>
+    </entry>
+    <entry>
+      <key>ID</key>
+    </entry>
+    <entry>
+      <key>Keyword attribute relation Id</key>
+    </entry>
+    <entry>
+      <key>Minimal count</key>
+    </entry>
+    <entry>
+      <key>Id</key>
+    </entry>
+    <entry>
+      <key>Start date</key>
+    </entry>
+    <entry>
+      <key>Object 1 row Id</key>
+    </entry>
+    <entry>
+      <key>Side</key>
+    </entry>
+    <entry>
+      <key>Salesproject Id</key>
+    </entry>
+    <entry>
+      <key>Product Id</key>
+    </entry>
+    <entry>
+      <key>Sort</key>
+    </entry>
+    <entry>
+      <key>Relation Title</key>
+    </entry>
+    <entry>
+      <key>%0 \"%1\"</key>
+    </entry>
+    <entry>
+      <key>Maximal count</key>
+    </entry>
+    <entry>
+      <key>Data executed</key>
+    </entry>
+    <entry>
+      <key>Indexsearch</key>
+    </entry>
+    <entry>
+      <key>Appointment link Id</key>
+    </entry>
+    <entry>
+      <key>Relation Type</key>
+    </entry>
+    <entry>
+      <key>Salesproject member Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject source Id</key>
+    </entry>
+    <entry>
+      <key>Item sort</key>
+    </entry>
+    <entry>
+      <key>%0 modified.</key>
+    </entry>
+    <entry>
+      <key>Contract Id</key>
+    </entry>
+    <entry>
+      <key>Int value</key>
+    </entry>
+    <entry>
+      <key>Object 2 row Id</key>
+    </entry>
+    <entry>
+      <key>Source tablename Id</key>
+    </entry>
+    <entry>
+      <key>Source tablename</key>
+    </entry>
+    <entry>
+      <key>Contact Id</key>
+    </entry>
+    <entry>
+      <key>Sales area</key>
+    </entry>
+    <entry>
+      <key>Parent Id</key>
+    </entry>
+    <entry>
+      <key>Task link Id</key>
+    </entry>
+    <entry>
+      <key>Protection level</key>
+    </entry>
+    <entry>
+      <key>Salesorder code</key>
+    </entry>
+    <entry>
+      <key>Class</key>
+    </entry>
+    <entry>
+      <key>BOOL VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword attribute Id</key>
+    </entry>
+    <entry>
+      <key>Log type</key>
+    </entry>
+    <entry>
+      <key>Object row Id</key>
+    </entry>
+    <entry>
+      <key>Labels</key>
+    </entry>
+    <entry>
+      <key>%0 deleted.</key>
+    </entry>
+    <entry>
+      <key>Salesproject competition Id</key>
+    </entry>
+    <entry>
+      <key>Activity Id</key>
+    </entry>
+    <entry>
+      <key>Person Id</key>
+    </entry>
+    <entry>
+      <key>Offer item Id</key>
+    </entry>
+    <entry>
+      <key>Offer Id</key>
+    </entry>
+    <entry>
+      <key>Name native</key>
+    </entry>
+    <entry>
+      <key>Flag</key>
+    </entry>
+    <entry>
+      <key>Address Id</key>
+    </entry>
+    <entry>
+      <key>Name latin</key>
+    </entry>
+    <entry>
+      <key>Destination Id</key>
+    </entry>
+    <entry>
+      <key>Sex</key>
+    </entry>
+    <entry>
+      <key>Product price Id</key>
+    </entry>
+    <entry>
+      <key>%0 added.</key>
+    </entry>
+    <entry>
+      <key>Object Relation Type</key>
+    </entry>
+    <entry>
+      <key>Entry date</key>
+    </entry>
+    <entry>
+      <key>Object relation type 2</key>
+    </entry>
+    <entry>
+      <key>Object relation type 1</key>
+    </entry>
+    <entry>
+      <key>Modification date</key>
+    </entry>
+    <entry>
+      <key>Object Type</key>
+    </entry>
+    <entry>
+      <key>%0 from \"%1\" to \"%2\"</key>
+    </entry>
+    <entry>
+      <key>MD5 Sum</key>
+    </entry>
+    <entry>
+      <key>Letter salutation</key>
+    </entry>
+    <entry>
+      <key>Lock granted</key>
+    </entry>
+    <entry>
+      <key>Required fields</key>
+    </entry>
+    <entry>
+      <key>Address addition</key>
+    </entry>
+    <entry>
+      <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
+    </entry>
+    <entry>
+      <key>Attribute usage Id</key>
+    </entry>
+    <entry>
+      <key>LogHistory</key>
+    </entry>
+    <entry>
+      <key>Locked by</key>
+    </entry>
+    <entry>
+      <key>Desciption</key>
+    </entry>
+    <entry>
+      <key>Salutation Id</key>
+    </entry>
+    <entry>
+      <key>Comments</key>
+    </entry>
+    <entry>
+      <key>Task Id</key>
+    </entry>
+    <entry>
+      <key>Valid to</key>
+    </entry>
+    <entry>
+      <key>ZIP regex</key>
+    </entry>
+    <entry>
+      <key>Keyword entry Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject classification Id</key>
+    </entry>
+    <entry>
+      <key>Stop costs</key>
+    </entry>
+    <entry>
+      <key>Contexts</key>
+    </entry>
+    <entry>
+      <key>Assigned to</key>
+    </entry>
+    <entry>
+      <key>%0 from \"%1\" to %2 \"%3\"</key>
+    </entry>
+    <entry>
+      <key>Date start</key>
+    </entry>
+    <entry>
+      <key>Cover Letter</key>
+    </entry>
+    <entry>
+      <key>Deployment Id</key>
+    </entry>
+    <entry>
+      <key>Address format</key>
+    </entry>
+    <entry>
+      <key>Activity link Id</key>
+    </entry>
+    <entry>
+      <key>Date end</key>
+    </entry>
+    <entry>
+      <key>Creation user</key>
+    </entry>
+    <entry>
+      <key>Unit Price</key>
+    </entry>
+    <entry>
+      <key>Object Id</key>
+    </entry>
+    <entry>
+      <key>Is active</key>
+    </entry>
+    <entry>
+      <key>Product relationship</key>
+    </entry>
+    <entry>
+      <key>Salesorder item Id</key>
+    </entry>
+    <entry>
+      <key>Char value</key>
+    </entry>
+    <entry>
+      <key>Attribute relation Id</key>
+    </entry>
+    <entry>
+      <key>Tag</key>
+    </entry>
+    <entry>
+      <key>Title suffix</key>
+    </entry>
+    <entry>
+      <key>Step costs</key>
+    </entry>
+    <entry>
+      <key>Min. Stock</key>
+    </entry>
+    <entry>
+      <key>User</key>
+    </entry>
+    <entry>
+      <key>Stock Id</key>
+    </entry>
+    <entry>
+      <key>Tablename</key>
+    </entry>
+    <entry>
+      <key>CHAR VALUE</key>
+    </entry>
+    <entry>
+      <key>Parent context</key>
+    </entry>
+    <entry>
+      <key>Organisation Id</key>
+    </entry>
+    <entry>
+      <key>Tablename Id</key>
+    </entry>
+    <entry>
+      <key>Offer date</key>
+    </entry>
+    <entry>
+      <key>Competitors</key>
+    </entry>
+    <entry>
+      <key>Notifications</key>
+    </entry>
+    <entry>
+      <key>Overview</key>
+    </entry>
+    <entry>
+      <key>Participated</key>
+    </entry>
+    <entry>
+      <key>Remaining Runtime</key>
+    </entry>
+    <entry>
+      <key>Document Template</key>
+    </entry>
+    <entry>
+      <key>Document Templates</key>
+    </entry>
+    <entry>
+      <key>Text Modular</key>
+    </entry>
+    <entry>
+      <key>Serial</key>
+    </entry>
+    <entry>
+      <key>Campaign Period</key>
+    </entry>
+    <entry>
+      <key>Single</key>
+    </entry>
+    <entry>
+      <key>Attachment</key>
+    </entry>
+    <entry>
+      <key>Attachments</key>
+    </entry>
+    <entry>
+      <key>Letter</key>
+    </entry>
+    <entry>
+      <key>Appointment</key>
+    </entry>
+    <entry>
+      <key>ARCHIEVED</key>
+    </entry>
+    <entry>
+      <key>UNSEEN</key>
+    </entry>
+    <entry>
+      <key>CONFIRMED</key>
+    </entry>
+    <entry>
+      <key>SEEN</key>
+    </entry>
+    <entry>
+      <key>rebuild Index</key>
+    </entry>
+    <entry>
+      <key>Charts</key>
+    </entry>
+    <entry>
+      <key>Keywords</key>
+    </entry>
+    <entry>
+      <key>Days running</key>
+    </entry>
+    <entry>
+      <key>Logs</key>
+    </entry>
+    <entry>
+      <key>Mail</key>
+    </entry>
+    <entry>
+      <key>Phonecall</key>
+    </entry>
+    <entry>
+      <key>Chart 2</key>
+    </entry>
+    <entry>
+      <key>Log</key>
+    </entry>
+    <entry>
+      <key>Offer Header Text</key>
+    </entry>
+    <entry>
+      <key>Employees</key>
+    </entry>
+    <entry>
+      <key>Todo</key>
+    </entry>
+    <entry>
+      <key>Days remaining</key>
+    </entry>
+    <entry>
+      <key>Offer Footer Text</key>
+    </entry>
+    <entry>
+      <key>Date new</key>
+    </entry>
+    <entry>
+      <key>Date edit</key>
+    </entry>
+    <entry>
+      <key>Keyword Attributes</key>
+    </entry>
+    <entry>
+      <key>HTML</key>
+    </entry>
+    <entry>
+      <key>Student/Internship</key>
+    </entry>
+    <entry>
+      <key>Food</key>
+    </entry>
+    <entry>
+      <key>200 to 349T</key>
+    </entry>
+    <entry>
+      <key>Within 6 months</key>
+    </entry>
+    <entry>
+      <key>No project planned</key>
+    </entry>
+    <entry>
+      <key>Logistics</key>
+    </entry>
+    <entry>
+      <key>Skilled workers</key>
+    </entry>
+    <entry>
+      <key>Purchasing</key>
+    </entry>
+    <entry>
+      <key>Rate</key>
+    </entry>
+    <entry>
+      <key>Choice</key>
+    </entry>
+    <entry>
+      <key>points</key>
+    </entry>
+    <entry>
+      <key>Education</key>
+    </entry>
+    <entry>
+      <key>Public</key>
+    </entry>
+    <entry>
+      <key>Building and construction suppliers</key>
+    </entry>
+    <entry>
+      <key>0 to 49</key>
+    </entry>
+    <entry>
+      <key>0 to 49T</key>
+    </entry>
+    <entry>
+      <key>CRM Manager</key>
+    </entry>
+    <entry>
+      <key>50 to 99T</key>
+    </entry>
+    <entry>
+      <key>Search</key>
+    </entry>
+    <entry>
+      <key>Counsellor</key>
+    </entry>
+    <entry>
+      <key>50 to 100</key>
+    </entry>
+    <entry>
+      <key>OnPremise</key>
+    </entry>
+    <entry>
+      <key>Head of IT</key>
+    </entry>
+    <entry>
+      <key>Electric</key>
+    </entry>
+    <entry>
+      <key>from 1,000</key>
+    </entry>
+    <entry>
+      <key>Publishing house</key>
+    </entry>
+    <entry>
+      <key>100 to 199T</key>
+    </entry>
+    <entry>
+      <key>101 to 250</key>
+    </entry>
+    <entry>
+      <key>Overarching</key>
+    </entry>
+    <entry>
+      <key>Energy</key>
+    </entry>
+    <entry>
+      <key>Machinery and equipment</key>
+    </entry>
+    <entry>
+      <key>Trade</key>
+    </entry>
+    <entry>
+      <key>Consultation</key>
+    </entry>
+    <entry>
+      <key>Cloud</key>
+    </entry>
+    <entry>
+      <key>No date yet</key>
+    </entry>
+    <entry>
+      <key>Classifications</key>
+    </entry>
+    <entry>
+      <key>Service Manager</key>
+    </entry>
+    <entry>
+      <key>Lifesience</key>
+    </entry>
+    <entry>
+      <key>Automotive</key>
+    </entry>
+    <entry>
+      <key>Lottery</key>
+    </entry>
+    <entry>
+      <key>from 350T</key>
+    </entry>
+    <entry>
+      <key>Management/Sales Manager</key>
+    </entry>
+    <entry>
+      <key>Environment</key>
+    </entry>
+    <entry>
+      <key>Within 12 months</key>
+    </entry>
+    <entry>
+      <key>Finance</key>
+    </entry>
+    <entry>
+      <key>ScoreProjectStart</key>
+    </entry>
+    <entry>
+      <key>ScoreStandard</key>
+    </entry>
+    <entry>
+      <key>ScoreCustomizing</key>
+    </entry>
+    <entry>
+      <key>ScoreDecisionPhase</key>
+    </entry>
+    <entry>
+      <key>ScoreUsers</key>
+    </entry>
+    <entry>
+      <key>ScoreBranch</key>
+    </entry>
+    <entry>
+      <key>ScorePosition</key>
+    </entry>
+    <entry>
+      <key>ScoreBudget</key>
+    </entry>
+    <entry>
+      <key>ScoreDepartment</key>
+    </entry>
+    <entry>
+      <key>ScoreCloud</key>
+    </entry>
+    <entry>
+      <key>ScoreBased</key>
+    </entry>
+    <entry>
+      <key>dfssdfsdf</key>
+    </entry>
+    <entry>
+      <key>Score</key>
+    </entry>
+    <entry>
+      <key>Scoretype</key>
+    </entry>
+    <entry>
+      <key>${NUMBER_FORMAT_NEEDED}</key>
+    </entry>
+    <entry>
+      <key>Classification number</key>
+    </entry>
+    <entry>
+      <key>Possible values</key>
+    </entry>
+    <entry>
+      <key>ARCHIVE</key>
+    </entry>
+    <entry>
+      <key>archieve</key>
+    </entry>
+    <entry>
+      <key>setUnread</key>
+    </entry>
+    <entry>
+      <key>Rating</key>
+    </entry>
+    <entry>
+      <key>sum</key>
+    </entry>
+    <entry>
+      <key>A: 75 &lt; </key>
+    </entry>
+    <entry>
+      <key>setRead</key>
+    </entry>
+    <entry>
+      <key>Possible Values</key>
+    </entry>
+    <entry>
+      <key>251 to 1,000</key>
+    </entry>
+    <entry>
+      <key>${SCORETYPE_ALREADY_EXISTS}</key>
+    </entry>
+    <entry>
+      <key>Selection</key>
+    </entry>
+    <entry>
+      <key>Dateien</key>
+    </entry>
+    <entry>
+      <key>Files</key>
+    </entry>
+    <entry>
+      <key>${COUNT_PREPOSITION_SINGLE}</key>
+    </entry>
+    <entry>
+      <key>Attribute \"%0\" has to be used at least %1.</key>
+    </entry>
+    <entry>
+      <key>${COUNT_PREPOSITION_MULTIPLE}</key>
+    </entry>
+    <entry>
+      <key>Attribute \"%0\" can't be used more than %1.</key>
+    </entry>
+    <entry>
+      <key>Recipient</key>
+    </entry>
+  </keyValueMap>
+  <font name="Dialog" style="0" size="11" />
+  <sqlModels>
+    <languageSql>
+      <name>Data_alias</name>
+      <alias>Data_alias</alias>
+      <statements>
+        <element>select AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY
+union
+select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE
+union
+select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
+union
+select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE
+union
+select TITLE from CLASSIFICATIONSCORE
+union
+select SCORETYPE from CLASSIFICATIONTYPE</element>
+      </statements>
+    </languageSql>
+  </sqlModels>
+</language>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index f259e2cef1b45a8b1bf44c63bdcc5903bb244ddf..c3ec4e4577ff8dba91ff274fd35de086f9b84ee0 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1,4485 +1,4794 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language 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/language/1.2.0">
-  <name>_____LANGUAGE_de</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <language>de</language>
-  <country></country>
-  <variant></variant>
-  <keyValueMap>
-    <entry>
-      <key>SalesprojectState</key>
-      <value>Status</value>
-    </entry>
-    <entry>
-      <key>Steps</key>
-      <value>Stufen</value>
-    </entry>
-    <entry>
-      <key>Project management</key>
-      <value>Projektmanagement</value>
-    </entry>
-    <entry>
-      <key>Notifications</key>
-      <value>Benachrichtigungen</value>
-    </entry>
-    <entry>
-      <key>Add to Campaign</key>
-      <value>Zu Kampagne hinzufügen</value>
-    </entry>
-    <entry>
-      <key>Company</key>
-      <value>Firma</value>
-    </entry>
-    <entry>
-      <key>Open tasks</key>
-      <value>Offene Aufgaben</value>
-    </entry>
-    <entry>
-      <key>Picture</key>
-      <value>Bild</value>
-    </entry>
-    <entry>
-      <key>Office staff</key>
-      <value>Innendienst</value>
-    </entry>
-    <entry>
-      <key>Overdue tasks</key>
-      <value>Überfällige Aufgaben</value>
-    </entry>
-    <entry>
-      <key>Confirm password</key>
-      <value>Passwort prüfen</value>
-    </entry>
-    <entry>
-      <key>Human Resources</key>
-      <value>Personal</value>
-    </entry>
-    <entry>
-      <key>Single</key>
-      <value>Einzel</value>
-    </entry>
-    <entry>
-      <key>Entrydate (Day)</key>
-      <value>Eingangsdatum (Tag)</value>
-    </entry>
-    <entry>
-      <key>Salesproject phases</key>
-      <value>Vertriebsprojektphasen</value>
-    </entry>
-    <entry>
-      <key>${ATTRIBUTE_VOID}</key>
-      <value>Tag</value>
-    </entry>
-    <entry>
-      <key>Campaign Period</key>
-      <value>Kampagnen Laufzeit</value>
-    </entry>
-    <entry>
-      <key>Turnover</key>
-      <value>Umsatz</value>
-    </entry>
-    <entry>
-      <key>Discount %</key>
-      <value>Rabatt %</value>
-    </entry>
-    <entry>
-      <key>SalesprojectPhase</key>
-      <value>Phase</value>
-    </entry>
-    <entry>
-      <key>Email must be unique!</key>
-      <value>Die E-Mail-Adresse muss eindeutig sein!</value>
-    </entry>
-    <entry>
-      <key>E-Mail</key>
-      <value>E-Mail</value>
-    </entry>
-    <entry>
-      <key>Maximal Count</key>
-      <value>Maximale Anzahl</value>
-    </entry>
-    <entry>
-      <key>UNSEEN</key>
-      <value>Neu</value>
-    </entry>
-    <entry>
-      <key>Campaign Participant</key>
-      <value>Kampagnen Teilnehmer/innen</value>
-    </entry>
-    <entry>
-      <key>Entrydate (Month)</key>
-      <value>Eingangsdatum (Monat)</value>
-    </entry>
-    <entry>
-      <key>Usage</key>
-      <value>Verwendung</value>
-    </entry>
-    <entry>
-      <key>Campaign status</key>
-      <value>Kampagnenstatus</value>
-    </entry>
-    <entry>
-      <key>Show all activities</key>
-      <value>Alle Aktivitäten anzeigen</value>
-    </entry>
-    <entry>
-      <key>Add the selection to a campaign</key>
-      <value>Fügt die Auswahl zur Kampagne hinzu</value>
-    </entry>
-    <entry>
-      <key>${ADDRESS_STATE}</key>
-      <value>Staat</value>
-    </entry>
-    <entry>
-      <key>New tasks</key>
-      <value>Neue Aufgaben</value>
-    </entry>
-    <entry>
-      <key>New module</key>
-      <value>Neuanlage</value>
-    </entry>
-    <entry>
-      <key>Show all contracts</key>
-      <value>Alle Verträge anzeigen</value>
-    </entry>
-    <entry>
-      <key>Max participants</key>
-      <value>Maximale Teilnehmer</value>
-    </entry>
-    <entry>
-      <key>This combination of person and organisation does already exist and can not be created once more.</key>
-      <value>Diese Kombination aus Person und Organisation existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
-    </entry>
-    <entry>
-      <key>Communication data</key>
-      <value>Kommunikationsdaten</value>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_NEGOTIATION}</key>
-      <value>Negotiation</value>
-    </entry>
-    <entry>
-      <key>Filename</key>
-      <value>Dateiname</value>
-    </entry>
-    <entry>
-      <key>Stored selections</key>
-      <value>Gespeicherte Suchen</value>
-    </entry>
-    <entry>
-      <key>Male</key>
-      <value>Männlich</value>
-    </entry>
-    <entry>
-      <key>Activity</key>
-      <value>Aktivität</value>
-    </entry>
-    <entry>
-      <key>participants will be added to the selected campaign step</key>
-      <value>Teilnehmer/innen werden zur ausgewählten Kampagnenstufe hinzugefügt</value>
-    </entry>
-    <entry>
-      <key>Name</key>
-      <value>Name</value>
-    </entry>
-    <entry>
-      <key>Austria</key>
-      <value>Österreich</value>
-    </entry>
-    <entry>
-      <key>Set campaign step</key>
-      <value>Kampagnenstufe setzen</value>
-    </entry>
-    <entry>
-      <key>New time tracking</key>
-      <value>Neuer Zeiteintrag</value>
-    </entry>
-    <entry>
-      <key>Customercode</key>
-      <value>Kundennummer</value>
-    </entry>
-    <entry>
-      <key>The person is already associated with another employee!</key>
-      <value>Die Person ist bereits mit einem anderen Mitarbeiter verknüpft!</value>
-    </entry>
-    <entry>
-      <key>Time expenses</key>
-      <value>Aufwand</value>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_OFFER}</key>
-      <value>Offer</value>
-    </entry>
-    <entry>
-      <key>Status</key>
-      <value>Status</value>
-    </entry>
-    <entry>
-      <key>Campaigns</key>
-      <value>Kampagnen</value>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_MEMBER}</key>
-      <value>Projektteam</value>
-    </entry>
-    <entry>
-      <key>${QUANTITY_LOWER_THAN_1}</key>
-      <value>Die Menge muss mindestens 1 sein.</value>
-    </entry>
-    <entry>
-      <key>date of birth must not be in the future</key>
-      <value>Geburtsdatum darf nicht in der Zukunft liegen</value>
-    </entry>
-    <entry>
-      <key>Days inactive</key>
-      <value>Tage inaktiv</value>
-    </entry>
-    <entry>
-      <key>Choose a campaign and a step to add the contact to a  campaign</key>
-      <value>Wählen Sie eine Kampagne und eine Stufe aus um den Kontakt hinzuzufügen</value>
-    </entry>
-    <entry>
-      <key>Active</key>
-      <value>Aktiv</value>
-    </entry>
-    <entry>
-      <key>Medium</key>
-      <value>Medium</value>
-    </entry>
-    <entry>
-      <key>Internet</key>
-      <value>Internet</value>
-    </entry>
-    <entry>
-      <key>Germany</key>
-      <value>Deutschland</value>
-    </entry>
-    <entry>
-      <key>Online-Meeting</key>
-      <value>Online-Meeting</value>
-    </entry>
-    <entry>
-      <key>Set password</key>
-      <value>Passwort setzen</value>
-    </entry>
-    <entry>
-      <key>Choose address</key>
-      <value>Adresse auswählen</value>
-    </entry>
-    <entry>
-      <key>Social Media</key>
-      <value>Social Media</value>
-    </entry>
-    <entry>
-      <key>Visit</key>
-      <value>Besuch</value>
-    </entry>
-    <entry>
-      <key>Information</key>
-      <value>Information</value>
-    </entry>
-    <entry>
-      <key>Language</key>
-      <value>Sprache</value>
-    </entry>
-    <entry>
-      <key>Phone</key>
-      <value>Telefon</value>
-    </entry>
-    <entry>
-      <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>360 Degree</key>
-      <value>360 Grad</value>
-    </entry>
-    <entry>
-      <key>Activities</key>
-      <value>Aktivitäten</value>
-    </entry>
-    <entry>
-      <key>Female</key>
-      <value>Weiblich</value>
-    </entry>
-    <entry>
-      <key>Contactmanagement</key>
-      <value>Kontaktmanagement</value>
-    </entry>
-    <entry>
-      <key>Mobile</key>
-      <value>Mobil</value>
-    </entry>
-    <entry>
-      <key>Office address</key>
-      <value>Firmenadresse</value>
-    </entry>
-    <entry>
-      <key>Contact</key>
-      <value>Kontakt</value>
-    </entry>
-    <entry>
-      <key>Home address</key>
-      <value>Privatadresse</value>
-    </entry>
-    <entry>
-      <key>Type</key>
-      <value>Typ</value>
-    </entry>
-    <entry>
-      <key>Contacts</key>
-      <value>Kontakte</value>
-    </entry>
-    <entry>
-      <key>Norway</key>
-      <value>Norwegen</value>
-    </entry>
-    <entry>
-      <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
-    </entry>
-    <entry>
-      <key>Address</key>
-      <value>Adresse</value>
-    </entry>
-    <entry>
-      <key>Addresses</key>
-      <value>Adressen</value>
-    </entry>
-    <entry>
-      <key>Contact type</key>
-      <value>Kontaktart</value>
-    </entry>
-    <entry>
-      <key>${COMM_ADDRESS}</key>
-      <value>Adresse</value>
-    </entry>
-    <entry>
-      <key>Gender</key>
-      <value>Geschlecht</value>
-    </entry>
-    <entry>
-      <key>Campaign Steps</key>
-      <value>Kampagnen Stufen</value>
-    </entry>
-    <entry>
-      <key>Show all companies</key>
-      <value>Alle Firmen anzeigen</value>
-    </entry>
-    <entry>
-      <key>Date of birth</key>
-      <value>Geburtsdatum</value>
-    </entry>
-    <entry>
-      <key>Lastname</key>
-      <value>Nachname</value>
-    </entry>
-    <entry>
-      <key>Salutation</key>
-      <value>Anrede</value>
-    </entry>
-    <entry>
-      <key>Middlename</key>
-      <value>Zwischenname</value>
-    </entry>
-    <entry>
-      <key>Title</key>
-      <value>Titel</value>
-    </entry>
-    <entry>
-      <key>Addresstype</key>
-      <value>Adresstyp</value>
-    </entry>
-    <entry>
-      <key>Add participants to Campaign</key>
-      <value>Kampagnenteilnehmer/innen hinzufügen</value>
-    </entry>
-    <entry>
-      <key>Firstname</key>
-      <value>Vorname</value>
-    </entry>
-    <entry>
-      <key>Show all contacts</key>
-      <value>Alle Kontaktpersonen anzeigen</value>
-    </entry>
-    <entry>
-      <key>Description</key>
-      <value>Beschreibung</value>
-    </entry>
-    <entry>
-      <key>Direction</key>
-      <value>Richtung</value>
-    </entry>
-    <entry>
-      <key>Entrydate</key>
-      <value>Eingangsdatum</value>
-    </entry>
-    <entry>
-      <key>Subject</key>
-      <value>Betreff</value>
-    </entry>
-    <entry>
-      <key>Post office box</key>
-      <value>Postfach</value>
-    </entry>
-    <entry>
-      <key>Delivery address</key>
-      <value>Lieferadresse</value>
-    </entry>
-    <entry>
-      <key>Participants</key>
-      <value>Teilnehmer/innen</value>
-    </entry>
-    <entry>
-      <key>House number</key>
-      <value>Hausnummer</value>
-    </entry>
-    <entry>
-      <key>Country</key>
-      <value>Land</value>
-    </entry>
-    <entry>
-      <key>Communication</key>
-      <value>Kommunikation</value>
-    </entry>
-    <entry>
-      <key>postcode</key>
-      <value>Postleitzahl</value>
-    </entry>
-    <entry>
-      <key>City</key>
-      <value>Ort</value>
-    </entry>
-    <entry>
-      <key>State</key>
-      <value>Status</value>
-    </entry>
-    <entry>
-      <key>Region</key>
-      <value>Region</value>
-    </entry>
-    <entry>
-      <key>District</key>
-      <value>Kreis</value>
-    </entry>
-    <entry>
-      <key>TODELETE</key>
-      <value>Für Löschung vorgesehen</value>
-    </entry>
-    <entry>
-      <key>Companies</key>
-      <value>Firmen</value>
-    </entry>
-    <entry>
-      <key>Switzerland</key>
-      <value>Schweiz</value>
-    </entry>
-    <entry>
-      <key>Confirmed</key>
-      <value>Bestätigt</value>
-    </entry>
-    <entry>
-      <key>Free</key>
-      <value>Frei</value>
-    </entry>
-    <entry>
-      <key>Tentative</key>
-      <value>Vorläufig</value>
-    </entry>
-    <entry>
-      <key>Ignore series</key>
-      <value>Monatliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
-    </entry>
-    <entry>
-      <key>Attachments</key>
-      <value>Anhänge</value>
-    </entry>
-    <entry>
-      <key>Internal (2)</key>
-    </entry>
-    <entry>
-      <key>Touchpoints</key>
-      <value>Kontaktpunkte</value>
-    </entry>
-    <entry>
-      <key>Document Template</key>
-      <value>Dokumentvorlage</value>
-    </entry>
-    <entry>
-      <key>Attribute Tree</key>
-      <value>Eigenschaftsbaum</value>
-    </entry>
-    <entry>
-      <key>Company Addresses</key>
-      <value>Firmenadressen</value>
-    </entry>
-    <entry>
-      <key>yearly series not specified</key>
-      <value>Jährliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
-    </entry>
-    <entry>
-      <key>OutOfOffice</key>
-      <value>Außer Haus</value>
-    </entry>
-    <entry>
-      <key>Cancelled</key>
-      <value>Abgesagt</value>
-    </entry>
-    <entry>
-      <key>Ignore daily series</key>
-      <value>Tägliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
-    </entry>
-    <entry>
-      <key>yyyyMMdd</key>
-      <value>yyyyMMdd</value>
-    </entry>
-    <entry>
-      <key>standard address</key>
-      <value>Standard-Adresse</value>
-    </entry>
-    <entry>
-      <key>Create receipt</key>
-      <value>Beleg erstellen</value>
-    </entry>
-    <entry>
-      <key>PP</key>
-      <value>EK</value>
-    </entry>
-    <entry>
-      <key>Liter</key>
-    </entry>
-    <entry>
-      <key>Key account</key>
-      <value>Großkunde</value>
-    </entry>
-    <entry>
-      <key>Cover letter</key>
-      <value>Anschreiben</value>
-    </entry>
-    <entry>
-      <key>VAT</key>
-      <value>UmsSt.</value>
-    </entry>
-    <entry>
-      <key>The expiry date must be after the start date!</key>
-      <value>Das Ende-Datum muss nach dem Beginn-Datum liegen!</value>
-    </entry>
-    <entry>
-      <key>Product</key>
-      <value>Produkt</value>
-    </entry>
-    <entry>
-      <key>Developer</key>
-      <value>Hersteller</value>
-    </entry>
-    <entry>
-      <key>Valid until</key>
-      <value>gültig bis</value>
-    </entry>
-    <entry>
-      <key>Department</key>
-      <value>Abteilung</value>
-    </entry>
-    <entry>
-      <key>Price list</key>
-      <value>Preisliste</value>
-    </entry>
-    <entry>
-      <key>Currency</key>
-      <value>Währung</value>
-    </entry>
-    <entry>
-      <key>Payment method</key>
-      <value>Zahlungsweise</value>
-    </entry>
-    <entry>
-      <key>Price list / Company</key>
-      <value>Preisliste / Firma</value>
-    </entry>
-    <entry>
-      <key>Curr. sales price</key>
-      <value>akt. VK-Preis</value>
-    </entry>
-    <entry>
-      <key>Contract</key>
-      <value>Vertrag</value>
-    </entry>
-    <entry>
-      <key>Stock</key>
-      <value>Lagerbestand</value>
-    </entry>
-    <entry>
-      <key>PP/SP</key>
-      <value>EK/VK</value>
-    </entry>
-    <entry>
-      <key>Next due date</key>
-      <value>nächste Fälligkeit</value>
-    </entry>
-    <entry>
-      <key>Discount</key>
-      <value>Rabatt</value>
-    </entry>
-    <entry>
-      <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
-      <value>Nächste Fälligkeit muss nach Vertragsbeginn und vor Vertragsende liegen!</value>
-    </entry>
-    <entry>
-      <key>Sales</key>
-      <value>Vertrieb</value>
-    </entry>
-    <entry>
-      <key>Contract number</key>
-      <value>Vertragsnummer</value>
-    </entry>
-    <entry>
-      <key>Min. stock</key>
-      <value>Min.-Bestand</value>
-    </entry>
-    <entry>
-      <key>SP</key>
-      <value>VK</value>
-    </entry>
-    <entry>
-      <key>Commodity group 3</key>
-      <value>Warengruppe 3</value>
-    </entry>
-    <entry>
-      <key>Commodity group 2</key>
-      <value>Warengruppe 2</value>
-    </entry>
-    <entry>
-      <key>Campaign Step</key>
-      <value>Kampagnen Stufe</value>
-    </entry>
-    <entry>
-      <key>CampaignStep</key>
-      <value>Kampagnen Stufe</value>
-    </entry>
-    <entry>
-      <key>Commodity group 1</key>
-      <value>Warengruppe 1</value>
-    </entry>
-    <entry>
-      <key>Contract start date</key>
-      <value>Vertragsbeginn</value>
-    </entry>
-    <entry>
-      <key>Remaining Runtime</key>
-      <value>Restlaufzeit</value>
-    </entry>
-    <entry>
-      <key>Spare parts</key>
-      <value>Ersatzteile</value>
-    </entry>
-    <entry>
-      <key>Employee</key>
-      <value>Mitarbeiter</value>
-    </entry>
-    <entry>
-      <key>Unit</key>
-      <value>Einheit</value>
-    </entry>
-    <entry>
-      <key>Contract expiry date</key>
-      <value>Vertragsende</value>
-    </entry>
-    <entry>
-      <key>Yes</key>
-      <value>Ja</value>
-    </entry>
-    <entry>
-      <key>Type of contract</key>
-      <value>Vertragsart</value>
-    </entry>
-    <entry>
-      <key>No</key>
-      <value>Nein</value>
-    </entry>
-    <entry>
-      <key>Service</key>
-      <value>Dienstleistung</value>
-    </entry>
-    <entry>
-      <key>Advertising material</key>
-      <value>Werbemittel</value>
-    </entry>
-    <entry>
-      <key>Valid from</key>
-      <value>gültig ab</value>
-    </entry>
-    <entry>
-      <key>Product name</key>
-      <value>Produktname</value>
-    </entry>
-    <entry>
-      <key>Campaign</key>
-      <value>Kampagne</value>
-    </entry>
-    <entry>
-      <key>Product group</key>
-      <value>Produktgruppe</value>
-    </entry>
-    <entry>
-      <key>${CONTRACT_STATUS}</key>
-      <value>Status</value>
-    </entry>
-    <entry>
-      <key>From no. of units</key>
-      <value>ab Stückzahl</value>
-    </entry>
-    <entry>
-      <key>Maindocuments</key>
-      <value>Hauptdokumente</value>
-    </entry>
-    <entry>
-      <key>Price</key>
-      <value>Preis</value>
-    </entry>
-    <entry>
-      <key>Conditions</key>
-      <value>Konditionen</value>
-    </entry>
-    <entry>
-      <key>Standard</key>
-    </entry>
-    <entry>
-      <key>I / O</key>
-      <value>E / A</value>
-    </entry>
-    <entry>
-      <key>Date</key>
-      <value>Datum</value>
-    </entry>
-    <entry>
-      <key>IN</key>
-      <value>EIN</value>
-    </entry>
-    <entry>
-      <key>OUT</key>
-      <value>AUS</value>
-    </entry>
-    <entry>
-      <key>Warehouse</key>
-      <value>Lager</value>
-    </entry>
-    <entry>
-      <key>Reference</key>
-      <value>Referenz</value>
-    </entry>
-    <entry>
-      <key>The contract number already exists!</key>
-      <value>Die Vertragsnummer existiert bereits!</value>
-    </entry>
-    <entry>
-      <key>The product number already exists!</key>
-      <value>Die Produktnummer existiert bereits!</value>
-    </entry>
-    <entry>
-      <key>Quantity</key>
-      <value>Menge</value>
-    </entry>
-    <entry>
-      <key>Salesproject</key>
-      <value>Vertriebsprojekt</value>
-    </entry>
-    <entry>
-      <key>Rollout</key>
-      <value>Roll Out</value>
-    </entry>
-    <entry>
-      <key>Phase</key>
-      <value>Phase</value>
-    </entry>
-    <entry>
-      <key>Product number</key>
-      <value>Produktnummer</value>
-    </entry>
-    <entry>
-      <key>Project number</key>
-      <value>Projektnummer</value>
-    </entry>
-    <entry>
-      <key>Project title</key>
-      <value>Projekttitel</value>
-    </entry>
-    <entry>
-      <key>Project start</key>
-      <value>Projektstart</value>
-    </entry>
-    <entry>
-      <key>Volume</key>
-      <value>Volumen</value>
-    </entry>
-    <entry>
-      <key>Partial order</key>
-      <value>Teilauftrag</value>
-    </entry>
-    <entry>
-      <key>Open</key>
-      <value>Offen</value>
-    </entry>
-    <entry>
-      <key>Lost</key>
-      <value>Verloren</value>
-    </entry>
-    <entry>
-      <key>Order</key>
-      <value>Auftrag</value>
-    </entry>
-    <entry>
-      <key>Postponed</key>
-      <value>Vertagt</value>
-    </entry>
-    <entry>
-      <key>Aborted</key>
-      <value>Abgebrochen</value>
-    </entry>
-    <entry>
-      <key>Negotiation</key>
-      <value>Verhandlung</value>
-    </entry>
-    <entry>
-      <key>Workshop</key>
-      <value>Workshop</value>
-    </entry>
-    <entry>
-      <key>Presentation preparation</key>
-      <value>Präsentationsvorbereitung</value>
-    </entry>
-    <entry>
-      <key>Specifications in progress</key>
-      <value>Lastenheft in Bearbeitung</value>
-    </entry>
-    <entry>
-      <key>Project decision</key>
-      <value>Projektentscheidung</value>
-    </entry>
-    <entry>
-      <key>Lead</key>
-      <value>Lead</value>
-    </entry>
-    <entry>
-      <key>Total net</key>
-      <value>Betrag netto</value>
-    </entry>
-    <entry>
-      <key>Offer</key>
-      <value>Angebot</value>
-    </entry>
-    <entry>
-      <key>Offer number</key>
-      <value>Angebotsnummer</value>
-    </entry>
-    <entry>
-      <key>Show my activities</key>
-      <value>Meine Aktivitäten anzeigen</value>
-    </entry>
-    <entry>
-      <key>Probability</key>
-      <value>Wahrscheinlichkeit</value>
-    </entry>
-    <entry>
-      <key>Total VAT</key>
-      <value>Betrag MWST</value>
-    </entry>
-    <entry>
-      <key>The offer number already exists!</key>
-      <value>Die Angebotsnummer existiert bereits!</value>
-    </entry>
-    <entry>
-      <key>0 %</key>
-    </entry>
-    <entry>
-      <key>75 %</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>100 %</key>
-    </entry>
-    <entry>
-      <key>25 %</key>
-    </entry>
-    <entry>
-      <key>50 %</key>
-    </entry>
-    <entry>
-      <key>Competitors</key>
-      <value>Mitbewerber</value>
-    </entry>
-    <entry>
-      <key>Won</key>
-      <value>Gewonnen</value>
-    </entry>
-    <entry>
-      <key>Checked</key>
-      <value>Geprüft</value>
-    </entry>
-    <entry>
-      <key>Sent</key>
-      <value>Versendet</value>
-    </entry>
-    <entry>
-      <key>Offeritems</key>
-      <value>Angebotsposten</value>
-    </entry>
-    <entry>
-      <key>Header text</key>
-      <value>Kopftext</value>
-    </entry>
-    <entry>
-      <key>Commodity group</key>
-      <value>Warengruppe</value>
-    </entry>
-    <entry>
-      <key>Footer text</key>
-      <value>Fußtext</value>
-    </entry>
-    <entry>
-      <key>Designation</key>
-      <value>Bezeichnung</value>
-    </entry>
-    <entry>
-      <key>Position</key>
-      <value>Position</value>
-    </entry>
-    <entry>
-      <key>Receipt</key>
-      <value>Beleg</value>
-    </entry>
-    <entry>
-      <key>CONFIRMED</key>
-      <value>Gelesen</value>
-    </entry>
-    <entry>
-      <key>Show all receipts</key>
-      <value>Alle Belege anzeigen</value>
-    </entry>
-    <entry>
-      <key>Optional</key>
-      <value>Optional</value>
-    </entry>
-    <entry>
-      <key>Article</key>
-      <value>Artikel</value>
-    </entry>
-    <entry>
-      <key>Show open salesprojects</key>
-      <value>Offene Vertriebsprojekte anzeigen</value>
-    </entry>
-    <entry>
-      <key>Receipt number</key>
-      <value>Belegnummer</value>
-    </entry>
-    <entry>
-      <key>Offeritem</key>
-      <value>Angebotsposten</value>
-    </entry>
-    <entry>
-      <key>Sum</key>
-      <value>Summe</value>
-    </entry>
-    <entry>
-      <key>Option4</key>
-    </entry>
-    <entry>
-      <key>ARCHIEVED</key>
-      <value>Archiviert</value>
-    </entry>
-    <entry>
-      <key>Offers</key>
-      <value>Angebote</value>
-    </entry>
-    <entry>
-      <key>Option3</key>
-    </entry>
-    <entry>
-      <key>Option2</key>
-    </entry>
-    <entry>
-      <key>Option1</key>
-    </entry>
-    <entry>
-      <key>Countries</key>
-      <value>Länder</value>
-    </entry>
-    <entry>
-      <key>Options</key>
-    </entry>
-    <entry>
-      <key>Total gross</key>
-      <value>Betrag brutto</value>
-    </entry>
-    <entry>
-      <key>Minimal Count</key>
-      <value>Minimale Anzahl</value>
-    </entry>
-    <entry>
-      <key>Identical price list found!</key>
-      <value>Identische Preisliste gefunden!</value>
-    </entry>
-    <entry>
-      <key>Imminent appointments for today</key>
-      <value>Bevorstehende Termine für heute</value>
-    </entry>
-    <entry>
-      <key>Parts list</key>
-      <value>Stückliste</value>
-    </entry>
-    <entry>
-      <key>${THOUSAND_SHORT}</key>
-      <value>T</value>
-    </entry>
-    <entry>
-      <key>Deliver opinion</key>
-      <value>Stellungnahme abgeben</value>
-    </entry>
-    <entry>
-      <key>Presentation follow-up</key>
-      <value>Präsentationsnachbereitung</value>
-    </entry>
-    <entry>
-      <key>Waiting for requirements</key>
-      <value>Warten auf Anforderungen</value>
-    </entry>
-    <entry>
-      <key>Parent</key>
-    </entry>
-    <entry>
-      <key>${EURO_SIGN}</key>
-      <value>€</value>
-    </entry>
-    <entry>
-      <key>Planned</key>
-      <value>Geplant
-</value>
-    </entry>
-    <entry>
-      <key>Info</key>
-      <value>Info
-</value>
-    </entry>
-    <entry>
-      <key>${VOLUME_MONEY}</key>
-      <value>Wert
-</value>
-    </entry>
-    <entry>
-      <key>Milestones</key>
-      <value>Meilensteine
-</value>
-    </entry>
-    <entry>
-      <key>Milestone</key>
-      <value>Meilenstein
-</value>
-    </entry>
-    <entry>
-      <key>Excreted</key>
-      <value>Ausgeschieden
-</value>
-    </entry>
-    <entry>
-      <key>Reason</key>
-      <value>Begründung</value>
-    </entry>
-    <entry>
-      <key>Document</key>
-      <value>Dokument</value>
-    </entry>
-    <entry>
-      <key>Remark</key>
-      <value>Anmerkung</value>
-    </entry>
-    <entry>
-      <key>Competition</key>
-      <value>Mitbewerber</value>
-    </entry>
-    <entry>
-      <key>Forecast</key>
-      <value>Forecast</value>
-    </entry>
-    <entry>
-      <key>Show all products</key>
-      <value>Alle Produkte anzeigen</value>
-    </entry>
-    <entry>
-      <key>Role</key>
-      <value>Rolle</value>
-    </entry>
-    <entry>
-      <key>End date</key>
-      <value>Enddatum</value>
-    </entry>
-    <entry>
-      <key>Documents</key>
-      <value>Dokumente</value>
-    </entry>
-    <entry>
-      <key>New offer version</key>
-      <value>Neue Angebotsversion</value>
-    </entry>
-    <entry>
-      <key>Copy offer</key>
-      <value>Angebot kopieren</value>
-    </entry>
-    <entry>
-      <key>Vers. no.</key>
-      <value>Vers.-Nr.</value>
-    </entry>
-    <entry>
-      <key>Curr. purchase price</key>
-      <value>akt. EK-Preis</value>
-    </entry>
-    <entry>
-      <key>Industry 3</key>
-      <value>Branche 3</value>
-    </entry>
-    <entry>
-      <key>Industry 2</key>
-      <value>Branche 2</value>
-    </entry>
-    <entry>
-      <key>Show all offers</key>
-      <value>Alle Angebote anzeigen</value>
-    </entry>
-    <entry>
-      <key>Filetype</key>
-      <value>Dateityp</value>
-    </entry>
-    <entry>
-      <key>child of</key>
-      <value>Kind von</value>
-    </entry>
-    <entry>
-      <key>Products</key>
-      <value>Produkte</value>
-    </entry>
-    <entry>
-      <key>Filesize</key>
-      <value>Dateigrösse</value>
-    </entry>
-    <entry>
-      <key>Industry 1</key>
-      <value>Branche 1</value>
-    </entry>
-    <entry>
-      <key>Contracts</key>
-      <value>Verträge</value>
-    </entry>
-    <entry>
-      <key>Classification</key>
-      <value>Klassifizierung</value>
-    </entry>
-    <entry>
-      <key>Class A</key>
-      <value>Klasse A</value>
-    </entry>
-    <entry>
-      <key>Class C</key>
-      <value>Klasse C</value>
-    </entry>
-    <entry>
-      <key>Class B</key>
-      <value>Klasse B</value>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
-      <value>fieldOrTableName muss ein String oder ein Array aus 2 Strings sein.</value>
-    </entry>
-    <entry>
-      <key>High price strategy</key>
-      <value>Hochpreisstrategie</value>
-    </entry>
-    <entry>
-      <key>Show all sent receipts</key>
-      <value>Alle versendeten Belege anzeigen</value>
-    </entry>
-    <entry>
-      <key>Low price strategy</key>
-      <value>Niedrigpreisstrategie</value>
-    </entry>
-    <entry>
-      <key>Uid</key>
-    </entry>
-    <entry>
-      <key>in 6 Months</key>
-    </entry>
-    <entry>
-      <key>Sent offers</key>
-      <value>Versendete Angebote</value>
-    </entry>
-    <entry>
-      <key>Budget (Project)</key>
-    </entry>
-    <entry>
-      <key>responsible</key>
-      <value>verantwortlich</value>
-    </entry>
-    <entry>
-      <key>False</key>
-      <value>Nein</value>
-    </entry>
-    <entry>
-      <key>Show all Facebook posts of a user</key>
-      <value>Alle Facebook Beiträge eines Benutzers anzeigen</value>
-    </entry>
-    <entry>
-      <key>My Activities</key>
-      <value>Meine Aktivitäten</value>
-    </entry>
-    <entry>
-      <key>Everyone</key>
-      <value>Jeder</value>
-    </entry>
-    <entry>
-      <key>Combobox Value</key>
-      <value>Combobox-Wert</value>
-    </entry>
-    <entry>
-      <key>Salesprojects</key>
-      <value>Vertriebsprojekte</value>
-    </entry>
-    <entry>
-      <key>to</key>
-    </entry>
-    <entry>
-      <key>Open salesprojects</key>
-      <value>Offene Vertriebsprojekte</value>
-    </entry>
-    <entry>
-      <key>Other</key>
-    </entry>
-    <entry>
-      <key>Show all sent offers</key>
-      <value>Alle versendeten Angebote anzeigen</value>
-    </entry>
-    <entry>
-      <key>Show all Facebook posts of ADITO</key>
-      <value>Alle Facebook Beiträge von ADITO anzeigen</value>
-    </entry>
-    <entry>
-      <key>Individual</key>
-    </entry>
-    <entry>
-      <key>Organisation</key>
-      <value>Organisation</value>
-    </entry>
-    <entry>
-      <key>Base</key>
-      <value>Base</value>
-    </entry>
-    <entry>
-      <key>Receipts</key>
-      <value>Belege</value>
-    </entry>
-    <entry>
-      <key>Show all salesprojects</key>
-      <value>Alle Vertriebsprojekte anzeigen</value>
-    </entry>
-    <entry>
-      <key>Abomodel</key>
-      <value>Abomodell</value>
-    </entry>
-    <entry>
-      <key>Show all tweets of ADITO</key>
-      <value>Alle tweets von ADITO anzeigen</value>
-    </entry>
-    <entry>
-      <key>Show all tweets of a user</key>
-      <value>Alle tweets eines Benutzers anzeigen</value>
-    </entry>
-    <entry>
-      <key>in 12 Months</key>
-    </entry>
-    <entry>
-      <key>Standard / Individual</key>
-    </entry>
-    <entry>
-      <key>Please update the ${FORECAST_ENGLISH}.</key>
-      <value>Bitte den Forecast überprüfen.</value>
-    </entry>
-    <entry>
-      <key>Industry</key>
-      <value>Branche</value>
-    </entry>
-    <entry>
-      <key>From</key>
-      <value>Von</value>
-    </entry>
-    <entry>
-      <key>no Project planned</key>
-    </entry>
-    <entry>
-      <key>Strength 3</key>
-      <value>Stärke 3</value>
-    </entry>
-    <entry>
-      <key>Strength 1</key>
-      <value>Stärke 1</value>
-    </entry>
-    <entry>
-      <key>Strength 2</key>
-      <value>Stärke 2</value>
-    </entry>
-    <entry>
-      <key>Value</key>
-      <value>Wert</value>
-    </entry>
-    <entry>
-      <key>Weakness 1</key>
-      <value>Schwäche 1</value>
-    </entry>
-    <entry>
-      <key>Weakness 2</key>
-      <value>Schwäche 2</value>
-    </entry>
-    <entry>
-      <key>Weakness 3</key>
-      <value>Schwäche 3</value>
-    </entry>
-    <entry>
-      <key>Projectstart</key>
-      <value>Projektstart</value>
-    </entry>
-    <entry>
-      <key>no standard email office</key>
-      <value>keine Standard-E-Mail Büro vorhanden !</value>
-    </entry>
-    <entry>
-      <key>no valid format</key>
-    </entry>
-    <entry>
-      <key>Deliveryspecification</key>
-      <value>Lieferbedingung</value>
-    </entry>
-    <entry>
-      <key>Plus Salestax</key>
-      <value>zzgl.Summe UmSt</value>
-    </entry>
-    <entry>
-      <key>Pos.</key>
-    </entry>
-    <entry>
-      <key>ISO 3166-1 alpha-3</key>
-    </entry>
-    <entry>
-      <key>ISO 3166-1 alpha-2</key>
-    </entry>
-    <entry>
-      <key>Field staff</key>
-      <value>Außendienst</value>
-    </entry>
-    <entry>
-      <key>0.00</key>
-    </entry>
-    <entry>
-      <key>Document Templates</key>
-      <value>Dokumentvorlagen</value>
-    </entry>
-    <entry>
-      <key>Conditions of payment</key>
-      <value>Zahlungsbedingung</value>
-    </entry>
-    <entry>
-      <key>Relationship</key>
-      <value>Beziehung</value>
-    </entry>
-    <entry>
-      <key>Text Modular</key>
-      <value>Textbaustein</value>
-    </entry>
-    <entry>
-      <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
-      <value>Für dieses Binärfeld ist nur ein Datensatz erlaubt.</value>
-    </entry>
-    <entry>
-      <key>Put Reciever Into To</key>
-      <value>Bitte einen Adressat in 'to' eintragen!</value>
-    </entry>
-    <entry>
-      <key>History</key>
-      <value>Verlauf</value>
-    </entry>
-    <entry>
-      <key>Total</key>
-      <value>Gesamt</value>
-    </entry>
-    <entry>
-      <key>Articlenumber</key>
-      <value>Artikelnummer</value>
-    </entry>
-    <entry>
-      <key>Native Name</key>
-      <value>Geburtsname</value>
-    </entry>
-    <entry>
-      <key>#,##0</key>
-    </entry>
-    <entry>
-      <key>Unitprice</key>
-      <value>Einzelpreis</value>
-    </entry>
-    <entry>
-      <key>Number</key>
-      <value>Nummer</value>
-    </entry>
-    <entry>
-      <key>Tasks</key>
-      <value>Aufgaben</value>
-    </entry>
-    <entry>
-      <key>New offer</key>
-      <value>Angebot erstellen</value>
-    </entry>
-    <entry>
-      <key>dd.MM.yyyy</key>
-      <value>dd.MM.yyyy</value>
-    </entry>
-    <entry>
-      <key>Articledescription</key>
-      <value>Artikelbezeichnung</value>
-    </entry>
-    <entry>
-      <key>Edit defaults</key>
-      <value>Standards anpassen</value>
-    </entry>
-    <entry>
-      <key>no valid mail-address format</key>
-    </entry>
-    <entry>
-      <key>Amount</key>
-      <value>Menge</value>
-    </entry>
-    <entry>
-      <key>#,##0.00</key>
-    </entry>
-    <entry>
-      <key>Latin Name</key>
-      <value>Lateinischer Name</value>
-    </entry>
-    <entry>
-      <key>Organisation name</key>
-      <value>Name der Organisation</value>
-    </entry>
-    <entry>
-      <key>Connection</key>
-      <value>Verknüpfung</value>
-    </entry>
-    <entry>
-      <key>standard email</key>
-      <value>Standard-Email</value>
-    </entry>
-    <entry>
-      <key>Creator</key>
-      <value>Ersteller</value>
-    </entry>
-    <entry>
-      <key>Timetracking</key>
-      <value>Zeiterfassung</value>
-    </entry>
-    <entry>
-      <key>Further informations</key>
-      <value>Weitere Informationen</value>
-    </entry>
-    <entry>
-      <key>Social</key>
-      <value>Sozial</value>
-    </entry>
-    <entry>
-      <key>Facebook Feed</key>
-      <value>Facebook Feed</value>
-    </entry>
-    <entry>
-      <key>Group1</key>
-    </entry>
-    <entry>
-      <key>Group2</key>
-    </entry>
-    <entry>
-      <key>Details</key>
-      <value>Details</value>
-    </entry>
-    <entry>
-      <key>Prices</key>
-      <value>Preise</value>
-    </entry>
-    <entry>
-      <key>Twitter</key>
-      <value>Twitter</value>
-    </entry>
-    <entry>
-      <key>Connections</key>
-      <value>Verknüpfungen</value>
-    </entry>
-    <entry>
-      <key>Object</key>
-      <value>Objekt</value>
-    </entry>
-    <entry>
-      <key>Attributes</key>
-      <value>Eigenschaften</value>
-    </entry>
-    <entry>
-      <key>Facebook</key>
-      <value>Facebook</value>
-    </entry>
-    <entry>
-      <key>Creation date</key>
-      <value>Erstellungsdatum</value>
-    </entry>
-    <entry>
-      <key>Year</key>
-      <value>Jahr</value>
-    </entry>
-    <entry>
-      <key>New receipt version</key>
-      <value>Neue Quittungsversion</value>
-    </entry>
-    <entry>
-      <key>Orderitems</key>
-      <value>Belegposten</value>
-    </entry>
-    <entry>
-      <key>Sent receipts</key>
-      <value>Versendete Belege</value>
-    </entry>
-    <entry>
-      <key>Copy receipt</key>
-      <value>Beleg kopieren</value>
-    </entry>
-    <entry>
-      <key>Orderitem</key>
-    </entry>
-    <entry>
-      <key>The order number already exists!</key>
-    </entry>
-    <entry>
-      <key>New activity</key>
-      <value>Neue Aktivität</value>
-    </entry>
-    <entry>
-      <key>July</key>
-      <value>Juli</value>
-    </entry>
-    <entry>
-      <key>ADITO Facebook Feed</key>
-    </entry>
-    <entry>
-      <key>ADITO Twitter Feed</key>
-    </entry>
-    <entry>
-      <key>June</key>
-      <value>Juni</value>
-    </entry>
-    <entry>
-      <key>October</key>
-      <value>Oktober</value>
-    </entry>
-    <entry>
-      <key>Take price</key>
-      <value>Preis übernehmen</value>
-    </entry>
-    <entry>
-      <key>Customer Base Sheet</key>
-      <value>Kundenstammblatt</value>
-    </entry>
-    <entry>
-      <key>Twitter Feed</key>
-      <value>Twitter Feed</value>
-    </entry>
-    <entry>
-      <key>November</key>
-      <value>November</value>
-    </entry>
-    <entry>
-      <key>December</key>
-      <value>Dezember</value>
-    </entry>
-    <entry>
-      <key>May</key>
-      <value>Mai</value>
-    </entry>
-    <entry>
-      <key>April</key>
-      <value>April</value>
-    </entry>
-    <entry>
-      <key>January</key>
-      <value>Januar</value>
-    </entry>
-    <entry>
-      <key>March</key>
-      <value>März</value>
-    </entry>
-    <entry>
-      <key>September</key>
-      <value>September</value>
-    </entry>
-    <entry>
-      <key>August</key>
-      <value>August</value>
-    </entry>
-    <entry>
-      <key>Category</key>
-      <value>Kategorie</value>
-    </entry>
-    <entry>
-      <key>February</key>
-      <value>Februar</value>
-    </entry>
-    <entry>
-      <key>asdf</key>
-    </entry>
-    <entry>
-      <key>{$TASK_STATUS}</key>
-      <value>Status</value>
-    </entry>
-    <entry>
-      <key>Task</key>
-      <value>Aufgabe</value>
-    </entry>
-    <entry>
-      <key>subject</key>
-      <value>Betreff</value>
-    </entry>
-    <entry>
-      <key>{$TASK_REQUESTOR}</key>
-      <value>Anforderer</value>
-    </entry>
-    <entry>
-      <key>task number</key>
-      <value>Aufgabennummer</value>
-    </entry>
-    <entry>
-      <key>description</key>
-      <value>Beschreibung</value>
-    </entry>
-    <entry>
-      <key>priority</key>
-      <value>Priorität</value>
-    </entry>
-    <entry>
-      <key>{$TASK_EDITOR}</key>
-      <value>Bearbeiter</value>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_HIGH}</key>
-      <value>hoch</value>
-    </entry>
-    <entry>
-      <key>Seite</key>
-    </entry>
-    <entry>
-      <key>Senden per E-Mail</key>
-    </entry>
-    <entry>
-      <key>Hauptdokument</key>
-    </entry>
-    <entry>
-      <key>Betreff</key>
-    </entry>
-    <entry>
-      <key>title</key>
-      <value>Titel</value>
-    </entry>
-    <entry>
-      <key>von</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_LOW}</key>
-      <value>niedrig</value>
-    </entry>
-    <entry>
-      <key>Nur Eigene anzeigen</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_NORMAL}</key>
-      <value>normal</value>
-    </entry>
-    <entry>
-      <key>Beschreibung</key>
-    </entry>
-    <entry>
-      <key>Unit price</key>
-      <value>Einzelpreis</value>
-    </entry>
-    <entry>
-      <key>Firma</key>
-    </entry>
-    <entry>
-      <key>type</key>
-      <value>Typ</value>
-    </entry>
-    <entry>
-      <key>Benutzer</key>
-    </entry>
-    <entry>
-      <key>Schlüsselwort</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_NONE}</key>
-      <value>keine</value>
-    </entry>
-    <entry>
-      <key>Directly responsible:</key>
-      <value>Ihr zuständiger Betreuer:</value>
-    </entry>
-    <entry>
-      <key>Appointment</key>
-      <value>Termin</value>
-    </entry>
-    <entry>
-      <key>Vorschau</key>
-    </entry>
-    <entry>
-      <key>Angebot</key>
-    </entry>
-    <entry>
-      <key>Salesdashboard</key>
-      <value>Vertriebsdashboard</value>
-    </entry>
-    <entry>
-      <key>details</key>
-      <value>details</value>
-    </entry>
-    <entry>
-      <key>Kundenstammblatt</key>
-    </entry>
-    <entry>
-      <key>Key figures</key>
-    </entry>
-    <entry>
-      <key>Person</key>
-    </entry>
-    <entry>
-      <key>Detail</key>
-      <value>Detail</value>
-    </entry>
-    <entry>
-      <key>Object 2</key>
-      <value>Objekt 2</value>
-    </entry>
-    <entry>
-      <key>Object 1</key>
-      <value>Objekt 1</value>
-    </entry>
-    <entry>
-      <key>Type 2</key>
-      <value>Typ 2</value>
-    </entry>
-    <entry>
-      <key>Type 1</key>
-      <value>Typ 1</value>
-    </entry>
-    <entry>
-      <key>Relations</key>
-      <value>Beziehungen</value>
-    </entry>
-    <entry>
-      <key>${FORECAST_ENGLISH}</key>
-      <value>Forecast</value>
-    </entry>
-    <entry>
-      <key>Title (original language)</key>
-      <value>Titel (ursprüngliche Sprache)</value>
-    </entry>
-    <entry>
-      <key>Attribute Relation</key>
-      <value>Eigenschaftsbeziehung</value>
-    </entry>
-    <entry>
-      <key>My Dashboard</key>
-      <value>My Dashboard</value>
-    </entry>
-    <entry>
-      <key>Attribute Usage</key>
-      <value>Eigenschaftsverwendung</value>
-    </entry>
-    <entry>
-      <key>Key</key>
-    </entry>
-    <entry>
-      <key>Attribute</key>
-      <value>Eigenschaft</value>
-    </entry>
-    <entry>
-      <key>Container</key>
-    </entry>
-    <entry>
-      <key>Administration</key>
-      <value>Administration</value>
-    </entry>
-    <entry>
-      <key>Keyword</key>
-      <value>Schlüsselwort</value>
-    </entry>
-    <entry>
-      <key>Sorting</key>
-      <value>Sortierung</value>
-    </entry>
-    <entry>
-      <key>jdito</key>
-    </entry>
-    <entry>
-      <key>Context id</key>
-    </entry>
-    <entry>
-      <key>Context name</key>
-    </entry>
-    <entry>
-      <key>Cambodia</key>
-      <value>Kambodscha</value>
-    </entry>
-    <entry>
-      <key>Resigned</key>
-      <value>gekündigt</value>
-    </entry>
-    <entry>
-      <key>Customer</key>
-      <value>Kunde</value>
-    </entry>
-    <entry>
-      <key>Outgoing</key>
-      <value>ausgehend</value>
-    </entry>
-    <entry>
-      <key>Paraguay</key>
-      <value>Paraguay</value>
-    </entry>
-    <entry>
-      <key>New attribute</key>
-      <value>Neues Attribut</value>
-    </entry>
-    <entry>
-      <key>Solomon Islands</key>
-      <value>Salomon-Inseln</value>
-    </entry>
-    <entry>
-      <key>Montserrat</key>
-      <value>Montserrat</value>
-    </entry>
-    <entry>
-      <key>Guadeloupe</key>
-      <value>Guadeloupe</value>
-    </entry>
-    <entry>
-      <key>Product_technic</key>
-      <value>Produkt_Technik</value>
-    </entry>
-    <entry>
-      <key>Moldova (Republic of)</key>
-      <value>Republik Moldau</value>
-    </entry>
-    <entry>
-      <key>Seychelles</key>
-      <value>Seychellen</value>
-    </entry>
-    <entry>
-      <key>Canadian dollar</key>
-      <value>Kanadischer Dollar</value>
-    </entry>
-    <entry>
-      <key>Bahrain</key>
-      <value>Bahrain</value>
-    </entry>
-    <entry>
-      <key>Comoros</key>
-      <value>Komoren</value>
-    </entry>
-    <entry>
-      <key>Faroe Islands</key>
-      <value>Färöer Inseln</value>
-    </entry>
-    <entry>
-      <key>Finland</key>
-      <value>Finnland</value>
-    </entry>
-    <entry>
-      <key>Project_duration</key>
-      <value>Projekt_Dauer</value>
-    </entry>
-    <entry>
-      <key>Company_internationality</key>
-      <value>Unternehmen_Internationalität</value>
-    </entry>
-    <entry>
-      <key>Eritrea</key>
-      <value>Eritrea</value>
-    </entry>
-    <entry>
-      <key>Puerto Rico</key>
-      <value>Puerto Rico</value>
-    </entry>
-    <entry>
-      <key>Viet Nam</key>
-      <value>Vietnam</value>
-    </entry>
-    <entry>
-      <key>Libya</key>
-      <value>Libyen</value>
-    </entry>
-    <entry>
-      <key>French</key>
-      <value>Französisch</value>
-    </entry>
-    <entry>
-      <key>Cocos (Keeling) Islands</key>
-      <value>Kokosinseln (Keelinginseln)</value>
-    </entry>
-    <entry>
-      <key>Saint Helena, Ascension and Tristan da Cunha</key>
-      <value>St. Helena, Himmelfahrt und Tristan da Cunha</value>
-    </entry>
-    <entry>
-      <key>Liechtenstein</key>
-      <value>Liechtenstein</value>
-    </entry>
-    <entry>
-      <key>Product_functionality</key>
-      <value>Produkt_Funktionalität</value>
-    </entry>
-    <entry>
-      <key>New appointment</key>
-      <value>Neuer Termin</value>
-    </entry>
-    <entry>
-      <key>Bulgaria</key>
-      <value>Bulgarien</value>
-    </entry>
-    <entry>
-      <key>Jordan</key>
-      <value>Jordan</value>
-    </entry>
-    <entry>
-      <key>Côte d'Ivoire</key>
-      <value>Elfenbeinküste</value>
-    </entry>
-    <entry>
-      <key>United Arab Emirates</key>
-      <value>Vereinigte Arabische Emirate</value>
-    </entry>
-    <entry>
-      <key>Kenya</key>
-      <value>Kenia</value>
-    </entry>
-    <entry>
-      <key>None, individual count</key>
-      <value>keiner, Einzelberechnung</value>
-    </entry>
-    <entry>
-      <key>French Polynesia</key>
-      <value>Französisch Polynesien</value>
-    </entry>
-    <entry>
-      <key>Djibouti</key>
-      <value>Dschibuti</value>
-    </entry>
-    <entry>
-      <key>Cuba</key>
-      <value>Kuba</value>
-    </entry>
-    <entry>
-      <key>Saint Lucia</key>
-      <value>St. Lucia</value>
-    </entry>
-    <entry>
-      <key>Mayotte</key>
-      <value>Mayotte</value>
-    </entry>
-    <entry>
-      <key>Israel</key>
-      <value>Israel</value>
-    </entry>
-    <entry>
-      <key>San Marino</key>
-      <value>San Marino</value>
-    </entry>
-    <entry>
-      <key>Tajikistan</key>
-      <value>Tadschikistan</value>
-    </entry>
-    <entry>
-      <key>Warehouse 2</key>
-      <value>Lager 2</value>
-    </entry>
-    <entry>
-      <key>Warehouse 1</key>
-      <value>Lager 1</value>
-    </entry>
-    <entry>
-      <key>Gibraltar</key>
-      <value>Gibraltar</value>
-    </entry>
-    <entry>
-      <key>Warehouse 3</key>
-      <value>Lager 3</value>
-    </entry>
-    <entry>
-      <key>Cyprus</key>
-      <value>Zypern</value>
-    </entry>
-    <entry>
-      <key>Semiannually</key>
-      <value>halbjährlich</value>
-    </entry>
-    <entry>
-      <key>Northern Mariana Islands</key>
-      <value>Nördliche Marianneninseln</value>
-    </entry>
-    <entry>
-      <key>Malaysia</key>
-      <value>Malaysia</value>
-    </entry>
-    <entry>
-      <key>Letter</key>
-      <value>Brief</value>
-    </entry>
-    <entry>
-      <key>Armenia</key>
-      <value>Armenien</value>
-    </entry>
-    <entry>
-      <key>Brazil</key>
-      <value>Brasilien</value>
-    </entry>
-    <entry>
-      <key>Turks and Caicos Islands</key>
-      <value>Turks- und Caicosinseln</value>
-    </entry>
-    <entry>
-      <key>Cabo Verde</key>
-      <value>Cabo Verde</value>
-    </entry>
-    <entry>
-      <key>Ecuador</key>
-      <value>Ecuador</value>
-    </entry>
-    <entry>
-      <key>Iran (Islamic Republic of)</key>
-      <value>Iran (Islamische Republik)</value>
-    </entry>
-    <entry>
-      <key>Decision maker</key>
-      <value>Entscheider</value>
-    </entry>
-    <entry>
-      <key>Lao People's Democratic Republic</key>
-      <value>Demokratische Volksrepublik Laos</value>
-    </entry>
-    <entry>
-      <key>Maintenance contract</key>
-      <value>Wartungsvertrag</value>
-    </entry>
-    <entry>
-      <key>United States Minor Outlying Islands</key>
-      <value>Kleinere abgelegene Inseln der Vereinigten Staaten</value>
-    </entry>
-    <entry>
-      <key>Italy</key>
-      <value>Italien</value>
-    </entry>
-    <entry>
-      <key>${ORGTYPE_OTHER}</key>
-      <value>Sonstiges</value>
-    </entry>
-    <entry>
-      <key>Haiti</key>
-      <value>Haiti</value>
-    </entry>
-    <entry>
-      <key>Afghanistan</key>
-      <value>Afghanistan</value>
-    </entry>
-    <entry>
-      <key>Russian Federation</key>
-      <value>Russische Föderation</value>
-    </entry>
-    <entry>
-      <key>waiting</key>
-      <value>warten auf Rückmeldung</value>
-    </entry>
-    <entry>
-      <key>American Samoa</key>
-      <value>Amerikanischen Samoa-Inseln</value>
-    </entry>
-    <entry>
-      <key>Korea (Democratic People's Republic of)</key>
-      <value>Korea, Demokratische Volksrepublik)</value>
-    </entry>
-    <entry>
-      <key>United States dollar</key>
-      <value>US-Dollar</value>
-    </entry>
-    <entry>
-      <key>Superordinate Attribute</key>
-      <value>Ãœbergeordnete Eigenschaft</value>
-    </entry>
-    <entry>
-      <key>Kyrgyzstan</key>
-      <value>Kirgisistan</value>
-    </entry>
-    <entry>
-      <key>Togo</key>
-      <value>Togo</value>
-    </entry>
-    <entry>
-      <key>Other_existing Customer</key>
-      <value>Sonstiges_Bestandskunde</value>
-    </entry>
-    <entry>
-      <key>Uzbekistan</key>
-      <value>Usbekistan</value>
-    </entry>
-    <entry>
-      <key>Dominica</key>
-      <value>Dominica</value>
-    </entry>
-    <entry>
-      <key>Benin</key>
-      <value>Benin</value>
-    </entry>
-    <entry>
-      <key>Virgin Islands (British)</key>
-      <value>Virgin Inseln, Britisch)</value>
-    </entry>
-    <entry>
-      <key>Sudan</key>
-      <value>Sudan</value>
-    </entry>
-    <entry>
-      <key>Portugal</key>
-      <value>Portugal</value>
-    </entry>
-    <entry>
-      <key>Grenada</key>
-      <value>Grenada</value>
-    </entry>
-    <entry>
-      <key>Latvia</key>
-      <value>Lettland</value>
-    </entry>
-    <entry>
-      <key>Mongolia</key>
-      <value>Mongolei</value>
-    </entry>
-    <entry>
-      <key>Morocco</key>
-      <value>Marokko</value>
-    </entry>
-    <entry>
-      <key>Guatemala</key>
-      <value>Guatemala</value>
-    </entry>
-    <entry>
-      <key>Pieces</key>
-      <value>Stück</value>
-    </entry>
-    <entry>
-      <key>Heard Island and McDonald Islands</key>
-      <value>Heard Island und McDonald Islands</value>
-    </entry>
-    <entry>
-      <key>Incoming</key>
-      <value>eingehend</value>
-    </entry>
-    <entry>
-      <key>Ghana</key>
-      <value>Ghana</value>
-    </entry>
-    <entry>
-      <key>Holy See</key>
-      <value>Heiliger Stuhl</value>
-    </entry>
-    <entry>
-      <key>India</key>
-      <value>Indien</value>
-    </entry>
-    <entry>
-      <key>Canada</key>
-      <value>Kanada</value>
-    </entry>
-    <entry>
-      <key>Attachment</key>
-      <value>Anhang</value>
-    </entry>
-    <entry>
-      <key>Maldives</key>
-      <value>Malediven</value>
-    </entry>
-    <entry>
-      <key>Service contract</key>
-      <value>Werksvertrag</value>
-    </entry>
-    <entry>
-      <key>Taiwan</key>
-      <value>Taiwan</value>
-    </entry>
-    <entry>
-      <key>Central African Republic</key>
-      <value>Zentralafrikanische Republik</value>
-    </entry>
-    <entry>
-      <key>Fiji</key>
-      <value>Fidschi</value>
-    </entry>
-    <entry>
-      <key>Guinea</key>
-      <value>Guinea</value>
-    </entry>
-    <entry>
-      <key>Somalia</key>
-      <value>Somalia</value>
-    </entry>
-    <entry>
-      <key>Sao Tome and Principe</key>
-      <value>Sao Tome und Principe</value>
-    </entry>
-    <entry>
-      <key>United Kingdom of Great Britain and Northern Ireland</key>
-      <value>Vereinigtes Königreich Großbritannien und Nordirland</value>
-    </entry>
-    <entry>
-      <key>Equatorial Guinea</key>
-      <value>Äquatorialguinea</value>
-    </entry>
-    <entry>
-      <key>Kiribati</key>
-      <value>Kiribati</value>
-    </entry>
-    <entry>
-      <key>Costa Rica</key>
-      <value>Costa Rica</value>
-    </entry>
-    <entry>
-      <key>Supplier</key>
-      <value>Lieferant</value>
-    </entry>
-    <entry>
-      <key>Nigeria</key>
-      <value>Nigeria</value>
-    </entry>
-    <entry>
-      <key>Syrian Arab Republic</key>
-      <value>Syrische Arabische Republik</value>
-    </entry>
-    <entry>
-      <key>Timor-Leste</key>
-      <value>Timor-Leste</value>
-    </entry>
-    <entry>
-      <key>Product_mobile use</key>
-      <value>Produkt_Mobiler Einsatz</value>
-    </entry>
-    <entry>
-      <key>Samoa</key>
-      <value>Samoa</value>
-    </entry>
-    <entry>
-      <key>Spain</key>
-      <value>Spanien</value>
-    </entry>
-    <entry>
-      <key>ObjectRelationType</key>
-      <value>Beziehungstyp</value>
-    </entry>
-    <entry>
-      <key>Palau</key>
-      <value>Palau</value>
-    </entry>
-    <entry>
-      <key>Prospect</key>
-      <value>Potenzieller Kunde</value>
-    </entry>
-    <entry>
-      <key>Estonia</key>
-      <value>Estland</value>
-    </entry>
-    <entry>
-      <key>Not signed yet</key>
-      <value>noch nicht unterschrieben</value>
-    </entry>
-    <entry>
-      <key>Niue</key>
-      <value>Niue</value>
-    </entry>
-    <entry>
-      <key>Mozambique</key>
-      <value>Mosambik</value>
-    </entry>
-    <entry>
-      <key>El Salvador</key>
-      <value>El Salvador</value>
-    </entry>
-    <entry>
-      <key>Guam</key>
-      <value>Guam</value>
-    </entry>
-    <entry>
-      <key>Lesotho</key>
-      <value>Lesotho</value>
-    </entry>
-    <entry>
-      <key>Tonga</key>
-      <value>Tonga</value>
-    </entry>
-    <entry>
-      <key>Western Sahara</key>
-      <value>Westsahara</value>
-    </entry>
-    <entry>
-      <key>new</key>
-      <value>neu</value>
-    </entry>
-    <entry>
-      <key>Adviser</key>
-      <value>Berater</value>
-    </entry>
-    <entry>
-      <key>Company_size</key>
-      <value>Unternehmen_Größe</value>
-    </entry>
-    <entry>
-      <key>Republic of Kosovo</key>
-      <value>Republik Kosovo</value>
-    </entry>
-    <entry>
-      <key>South Sudan</key>
-      <value>Südsudan</value>
-    </entry>
-    <entry>
-      <key>Mauritius</key>
-      <value>Mauritius</value>
-    </entry>
-    <entry>
-      <key>Bouvet Island</key>
-      <value>Bouvet Island</value>
-    </entry>
-    <entry>
-      <key>Bolivia (Plurinational State of)</key>
-      <value>Bolivien (plurinationaler Staat)</value>
-    </entry>
-    <entry>
-      <key>Norfolk Island</key>
-      <value>Norfolkinsel</value>
-    </entry>
-    <entry>
-      <key>Sint Maarten (Dutch part)</key>
-      <value>Sint Maarten (niederländischer Teil)</value>
-    </entry>
-    <entry>
-      <key>Micronesia (Federated States of)</key>
-      <value>Mikronesien (Föderierte Staaten von)</value>
-    </entry>
-    <entry>
-      <key>Product_industry knowhow</key>
-      <value>Produkt_Branchen KnowHow</value>
-    </entry>
-    <entry>
-      <key>Progress</key>
-      <value>Fortschritt</value>
-    </entry>
-    <entry>
-      <key>United States of America</key>
-      <value>Vereinigte Staaten von Amerika</value>
-    </entry>
-    <entry>
-      <key>In review</key>
-      <value>zur Prüfung</value>
-    </entry>
-    <entry>
-      <key>Address purchase</key>
-      <value>Adresserwerb</value>
-    </entry>
-    <entry>
-      <key>Malta</key>
-      <value>Malta</value>
-    </entry>
-    <entry>
-      <key>Project_volume</key>
-      <value>Projekt_Volumen</value>
-    </entry>
-    <entry>
-      <key>Ireland</key>
-      <value>Irland</value>
-    </entry>
-    <entry>
-      <key>Inactive</key>
-      <value>Inaktiv</value>
-    </entry>
-    <entry>
-      <key>France</key>
-      <value>Frankreich</value>
-    </entry>
-    <entry>
-      <key>Lithuania</key>
-      <value>Litauen</value>
-    </entry>
-    <entry>
-      <key>Korea (Republic of)</key>
-      <value>Korea (Republik)</value>
-    </entry>
-    <entry>
-      <key>${PRICELIST_SERVICE}</key>
-      <value>Service</value>
-    </entry>
-    <entry>
-      <key>English</key>
-      <value>Englisch</value>
-    </entry>
-    <entry>
-      <key>Nicaragua</key>
-      <value>Nicaragua</value>
-    </entry>
-    <entry>
-      <key>Macao</key>
-      <value>Macao</value>
-    </entry>
-    <entry>
-      <key>Mexico</key>
-      <value>Mexiko</value>
-    </entry>
-    <entry>
-      <key>Uganda</key>
-      <value>Uganda</value>
-    </entry>
-    <entry>
-      <key>Suriname</key>
-      <value>Suriname</value>
-    </entry>
-    <entry>
-      <key>Greenland</key>
-      <value>Grönland</value>
-    </entry>
-    <entry>
-      <key>Papua New Guinea</key>
-      <value>Papua Neu-Guinea</value>
-    </entry>
-    <entry>
-      <key>Kazakhstan</key>
-      <value>Kasachstan</value>
-    </entry>
-    <entry>
-      <key>Ã…land Islands</key>
-      <value>Ã…landinseln</value>
-    </entry>
-    <entry>
-      <key>Bahamas</key>
-      <value>Bahamas</value>
-    </entry>
-    <entry>
-      <key>Mali</key>
-      <value>Mali</value>
-    </entry>
-    <entry>
-      <key>Marshall Islands</key>
-      <value>Marshallinseln</value>
-    </entry>
-    <entry>
-      <key>Panama</key>
-      <value>Panama</value>
-    </entry>
-    <entry>
-      <key>Bonaire, Sint Eustatius and Saba</key>
-      <value>Bonaire, Sint Eustatius und Saba</value>
-    </entry>
-    <entry>
-      <key>Tanzania, United Republic of</key>
-      <value>Tansania, Vereinigte Republik</value>
-    </entry>
-    <entry>
-      <key>Argentina</key>
-      <value>Argentinien</value>
-    </entry>
-    <entry>
-      <key>Belize</key>
-      <value>Belize</value>
-    </entry>
-    <entry>
-      <key>Zambia</key>
-      <value>Sambia</value>
-    </entry>
-    <entry>
-      <key>Congo</key>
-      <value>Kongo</value>
-    </entry>
-    <entry>
-      <key>Guinea-Bissau</key>
-      <value>Guinea-Bissau</value>
-    </entry>
-    <entry>
-      <key>Namibia</key>
-      <value>Namibia</value>
-    </entry>
-    <entry>
-      <key>External sales manager</key>
-      <value>Externer Verkaufsleiter</value>
-    </entry>
-    <entry>
-      <key>Georgia</key>
-      <value>Georgia</value>
-    </entry>
-    <entry>
-      <key>Saint Kitts and Nevis</key>
-      <value>St. Kitts und Nevis</value>
-    </entry>
-    <entry>
-      <key>Yemen</key>
-      <value>Jemen</value>
-    </entry>
-    <entry>
-      <key>The minimal count can't be larger than the maximal count!</key>
-      <value>Die minimale Anzahl darf nicht größer als die maximale Anzahl sein!</value>
-    </entry>
-    <entry>
-      <key>Aruba</key>
-      <value>Aruba</value>
-    </entry>
-    <entry>
-      <key>Madagascar</key>
-      <value>Madagaskar</value>
-    </entry>
-    <entry>
-      <key>Valid, unlimited</key>
-      <value>gültig, unbefristet</value>
-    </entry>
-    <entry>
-      <key>Svalbard and Jan Mayen</key>
-      <value>Svalbard und Jan Mayen</value>
-    </entry>
-    <entry>
-      <key>South Georgia and the South Sandwich Islands</key>
-      <value>Süd-Georgien und die südlichen Sandwich-Inseln</value>
-    </entry>
-    <entry>
-      <key>Sweden</key>
-      <value>Schweden</value>
-    </entry>
-    <entry>
-      <key>Malawi</key>
-      <value>Malawi</value>
-    </entry>
-    <entry>
-      <key>Andorra</key>
-      <value>Andorra</value>
-    </entry>
-    <entry>
-      <key>Poland</key>
-      <value>Polen</value>
-    </entry>
-    <entry>
-      <key>Tunisia</key>
-      <value>Tunesien</value>
-    </entry>
-    <entry>
-      <key>Tuvalu</key>
-      <value>Tuvalu</value>
-    </entry>
-    <entry>
-      <key>Lebanon</key>
-      <value>Libanon</value>
-    </entry>
-    <entry>
-      <key>Azerbaijan</key>
-      <value>Aserbaidschan</value>
-    </entry>
-    <entry>
-      <key>Czech Republic</key>
-      <value>Tschechische Republik</value>
-    </entry>
-    <entry>
-      <key>Mauritania</key>
-      <value>Mauretanien</value>
-    </entry>
-    <entry>
-      <key>Guernsey</key>
-      <value>Guernsey</value>
-    </entry>
-    <entry>
-      <key>Kgs</key>
-      <value>Kg</value>
-    </entry>
-    <entry>
-      <key>Australia</key>
-      <value>Australien</value>
-    </entry>
-    <entry>
-      <key>Myanmar</key>
-      <value>Myanmar</value>
-    </entry>
-    <entry>
-      <key>Cameroon</key>
-      <value>Kamerun</value>
-    </entry>
-    <entry>
-      <key>Iceland</key>
-      <value>Island</value>
-    </entry>
-    <entry>
-      <key>Oman</key>
-      <value>Oman</value>
-    </entry>
-    <entry>
-      <key>Gabon</key>
-      <value>Gabun</value>
-    </entry>
-    <entry>
-      <key>Luxembourg</key>
-      <value>Luxemburg</value>
-    </entry>
-    <entry>
-      <key>Algeria</key>
-      <value>Algerien</value>
-    </entry>
-    <entry>
-      <key>Jersey</key>
-      <value>Jersey</value>
-    </entry>
-    <entry>
-      <key>Overview</key>
-      <value>Ãœbersicht</value>
-    </entry>
-    <entry>
-      <key>Slovenia</key>
-      <value>Slowenien</value>
-    </entry>
-    <entry>
-      <key>Antigua and Barbuda</key>
-      <value>Antigua und Barbuda</value>
-    </entry>
-    <entry>
-      <key>Annually</key>
-      <value>jährlich</value>
-    </entry>
-    <entry>
-      <key>Participated</key>
-      <value>Teilgenommen</value>
-    </entry>
-    <entry>
-      <key>Colombia</key>
-      <value>Kolumbien</value>
-    </entry>
-    <entry>
-      <key>Project_reference</key>
-      <value>Projekt_Referenz</value>
-    </entry>
-    <entry>
-      <key>Vanuatu</key>
-      <value>Vanuatu</value>
-    </entry>
-    <entry>
-      <key>Valid, limited</key>
-      <value>gültig, befristet</value>
-    </entry>
-    <entry>
-      <key>Honduras</key>
-      <value>Honduras</value>
-    </entry>
-    <entry>
-      <key>Antarctica</key>
-      <value>Antarktis</value>
-    </entry>
-    <entry>
-      <key>Nauru</key>
-      <value>Nauru</value>
-    </entry>
-    <entry>
-      <key>Burundi</key>
-      <value>Burundi</value>
-    </entry>
-    <entry>
-      <key>Project manager</key>
-      <value>Projektmanager</value>
-    </entry>
-    <entry>
-      <key>Singapore</key>
-      <value>Singapur</value>
-    </entry>
-    <entry>
-      <key>French Guiana</key>
-      <value>Französisch-Guayana</value>
-    </entry>
-    <entry>
-      <key>Hours</key>
-      <value>Stunden</value>
-    </entry>
-    <entry>
-      <key>Special price list</key>
-      <value>Sonderpreisliste</value>
-    </entry>
-    <entry>
-      <key>Christmas Island</key>
-      <value>Weihnachtsinsel</value>
-    </entry>
-    <entry>
-      <key>Project</key>
-      <value>Projekt</value>
-    </entry>
-    <entry>
-      <key>Netherlands</key>
-      <value>Niederlande</value>
-    </entry>
-    <entry>
-      <key>Product_flexibility</key>
-      <value>Produkt_Flexibilität</value>
-    </entry>
-    <entry>
-      <key>China</key>
-      <value>China</value>
-    </entry>
-    <entry>
-      <key>Martinique</key>
-      <value>Martinique</value>
-    </entry>
-    <entry>
-      <key>Own website</key>
-      <value>Eigene Website</value>
-    </entry>
-    <entry>
-      <key>Saint Pierre and Miquelon</key>
-      <value>Saint Pierre und Miquelon</value>
-    </entry>
-    <entry>
-      <key>Bhutan</key>
-      <value>Bhutan</value>
-    </entry>
-    <entry>
-      <key>Romania</key>
-      <value>Rumänien</value>
-    </entry>
-    <entry>
-      <key>Falkland Islands (Malvinas)</key>
-      <value>Falklandinseln (Malvinas)</value>
-    </entry>
-    <entry>
-      <key>Philippines</key>
-      <value>Philippinen</value>
-    </entry>
-    <entry>
-      <key>Pitcairn</key>
-      <value>Pitcairn</value>
-    </entry>
-    <entry>
-      <key>Zimbabwe</key>
-      <value>Zimbabwe</value>
-    </entry>
-    <entry>
-      <key>British Indian Ocean Territory</key>
-      <value>Britisches Territorium des Indischen Ozeans</value>
-    </entry>
-    <entry>
-      <key>Montenegro</key>
-      <value>Montenegro</value>
-    </entry>
-    <entry>
-      <key>Quarterly</key>
-      <value>vierteljährlich</value>
-    </entry>
-    <entry>
-      <key>Indonesia</key>
-      <value>Indonesien</value>
-    </entry>
-    <entry>
-      <key>Module</key>
-      <value>Modul</value>
-    </entry>
-    <entry>
-      <key>Angola</key>
-      <value>Angola</value>
-    </entry>
-    <entry>
-      <key>Internal</key>
-      <value>intern</value>
-    </entry>
-    <entry>
-      <key>Roles</key>
-      <value>Rollen</value>
-    </entry>
-    <entry>
-      <key>Brunei Darussalam</key>
-      <value>Brunei Darussalam</value>
-    </entry>
-    <entry>
-      <key>New Caledonia</key>
-      <value>Neu-Kaledonien</value>
-    </entry>
-    <entry>
-      <key>Cayman Islands</key>
-      <value>Cayman Inseln</value>
-    </entry>
-    <entry>
-      <key>Congo (Democratic Republic of the)</key>
-      <value>Kongo (Demokratische Republik)</value>
-    </entry>
-    <entry>
-      <key>Resource</key>
-      <value>Ressource</value>
-    </entry>
-    <entry>
-      <key>Greece</key>
-      <value>Griechenland</value>
-    </entry>
-    <entry>
-      <key>Guyana</key>
-      <value>Guyana</value>
-    </entry>
-    <entry>
-      <key>Project assistant</key>
-      <value>Projektassistent</value>
-    </entry>
-    <entry>
-      <key>Iraq</key>
-      <value>Irak</value>
-    </entry>
-    <entry>
-      <key>Chile</key>
-      <value>Chile</value>
-    </entry>
-    <entry>
-      <key>Nepal</key>
-      <value>Nepal</value>
-    </entry>
-    <entry>
-      <key>${PRICELIST_DEFAULT}</key>
-      <value>Standard</value>
-    </entry>
-    <entry>
-      <key>Customer recommendation</key>
-      <value>Kundenempfehlung</value>
-    </entry>
-    <entry>
-      <key>Other_unknown</key>
-      <value>Sonstiges_Unbekannt</value>
-    </entry>
-    <entry>
-      <key>Isle of Man</key>
-      <value>Isle of Man</value>
-    </entry>
-    <entry>
-      <key>Ukraine</key>
-      <value>Ukraine</value>
-    </entry>
-    <entry>
-      <key>Curaçao</key>
-      <value>Curacao</value>
-    </entry>
-    <entry>
-      <key>Anguilla</key>
-      <value>Anguilla</value>
-    </entry>
-    <entry>
-      <key>Euro</key>
-      <value>Euro</value>
-    </entry>
-    <entry>
-      <key>Product_GUI</key>
-      <value>Produkt_GUI</value>
-    </entry>
-    <entry>
-      <key>${GENDER_OTHER}</key>
-      <value>Divers</value>
-    </entry>
-    <entry>
-      <key>Touchpoint</key>
-      <value>Kontaktpunkt</value>
-    </entry>
-    <entry>
-      <key>Turkey</key>
-      <value>Türkei</value>
-    </entry>
-    <entry>
-      <key>Belgium</key>
-      <value>Belgien</value>
-    </entry>
-    <entry>
-      <key>South Africa</key>
-      <value>Südafrika</value>
-    </entry>
-    <entry>
-      <key>Trinidad and Tobago</key>
-      <value>Trinidad und Tobago</value>
-    </entry>
-    <entry>
-      <key>Bermuda</key>
-      <value>Bermuda</value>
-    </entry>
-    <entry>
-      <key>Jamaica</key>
-      <value>Jamaika</value>
-    </entry>
-    <entry>
-      <key>Peru</key>
-      <value>Peru</value>
-    </entry>
-    <entry>
-      <key>Turkmenistan</key>
-      <value>Turkmenistan</value>
-    </entry>
-    <entry>
-      <key>Venezuela (Bolivarian Republic of)</key>
-      <value>Venezuela (Bolivarische Republik)</value>
-    </entry>
-    <entry>
-      <key>Tokelau</key>
-      <value>Tokelau</value>
-    </entry>
-    <entry>
-      <key>Hong Kong</key>
-      <value>Hongkong</value>
-    </entry>
-    <entry>
-      <key>Password</key>
-      <value>Passwort</value>
-    </entry>
-    <entry>
-      <key>Chad</key>
-      <value>Tschad</value>
-    </entry>
-    <entry>
-      <key>German</key>
-      <value>Deutsch</value>
-    </entry>
-    <entry>
-      <key>Thailand</key>
-      <value>Thailand</value>
-    </entry>
-    <entry>
-      <key>in process</key>
-      <value>in Bearbeitung</value>
-    </entry>
-    <entry>
-      <key>Saint Martin (French part)</key>
-      <value>Saint Martin (französischer Teil)</value>
-    </entry>
-    <entry>
-      <key>Kuwait</key>
-      <value>Kuwait</value>
-    </entry>
-    <entry>
-      <key>Palestine, State of</key>
-      <value>Palästina, Bundesstaat</value>
-    </entry>
-    <entry>
-      <key>Croatia</key>
-      <value>Kroatien</value>
-    </entry>
-    <entry>
-      <key>Cook Islands</key>
-      <value>Cookinseln</value>
-    </entry>
-    <entry>
-      <key>Fair</key>
-      <value>Messe</value>
-    </entry>
-    <entry>
-      <key>Sri Lanka</key>
-      <value>Sri Lanka</value>
-    </entry>
-    <entry>
-      <key>Uruguay</key>
-      <value>Uruguay</value>
-    </entry>
-    <entry>
-      <key>Liberia</key>
-      <value>Liberia</value>
-    </entry>
-    <entry>
-      <key>Burkina Faso</key>
-      <value>Burkina Faso</value>
-    </entry>
-    <entry>
-      <key>Swiss franc</key>
-      <value>Schweizerfranken</value>
-    </entry>
-    <entry>
-      <key>Swaziland</key>
-      <value>Swasiland</value>
-    </entry>
-    <entry>
-      <key>ended</key>
-      <value>abgeschlossen</value>
-    </entry>
-    <entry>
-      <key>Saint Barthélemy</key>
-      <value>Saint Barthélemy</value>
-    </entry>
-    <entry>
-      <key>Wallis and Futuna</key>
-      <value>Wallis und Futuna</value>
-    </entry>
-    <entry>
-      <key>Company_industry knowhow</key>
-      <value>Unternehmen_Branchen KnowHow</value>
-    </entry>
-    <entry>
-      <key>Monaco</key>
-      <value>Monaco</value>
-    </entry>
-    <entry>
-      <key>Spanish</key>
-      <value>Spanisch</value>
-    </entry>
-    <entry>
-      <key>Hungary</key>
-      <value>Ungarn</value>
-    </entry>
-    <entry>
-      <key>Réunion</key>
-      <value>Réunion</value>
-    </entry>
-    <entry>
-      <key>Belarus</key>
-      <value>Weißrussland</value>
-    </entry>
-    <entry>
-      <key>Albania</key>
-      <value>Albanien</value>
-    </entry>
-    <entry>
-      <key>Internal sales manager</key>
-      <value>Interner Vertrieb</value>
-    </entry>
-    <entry>
-      <key>Virgin Islands (U.S.)</key>
-      <value>Jungferninseln (US)</value>
-    </entry>
-    <entry>
-      <key>New Zealand</key>
-      <value>Neuseeland</value>
-    </entry>
-    <entry>
-      <key>Senegal</key>
-      <value>Senegal</value>
-    </entry>
-    <entry>
-      <key>Ethiopia</key>
-      <value>Äthiopien</value>
-    </entry>
-    <entry>
-      <key>Macedonia (the former Yugoslav Republic of)</key>
-      <value>Mazedonien (ehemalige jugoslawische Republik)</value>
-    </entry>
-    <entry>
-      <key>Egypt</key>
-      <value>Ägypten</value>
-    </entry>
-    <entry>
-      <key>Sierra Leone</key>
-      <value>Sierra Leone</value>
-    </entry>
-    <entry>
-      <key>Saudi Arabia</key>
-      <value>Saudi Arabien</value>
-    </entry>
-    <entry>
-      <key>Pakistan</key>
-      <value>Pakistan</value>
-    </entry>
-    <entry>
-      <key>Gambia</key>
-      <value>Gambia</value>
-    </entry>
-    <entry>
-      <key>Qatar</key>
-      <value>Katar</value>
-    </entry>
-    <entry>
-      <key>Slovakia</key>
-      <value>Slowakei</value>
-    </entry>
-    <entry>
-      <key>Serbia</key>
-      <value>Serbien</value>
-    </entry>
-    <entry>
-      <key>Bosnia and Herzegovina</key>
-      <value>Bosnien und Herzegowina</value>
-    </entry>
-    <entry>
-      <key>Framework contract</key>
-      <value>Rahmenvertrag</value>
-    </entry>
-    <entry>
-      <key>Niger</key>
-      <value>Niger</value>
-    </entry>
-    <entry>
-      <key>Rwanda</key>
-      <value>Ruanda</value>
-    </entry>
-    <entry>
-      <key>French Southern Territories</key>
-      <value>Südfranzösische Territorien</value>
-    </entry>
-    <entry>
-      <key>Bangladesh</key>
-      <value>Bangladesch</value>
-    </entry>
-    <entry>
-      <key>Barbados</key>
-      <value>Barbados</value>
-    </entry>
-    <entry>
-      <key>Botswana</key>
-      <value>Botswana</value>
-    </entry>
-    <entry>
-      <key>Saint Vincent and the Grenadines</key>
-      <value>St. Vincent und die Grenadinen</value>
-    </entry>
-    <entry>
-      <key>Denmark</key>
-      <value>Dänemark</value>
-    </entry>
-    <entry>
-      <key>Dominican Republic</key>
-      <value>Dominikanische Republik</value>
-    </entry>
-    <entry>
-      <key>MAL</key>
-    </entry>
-    <entry>
-      <key>SQO</key>
-    </entry>
-    <entry>
-      <key>NQC</key>
-    </entry>
-    <entry>
-      <key>MQL</key>
-    </entry>
-    <entry>
-      <key>SAL</key>
-    </entry>
-    <entry>
-      <key>Checkbox</key>
-      <value>Checkbox</value>
-    </entry>
-    <entry>
-      <key>Numeric value</key>
-      <value>Zahlenwert</value>
-    </entry>
-    <entry>
-      <key>decline</key>
-      <value>Ablehnen</value>
-    </entry>
-    <entry>
-      <key>Text</key>
-    </entry>
-    <entry>
-      <key>Group</key>
-      <value>Gruppe</value>
-    </entry>
-    <entry>
-      <key>Combobox</key>
-      <value>Combobox</value>
-    </entry>
-    <entry>
-      <key>tentative</key>
-      <value>Vorläufig</value>
-    </entry>
-    <entry>
-      <key>${NUMBER}</key>
-      <value>Zahl</value>
-    </entry>
-    <entry>
-      <key>Name \"%0\" already used for container \"%1\"</key>
-    </entry>
-    <entry>
-      <key>CHAR_VALUE</key>
-    </entry>
-    <entry>
-      <key>Keyword Attribute</key>
-      <value>Schlüsselwort-Eigenschaft</value>
-    </entry>
-    <entry>
-      <key>in</key>
-    </entry>
-    <entry>
-      <key>Keyword Attribute Values</key>
-      <value>Schlüsselwort-Eigenschaft-Werte</value>
-    </entry>
-    <entry>
-      <key>Boolean value</key>
-    </entry>
-    <entry>
-      <key>accept</key>
-      <value>akzeptieren</value>
-    </entry>
-    <entry>
-      <key>The ZIP code does not match the format of the country.</key>
-      <value>Die Postleitzahl hat nicht das Format des ausgewählten Landes.</value>
-    </entry>
-    <entry>
-      <key>String value</key>
-      <value>String-Wert</value>
-    </entry>
-    <entry>
-      <key>The code number is not a valid number.</key>
-      <value>The code number is not a valid number.</value>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
-      <value>Der DB-Typ wird in der Funktion %0 nicht unterstützt.</value>
-    </entry>
-    <entry>
-      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
-      <value>Es wird der Funktion %0 keine Produktid übergeben.</value>
-    </entry>
-    <entry>
-      <key>Object type</key>
-      <value>Typ</value>
-    </entry>
-    <entry>
-      <key>Level</key>
-    </entry>
-    <entry>
-      <key>Print Offer</key>
-      <value>Angebot drucken</value>
-    </entry>
-    <entry>
-      <key>relations</key>
-    </entry>
-    <entry>
-      <key>Time</key>
-      <value>Zeit</value>
-    </entry>
-    <entry>
-      <key>New task</key>
-      <value>Neue Aufgabe</value>
-    </entry>
-    <entry>
-      <key>My tasks</key>
-      <value>Meine Aufgaben</value>
-    </entry>
-    <entry>
-      <key>Show my tasks</key>
-      <value>Meine Aufgaben anzeigen</value>
-    </entry>
-    <entry>
-      <key>the specified key has to be unique for that container but does already exist</key>
-    </entry>
-    <entry>
-      <key>Tree Entity</key>
-    </entry>
-    <entry>
-      <key>Add participant to Campaign</key>
-      <value>Kampagnenteilnehmer/in hinzufügen</value>
-    </entry>
-    <entry>
-      <key>Relationtype</key>
-      <value>Beziehungsart</value>
-    </entry>
-    <entry>
-      <key>Tree</key>
-      <value>Baum</value>
-    </entry>
-    <entry>
-      <key>100%</key>
-    </entry>
-    <entry>
-      <key>Mobil</key>
-    </entry>
-    <entry>
-      <key>25%</key>
-    </entry>
-    <entry>
-      <key>50%</key>
-    </entry>
-    <entry>
-      <key>75%</key>
-    </entry>
-    <entry>
-      <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
-    </entry>
-    <entry>
-      <key>competitor</key>
-      <value>Mitbewerber</value>
-    </entry>
-    <entry>
-      <key>0%</key>
-    </entry>
-    <entry>
-      <key>acquainted with</key>
-      <value>Bekannt mit</value>
-    </entry>
-    <entry>
-      <key>collaboration with</key>
-      <value>Zusammenarbeit mit</value>
-    </entry>
-    <entry>
-      <key>parent company</key>
-      <value>Konzernmutter</value>
-    </entry>
-    <entry>
-      <key>society</key>
-      <value>Verband</value>
-    </entry>
-    <entry>
-      <key>ankle of</key>
-      <value>Enkel/in von</value>
-    </entry>
-    <entry>
-      <key>solicits</key>
-      <value>Bewirbt</value>
-    </entry>
-    <entry>
-      <key>supervisor of</key>
-      <value>Vorgesetzter von</value>
-    </entry>
-    <entry>
-      <key>reports to</key>
-      <value>Berichtet an</value>
-    </entry>
-    <entry>
-      <key>subsidiary</key>
-      <value>Tochtergesellschaft</value>
-    </entry>
-    <entry>
-      <key>supported by</key>
-      <value>Wird unterstützt von</value>
-    </entry>
-    <entry>
-      <key>member</key>
-      <value>Mitglied</value>
-    </entry>
-    <entry>
-      <key>promotion target of</key>
-      <value>Werbezielgruppe von</value>
-    </entry>
-    <entry>
-      <key>supports</key>
-      <value>Unterstützt</value>
-    </entry>
-    <entry>
-      <key>parent of</key>
-      <value>Elternteil von</value>
-    </entry>
-    <entry>
-      <key>grandparents of</key>
-      <value>Großeltern von</value>
-    </entry>
-    <entry>
-      <key>Memo</key>
-      <value>Memo</value>
-    </entry>
-    <entry>
-      <key>Function</key>
-      <value>Funktion</value>
-    </entry>
-    <entry>
-      <key>Username already exists!</key>
-      <value>Der Benutzername existiert bereits!</value>
-    </entry>
-    <entry>
-      <key>Relational</key>
-    </entry>
-    <entry>
-      <key>Only numbers are allowed.</key>
-      <value>Es sind nur Zahlen erlaubt.</value>
-    </entry>
-    <entry>
-      <key>MQC</key>
-    </entry>
-    <entry>
-      <key>Datei</key>
-    </entry>
-    <entry>
-      <key>Japan</key>
-      <value>Japan</value>
-    </entry>
-    <entry>
-      <key>7 days net</key>
-      <value>7 Tage netto</value>
-    </entry>
-    <entry>
-      <key>carriage free</key>
-      <value>frei Haus</value>
-    </entry>
-    <entry>
-      <key>Relation tree</key>
-      <value>Beziehungsbaum</value>
-    </entry>
-    <entry>
-      <key>8 days 2% discount, 30 days net</key>
-      <value>8 Tage 2% Skonto, 30 Tage netto</value>
-    </entry>
-    <entry>
-      <key>CIF</key>
-    </entry>
-    <entry>
-      <key>ex works</key>
-      <value>ab Werk</value>
-    </entry>
-    <entry>
-      <key>Payment term</key>
-      <value>Zahlungsbedingung</value>
-    </entry>
-    <entry>
-      <key>30 days net</key>
-      <value>30 Tage netto</value>
-    </entry>
-    <entry>
-      <key>Contactrole</key>
-      <value>Funktion</value>
-    </entry>
-    <entry>
-      <key>Object tree</key>
-      <value>Beziehungen</value>
-    </entry>
-    <entry>
-      <key>&amp;Aufg / Term (%0/%1)</key>
-    </entry>
-    <entry>
-      <key>Verschieben auf Datum?</key>
-    </entry>
-    <entry>
-      <key>niedrig</key>
-    </entry>
-    <entry>
-      <key>Gebucht</key>
-    </entry>
-    <entry>
-      <key>Other Contactroles</key>
-      <value>Weitere Funktionen</value>
-    </entry>
-    <entry>
-      <key>Bitte Datumseingabe prüfen!</key>
-    </entry>
-    <entry>
-      <key>In Bearbeitung</key>
-    </entry>
-    <entry>
-      <key>OK</key>
-    </entry>
-    <entry>
-      <key>Nicht begonnen</key>
-    </entry>
-    <entry>
-      <key>Bitte Filterbedingungen setzen</key>
-    </entry>
-    <entry>
-      <key>Bestätigt</key>
-    </entry>
-    <entry>
-      <key>True</key>
-      <value>Ja</value>
-    </entry>
-    <entry>
-      <key>Vorläufig</key>
-    </entry>
-    <entry>
-      <key>keine</key>
-    </entry>
-    <entry>
-      <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
-    </entry>
-    <entry>
-      <key>Aufgaben von</key>
-    </entry>
-    <entry>
-      <key>&amp;Aufgaben (%0)</key>
-    </entry>
-    <entry>
-      <key>erledigt / zurückgestellt</key>
-    </entry>
-    <entry>
-      <key>hoch</key>
-    </entry>
-    <entry>
-      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
-    </entry>
-    <entry>
-      <key>Zurückgestellt</key>
-    </entry>
-    <entry>
-      <key>Erledigt</key>
-    </entry>
-    <entry>
-      <key>Usages</key>
-    </entry>
-    <entry>
-      <key>Abgesagt</key>
-    </entry>
-    <entry>
-      <key>Außer Haus</key>
-    </entry>
-    <entry>
-      <key>Abbrechen</key>
-    </entry>
-    <entry>
-      <key>Benutzer auswählen</key>
-    </entry>
-    <entry>
-      <key>delegiert</key>
-    </entry>
-    <entry>
-      <key>frei</key>
-    </entry>
-    <entry>
-      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
-    </entry>
-    <entry>
-      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
-    </entry>
-    <entry>
-      <key>Username</key>
-      <value>Benutzername</value>
-    </entry>
-    <entry>
-      <key>normal</key>
-    </entry>
-    <entry>
-      <key>Termine von</key>
-    </entry>
-    <entry>
-      <key>nur Verschiebung in die Zukunft erlaubt!</key>
-    </entry>
-    <entry>
-      <key>Kategorie</key>
-    </entry>
-    <entry>
-      <key>Product content</key>
-      <value>Produktinhalt</value>
-    </entry>
-    <entry>
-      <key>Know How</key>
-      <value>Know How</value>
-    </entry>
-    <entry>
-      <key>Personal appearance</key>
-      <value>Persönliches Auftreten</value>
-    </entry>
-    <entry>
-      <key>Market situation</key>
-      <value>Marktsituation</value>
-    </entry>
-    <entry>
-      <key>Liquidity</key>
-      <value>Liquidität</value>
-    </entry>
-    <entry>
-      <key>Price policy</key>
-      <value>Preispolitik</value>
-    </entry>
-    <entry>
-      <key>VAT in %</key>
-      <value>UmsSt. in %</value>
-    </entry>
-    <entry>
-      <key>Time in minutes</key>
-      <value>Zeit in Minuten</value>
-    </entry>
-    <entry>
-      <key>Sales manager</key>
-      <value>Vertriebsleiter</value>
-    </entry>
-    <entry>
-      <key>IT</key>
-    </entry>
-    <entry>
-      <key>Administrator</key>
-    </entry>
-    <entry>
-      <key>Managing director</key>
-      <value>Geschäftsführer</value>
-    </entry>
-    <entry>
-      <key>Production manager</key>
-      <value>Produktionsleiter</value>
-    </entry>
-    <entry>
-      <key>Production</key>
-      <value>Produktion</value>
-    </entry>
-    <entry>
-      <key>CEO</key>
-    </entry>
-    <entry>
-      <key>Purchasing manager</key>
-      <value>Einkaufsleiter</value>
-    </entry>
-    <entry>
-      <key>Marketing manager</key>
-      <value>Marketingleiter</value>
-    </entry>
-    <entry>
-      <key>IT manager</key>
-      <value>IT-Leiter</value>
-    </entry>
-    <entry>
-      <key>Marketing</key>
-    </entry>
-    <entry>
-      <key>CSO</key>
-    </entry>
-    <entry>
-      <key>Executive board</key>
-      <value>Vorstand</value>
-    </entry>
-    <entry>
-      <key>Supervisory board</key>
-      <value>Aufsichtsrat</value>
-    </entry>
-    <entry>
-      <key>Management</key>
-    </entry>
-    <entry>
-      <key>Manufacturer</key>
-      <value>Hersteller</value>
-    </entry>
-    <entry>
-      <key>Prospective customer</key>
-      <value>Potenzieller Kunde</value>
-    </entry>
-    <entry>
-      <key>Competitor</key>
-      <value>Mitbewerber</value>
-    </entry>
-    <entry>
-      <key>Partner</key>
-      <value>Partner</value>
-    </entry>
-    <entry>
-      <key>Protected</key>
-      <value>Geschützt</value>
-    </entry>
-    <entry>
-      <key>false</key>
-    </entry>
-    <entry>
-      <key>true</key>
-    </entry>
-    <entry>
-      <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
-      <value>%0 muss zwischen %2 und %3 sein.</value>
-    </entry>
-    <entry>
-      <key>Email</key>
-      <value>E-Mail</value>
-    </entry>
-    <entry>
-      <key>{$OBJECTLINK_TYPE}</key>
-      <value>Art</value>
-    </entry>
-    <entry>
-      <key>{$OBJECTLINK_OBJECT}</key>
-      <value>Objekt</value>
-    </entry>
-    <entry>
-      <key>Password and confirmation must be the same!</key>
-      <value>Die Passwörter stimmen nicht überein!</value>
-    </entry>
-    <entry>
-      <key>Begin</key>
-      <value>Beginn</value>
-    </entry>
-    <entry>
-      <key>Maturity</key>
-      <value>Fällig</value>
-    </entry>
-    <entry>
-      <key>This private person doeas already exist and can not be created once more.</key>
-      <value>Diese Privatperson existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
-    </entry>
-    <entry>
-      <key>The title already exists!</key>
-    </entry>
-    <entry>
-      <key>Human resources</key>
-    </entry>
-    <entry>
-      <key>Note</key>
-    </entry>
-    <entry>
-      <key>Project Management</key>
-    </entry>
-    <entry>
-      <key>Support</key>
-    </entry>
-    <entry>
-      <key>{$ADDRESS_IDENTIFIER}</key>
-      <value>Bezeichnung</value>
-    </entry>
-    <entry>
-      <key>Turnover actual year</key>
-      <value>Umsatz aktuelles Jahr</value>
-    </entry>
-    <entry>
-      <key>Forecast actual year</key>
-      <value>Forecast aktuelles Jahr</value>
-    </entry>
-    <entry>
-      <key>Salesproject Phases</key>
-    </entry>
-    <entry>
-      <key>Objectrelation type</key>
-      <value>Beziehungstyp</value>
-    </entry>
-    <entry>
-      <key>Kennzahlen</key>
-    </entry>
-    <entry>
-      <key>Count</key>
-    </entry>
-    <entry>
-      <key>Forecast actual year </key>
-    </entry>
-    <entry>
-      <key>Chart</key>
-    </entry>
-    <entry>
-      <key>Salesproject Charts</key>
-    </entry>
-    <entry>
-      <key>Relation</key>
-    </entry>
-    <entry>
-      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
-    </entry>
-    <entry>
-      <key>test1eee</key>
-    </entry>
-    <entry>
-      <key>Object type 1</key>
-      <value>Typ 1</value>
-    </entry>
-    <entry>
-      <key>Object type 2</key>
-      <value>Typ 2</value>
-    </entry>
-    <entry>
-      <key>test2</key>
-    </entry>
-    <entry>
-      <key>Title 1</key>
-      <value>Titel 1</value>
-    </entry>
-    <entry>
-      <key>Title 2</key>
-      <value>Titel 2</value>
-    </entry>
-    <entry>
-      <key>Hierarchy</key>
-      <value>Hierarchie</value>
-    </entry>
-    <entry>
-      <key>Object relation</key>
-      <value>Beziehungen</value>
-    </entry>
-    <entry>
-      <key>Type 2 enabled</key>
-      <value>Typ 2 aktiviert</value>
-    </entry>
-    <entry>
-      <key>Relation type 1</key>
-      <value>Beziehungsart 1</value>
-    </entry>
-    <entry>
-      <key>Relation type 2</key>
-      <value>Beziehungsart 2</value>
-    </entry>
-    <entry>
-      <key>Relation type</key>
-      <value>Beziehungstyp</value>
-    </entry>
-    <entry>
-      <key>Context 1</key>
-      <value>Context 1</value>
-    </entry>
-    <entry>
-      <key>Context 2</key>
-      <value>Context 2</value>
-    </entry>
-    <entry>
-      <key>Tochter</key>
-    </entry>
-    <entry>
-      <key>Delete all usage</key>
-      <value>Lösche jede Verwendung</value>
-    </entry>
-    <entry>
-      <key>Deleted all usages of \"%0\".</key>
-      <value>Jede Verwendung von \"%0\" wurde gelöscht.</value>
-    </entry>
-    <entry>
-      <key>promotion target ofc</key>
-    </entry>
-    <entry>
-      <key>Successful</key>
-    </entry>
-    <entry>
-      <key>Enable relation type 2</key>
-      <value>Beziehungsart 2 aktiv</value>
-    </entry>
-    <entry>
-      <key>Salesproject Analyses</key>
-    </entry>
-    <entry>
-      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
-    </entry>
-    <entry>
-      <key>Days count</key>
-      <value>Anzahl Tage</value>
-    </entry>
-    <entry>
-      <key>Clear forecast and set state to '%0'?</key>
-      <value>Forecast löschen und status auf '%0' setzen?</value>
-    </entry>
-    <entry>
-      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
-      <value>Möchten Sie wirklich den Forecast löschen und den status auf '%0' setzen?</value>
-    </entry>
-    <entry>
-      <key>This cannot be undone!</key>
-      <value>Das kann nicht rückgängig gemacht werden!</value>
-    </entry>
-    <entry>
-      <key>Clear forecast and set state to \"%0\"?</key>
-    </entry>
-    <entry>
-      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
-    </entry>
-    <entry>
-      <key>[%0]the tableName is not a string after interpreting</key>
-    </entry>
-    <entry>
-      <key>[%0]%1 has to be a string or array but it is %2</key>
-    </entry>
-    <entry>
-      <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
-    </entry>
-    <entry>
-      <key>[%0]the columnName is not a string after interpreting</key>
-    </entry>
-    <entry>
-      <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
-    </entry>
-    <entry>
-      <key>Responsible</key>
-      <value>Verantwortlich</value>
-    </entry>
-    <entry>
-      <key>Analyses</key>
-    </entry>
-    <entry>
-      <key>Imminent appointments for today </key>
-    </entry>
-    <entry>
-      <key>Variable costs</key>
-      <value>Variable Kosten</value>
-    </entry>
-    <entry>
-      <key>To-Do</key>
-    </entry>
-    <entry>
-      <key>My Tasks</key>
-    </entry>
-    <entry>
-      <key>Calendar</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
-      <value>Der Wert für das Feld %0 ist undefined.</value>
-    </entry>
-    <entry>
-      <key>MyTasks</key>
-    </entry>
-    <entry>
-      <key>Approved</key>
-      <value>Freigegeben</value>
-    </entry>
-    <entry>
-      <key>Completed</key>
-      <value>Abgeschlossen</value>
-    </entry>
-    <entry>
-      <key>In planning</key>
-      <value>In Planung</value>
-    </entry>
-    <entry>
-      <key>Auswertung</key>
-    </entry>
-    <entry>
-      <key>Reihenfolge</key>
-    </entry>
-    <entry>
-      <key>Zuständiger</key>
-    </entry>
-    <entry>
-      <key>Schritte</key>
-    </entry>
-    <entry>
-      <key>Teilnehmer</key>
-    </entry>
-    <entry>
-      <key>Kampagnen Schritte</key>
-    </entry>
-    <entry>
-      <key>Kampagnenschritte</key>
-    </entry>
-    <entry>
-      <key>Die maximale Anzahl Teilnehmer ist erreicht!</key>
-    </entry>
-    <entry>
-      <key>Neuer Kampagnenschritt</key>
-    </entry>
-    <entry>
-      <key>Kontakteasdasd</key>
-    </entry>
-    <entry>
-      <key>Ende</key>
-    </entry>
-    <entry>
-      <key>Neue Kampagne</key>
-    </entry>
-    <entry>
-      <key>Beginn</key>
-    </entry>
-    <entry>
-      <key>protected</key>
-    </entry>
-    <entry>
-      <key>Added</key>
-      <value>Hinzugefügt</value>
-    </entry>
-    <entry>
-      <key>Current participants</key>
-      <value>Aktuelle Teilnehmer</value>
-    </entry>
-    <entry>
-      <key>Kampagnenzeitraum</key>
-    </entry>
-    <entry>
-      <key>Hauptverantw.</key>
-    </entry>
-    <entry>
-      <key>New campaign step</key>
-    </entry>
-    <entry>
-      <key>Cost</key>
-      <value>Kosten</value>
-    </entry>
-    <entry>
-      <key>file '%0' cannot be read</key>
-    </entry>
-    <entry>
-      <key>Campaign costs</key>
-      <value>Kampagnen Kosten</value>
-    </entry>
-    <entry>
-      <key>Importer</key>
-    </entry>
-    <entry>
-      <key>Participant</key>
-      <value>Teilnehmer/in</value>
-    </entry>
-    <entry>
-      <key>Printing costs</key>
-      <value>Druckkosten</value>
-    </entry>
-    <entry>
-      <key>Shipping costs</key>
-      <value>Porto</value>
-    </entry>
-    <entry>
-      <key>yyyy-MM-dd HH:mm:ss</key>
-    </entry>
-    <entry>
-      <key>file '%0' does not exist or you have got no permission on this file</key>
-    </entry>
-    <entry>
-      <key>Zip</key>
-    </entry>
-    <entry>
-      <key>Add to campaign</key>
-    </entry>
-    <entry>
-      <key>Layout costs</key>
-      <value>Layout</value>
-    </entry>
-    <entry>
-      <key>Serial</key>
-      <value>Serie </value>
-    </entry>
-    <entry>
-      <key>Costs</key>
-      <value>Kosten</value>
-    </entry>
-    <entry>
-      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
-      <value>Webservice nicht erreichbar. URL: %0 %1</value>
-    </entry>
-    <entry>
-      <key>Step</key>
-      <value>Stufe</value>
-    </entry>
-    <entry>
-      <key>Fix cost</key>
-      <value>Fixkosten</value>
-    </entry>
-    <entry>
-      <key>per</key>
-      <value>pro</value>
-    </entry>
-    <entry>
-      <key>The max participants count has to be equal or greater than the count of the current participants!</key>
-      <value>Die maximale Teilnehmerzahl muss gleich oder größer der aktuellen Teilnehmerzahl sein!</value>
-    </entry>
-    <entry>
-      <key>Version number</key>
-    </entry>
-    <entry>
-      <key>Id value</key>
-    </entry>
-    <entry>
-      <key>Order executed</key>
-    </entry>
-    <entry>
-      <key>Liquibase</key>
-    </entry>
-    <entry>
-      <key>Number value</key>
-    </entry>
-    <entry>
-      <key>Author</key>
-    </entry>
-    <entry>
-      <key>Position Id</key>
-    </entry>
-    <entry>
-      <key>ISO3</key>
-    </entry>
-    <entry>
-      <key>ISO2</key>
-    </entry>
-    <entry>
-      <key>Communication Id</key>
-    </entry>
-    <entry>
-      <key>Attribute Id</key>
-    </entry>
-    <entry>
-      <key>Modification user</key>
-    </entry>
-    <entry>
-      <key>Headline</key>
-    </entry>
-    <entry>
-      <key>Salesorder Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject milestone Id</key>
-    </entry>
-    <entry>
-      <key>Appointment Id</key>
-    </entry>
-    <entry>
-      <key>Locked</key>
-    </entry>
-    <entry>
-      <key>Timetracking Id</key>
-    </entry>
-    <entry>
-      <key>Salesorder date</key>
-    </entry>
-    <entry>
-      <key>Exec type</key>
-    </entry>
-    <entry>
-      <key>Date value</key>
-    </entry>
-    <entry>
-      <key>NUMBER VALUE</key>
-    </entry>
-    <entry>
-      <key>Salesproject forecast Id</key>
-    </entry>
-    <entry>
-      <key>ID</key>
-    </entry>
-    <entry>
-      <key>Keyword attribute relation Id</key>
-    </entry>
-    <entry>
-      <key>Minimal count</key>
-    </entry>
-    <entry>
-      <key>Id</key>
-    </entry>
-    <entry>
-      <key>Start date</key>
-    </entry>
-    <entry>
-      <key>Object 1 row Id</key>
-    </entry>
-    <entry>
-      <key>Side</key>
-    </entry>
-    <entry>
-      <key>Salesproject Id</key>
-    </entry>
-    <entry>
-      <key>Product Id</key>
-    </entry>
-    <entry>
-      <key>Sort</key>
-    </entry>
-    <entry>
-      <key>Relation Title</key>
-    </entry>
-    <entry>
-      <key>%0 \"%1\"</key>
-    </entry>
-    <entry>
-      <key>Maximal count</key>
-    </entry>
-    <entry>
-      <key>Data executed</key>
-    </entry>
-    <entry>
-      <key>Indexsearch</key>
-    </entry>
-    <entry>
-      <key>Appointment link Id</key>
-    </entry>
-    <entry>
-      <key>Relation Type</key>
-    </entry>
-    <entry>
-      <key>Salesproject member Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject source Id</key>
-    </entry>
-    <entry>
-      <key>Item sort</key>
-    </entry>
-    <entry>
-      <key>%0 modified.</key>
-      <value>%0 geändert.</value>
-    </entry>
-    <entry>
-      <key>Contract Id</key>
-    </entry>
-    <entry>
-      <key>Int value</key>
-    </entry>
-    <entry>
-      <key>Object 2 row Id</key>
-    </entry>
-    <entry>
-      <key>Source tablename Id</key>
-    </entry>
-    <entry>
-      <key>Source tablename</key>
-    </entry>
-    <entry>
-      <key>Contact Id</key>
-    </entry>
-    <entry>
-      <key>Sales area</key>
-    </entry>
-    <entry>
-      <key>Parent Id</key>
-    </entry>
-    <entry>
-      <key>Task link Id</key>
-    </entry>
-    <entry>
-      <key>Protection level</key>
-    </entry>
-    <entry>
-      <key>Salesorder code</key>
-    </entry>
-    <entry>
-      <key>Class</key>
-    </entry>
-    <entry>
-      <key>BOOL VALUE</key>
-    </entry>
-    <entry>
-      <key>Keyword attribute Id</key>
-    </entry>
-    <entry>
-      <key>Log type</key>
-    </entry>
-    <entry>
-      <key>Object row Id</key>
-    </entry>
-    <entry>
-      <key>Labels</key>
-    </entry>
-    <entry>
-      <key>%0 deleted.</key>
-      <value>%0 gelöscht.</value>
-    </entry>
-    <entry>
-      <key>Salesproject competition Id</key>
-    </entry>
-    <entry>
-      <key>Activity Id</key>
-    </entry>
-    <entry>
-      <key>Person Id</key>
-    </entry>
-    <entry>
-      <key>Offer item Id</key>
-    </entry>
-    <entry>
-      <key>Offer Id</key>
-    </entry>
-    <entry>
-      <key>Name native</key>
-    </entry>
-    <entry>
-      <key>Flag</key>
-    </entry>
-    <entry>
-      <key>SEEN</key>
-      <value>Neu</value>
-    </entry>
-    <entry>
-      <key>Address Id</key>
-    </entry>
-    <entry>
-      <key>Name latin</key>
-    </entry>
-    <entry>
-      <key>Destination Id</key>
-    </entry>
-    <entry>
-      <key>Sex</key>
-    </entry>
-    <entry>
-      <key>Product price Id</key>
-    </entry>
-    <entry>
-      <key>%0 added.</key>
-      <value>%0 eingefügt.</value>
-    </entry>
-    <entry>
-      <key>Object Relation Type</key>
-    </entry>
-    <entry>
-      <key>Entry date</key>
-    </entry>
-    <entry>
-      <key>Object relation type 2</key>
-    </entry>
-    <entry>
-      <key>Object relation type 1</key>
-    </entry>
-    <entry>
-      <key>Modification date</key>
-    </entry>
-    <entry>
-      <key>Object Type</key>
-    </entry>
-    <entry>
-      <key>%0 from \"%1\" to \"%2\"</key>
-      <value>%0 von \"%1\" auf \"%2\"</value>
-    </entry>
-    <entry>
-      <key>MD5 Sum</key>
-    </entry>
-    <entry>
-      <key>Letter salutation</key>
-    </entry>
-    <entry>
-      <key>Lock granted</key>
-    </entry>
-    <entry>
-      <key>Required fields</key>
-    </entry>
-    <entry>
-      <key>Address addition</key>
-    </entry>
-    <entry>
-      <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
-    </entry>
-    <entry>
-      <key>Attribute usage Id</key>
-    </entry>
-    <entry>
-      <key>LogHistory</key>
-    </entry>
-    <entry>
-      <key>Locked by</key>
-    </entry>
-    <entry>
-      <key>Desciption</key>
-    </entry>
-    <entry>
-      <key>Salutation Id</key>
-    </entry>
-    <entry>
-      <key>Comments</key>
-    </entry>
-    <entry>
-      <key>Task Id</key>
-    </entry>
-    <entry>
-      <key>Valid to</key>
-    </entry>
-    <entry>
-      <key>ZIP regex</key>
-    </entry>
-    <entry>
-      <key>Keyword entry Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject classification Id</key>
-    </entry>
-    <entry>
-      <key>Stop costs</key>
-    </entry>
-    <entry>
-      <key>Contexts</key>
-    </entry>
-    <entry>
-      <key>Assigned to</key>
-    </entry>
-    <entry>
-      <key>%0 from \"%1\" to %2 \"%3\"</key>
-      <value>%0 von \"%1\" auf %2 \"%3\"</value>
-    </entry>
-    <entry>
-      <key>Date start</key>
-    </entry>
-    <entry>
-      <key>Cover Letter</key>
-    </entry>
-    <entry>
-      <key>Deployment Id</key>
-    </entry>
-    <entry>
-      <key>Address format</key>
-    </entry>
-    <entry>
-      <key>Activity link Id</key>
-    </entry>
-    <entry>
-      <key>Date end</key>
-    </entry>
-    <entry>
-      <key>Creation user</key>
-    </entry>
-    <entry>
-      <key>Unit Price</key>
-    </entry>
-    <entry>
-      <key>Object Id</key>
-    </entry>
-    <entry>
-      <key>Is active</key>
-    </entry>
-    <entry>
-      <key>Product relationship</key>
-    </entry>
-    <entry>
-      <key>Salesorder item Id</key>
-    </entry>
-    <entry>
-      <key>Char value</key>
-    </entry>
-    <entry>
-      <key>Attribute relation Id</key>
-    </entry>
-    <entry>
-      <key>Tag</key>
-    </entry>
-    <entry>
-      <key>Title suffix</key>
-    </entry>
-    <entry>
-      <key>Step costs</key>
-    </entry>
-    <entry>
-      <key>Min. Stock</key>
-    </entry>
-    <entry>
-      <key>User</key>
-      <value>Benutzer</value>
-    </entry>
-    <entry>
-      <key>Stock Id</key>
-    </entry>
-    <entry>
-      <key>Tablename</key>
-    </entry>
-    <entry>
-      <key>CHAR VALUE</key>
-    </entry>
-    <entry>
-      <key>Parent context</key>
-    </entry>
-    <entry>
-      <key>Organisation Id</key>
-    </entry>
-    <entry>
-      <key>Tablename Id</key>
-    </entry>
-    <entry>
-      <key>Offer date</key>
-    </entry>
-    <entry>
-      <key>Termin</key>
-    </entry>
-    <entry>
-      <key>rebuild Index</key>
-    </entry>
-    <entry>
-      <key>Charts</key>
-    </entry>
-    <entry>
-      <key>Keywords</key>
-    </entry>
-    <entry>
-      <key>Days running</key>
-      <value>Tage laufend</value>
-    </entry>
-    <entry>
-      <key>Logs</key>
-    </entry>
-    <entry>
-      <key>Mail</key>
-    </entry>
-    <entry>
-      <key>Phonecall</key>
-    </entry>
-    <entry>
-      <key>Chart 2</key>
-    </entry>
-    <entry>
-      <key>Log</key>
-    </entry>
-    <entry>
-      <key>Offer Header Text</key>
-    </entry>
-    <entry>
-      <key>Employees</key>
-    </entry>
-    <entry>
-      <key>Todo</key>
-    </entry>
-    <entry>
-      <key>Days remaining</key>
-      <value>Tage verbleibend</value>
-    </entry>
-    <entry>
-      <key>Offer Footer Text</key>
-    </entry>
-    <entry>
-      <key>Date new</key>
-    </entry>
-    <entry>
-      <key>Date edit</key>
-    </entry>
-    <entry>
-      <key>Keyword Attributes</key>
-    </entry>
-    <entry>
-      <key>HTML</key>
-    </entry>
-  </keyValueMap>
-  <font name="Dialog" style="0" size="11" />
-</language>
+<?xml version="1.0" encoding="UTF-8"?>
+<language 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/language/1.2.0">
+  <name>_____LANGUAGE_de</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <language>de</language>
+  <country></country>
+  <variant></variant>
+  <keyValueMap>
+    <entry>
+      <key>SalesprojectState</key>
+      <value>Status</value>
+    </entry>
+    <entry>
+      <key>Steps</key>
+      <value>Stufen</value>
+    </entry>
+    <entry>
+      <key>Project management</key>
+      <value>Projektmanagement</value>
+    </entry>
+    <entry>
+      <key>Notifications</key>
+      <value>Benachrichtigungen</value>
+    </entry>
+    <entry>
+      <key>Add to Campaign</key>
+      <value>Zu Kampagne hinzufügen</value>
+    </entry>
+    <entry>
+      <key>Company</key>
+      <value>Firma</value>
+    </entry>
+    <entry>
+      <key>Open tasks</key>
+      <value>Offene Aufgaben</value>
+    </entry>
+    <entry>
+      <key>Attribute \"%0\" can't be used more than %1.</key>
+      <value>Eigenschaft \"%0\" darf maximal %1 verwendet werden.</value>
+    </entry>
+    <entry>
+      <key>Picture</key>
+      <value>Bild</value>
+    </entry>
+    <entry>
+      <key>Office staff</key>
+      <value>Innendienst</value>
+    </entry>
+    <entry>
+      <key>Recipient</key>
+      <value>Empfänger</value>
+    </entry>
+    <entry>
+      <key>Overdue tasks</key>
+      <value>Überfällige Aufgaben</value>
+    </entry>
+    <entry>
+      <key>Attribute \"%0\" has to be used at least %1.</key>
+      <value>Eigenschaft \"%0\" muss mindestens %1 verwendet werden.</value>
+    </entry>
+    <entry>
+      <key>Confirm password</key>
+      <value>Passwort prüfen</value>
+    </entry>
+    <entry>
+      <key>Human Resources</key>
+      <value>Personal</value>
+    </entry>
+    <entry>
+      <key>Single</key>
+      <value>Einzel</value>
+    </entry>
+    <entry>
+      <key>Entrydate (Day)</key>
+      <value>Eingangsdatum (Tag)</value>
+    </entry>
+    <entry>
+      <key>Salesproject phases</key>
+      <value>Vertriebsprojektphasen</value>
+    </entry>
+    <entry>
+      <key>Write email</key>
+      <value>E-Mail schreiben</value>
+    </entry>
+    <entry>
+      <key>${ATTRIBUTE_VOID}</key>
+      <value>Tag</value>
+    </entry>
+    <entry>
+      <key>Campaign Period</key>
+      <value>Kampagnen Laufzeit</value>
+    </entry>
+    <entry>
+      <key>Turnover</key>
+      <value>Umsatz</value>
+    </entry>
+    <entry>
+      <key>Discount %</key>
+      <value>Rabatt %</value>
+    </entry>
+    <entry>
+      <key>${COUNT_PREPOSITION_MULTIPLE}</key>
+      <value>mal</value>
+    </entry>
+    <entry>
+      <key>SalesprojectPhase</key>
+      <value>Phase</value>
+    </entry>
+    <entry>
+      <key>Email must be unique!</key>
+      <value>Die E-Mail-Adresse muss eindeutig sein!</value>
+    </entry>
+    <entry>
+      <key>${COUNT_PREPOSITION_SINGLE}</key>
+      <value>mal</value>
+    </entry>
+    <entry>
+      <key>E-Mail</key>
+      <value>E-Mail</value>
+    </entry>
+    <entry>
+      <key>Maximal Count</key>
+      <value>Maximale Anzahl</value>
+    </entry>
+    <entry>
+      <key>UNSEEN</key>
+      <value>Neu</value>
+    </entry>
+    <entry>
+      <key>Campaign Participant</key>
+      <value>Kampagnen Teilnehmer/innen</value>
+    </entry>
+    <entry>
+      <key>Entrydate (Month)</key>
+      <value>Eingangsdatum (Monat)</value>
+    </entry>
+    <entry>
+      <key>Usage</key>
+      <value>Verwendung</value>
+    </entry>
+    <entry>
+      <key>Campaign status</key>
+      <value>Kampagnenstatus</value>
+    </entry>
+    <entry>
+      <key>Show all activities</key>
+      <value>Alle Aktivitäten anzeigen</value>
+    </entry>
+    <entry>
+      <key>Add the selection to a campaign</key>
+      <value>Fügt die Auswahl zur Kampagne hinzu</value>
+    </entry>
+    <entry>
+      <key>${ADDRESS_STATE}</key>
+      <value>Staat</value>
+    </entry>
+    <entry>
+      <key>New tasks</key>
+      <value>Neue Aufgaben</value>
+    </entry>
+    <entry>
+      <key>New module</key>
+      <value>Neuanlage</value>
+    </entry>
+    <entry>
+      <key>Show all contracts</key>
+      <value>Alle Verträge anzeigen</value>
+    </entry>
+    <entry>
+      <key>Max participants</key>
+      <value>Maximale Teilnehmer</value>
+    </entry>
+    <entry>
+      <key>This combination of person and organisation does already exist and can not be created once more.</key>
+      <value>Diese Kombination aus Person und Organisation existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
+    </entry>
+    <entry>
+      <key>Communication data</key>
+      <value>Kommunikationsdaten</value>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_NEGOTIATION}</key>
+      <value>Negotiation</value>
+    </entry>
+    <entry>
+      <key>Filename</key>
+      <value>Dateiname</value>
+    </entry>
+    <entry>
+      <key>Stored selections</key>
+      <value>Gespeicherte Suchen</value>
+    </entry>
+    <entry>
+      <key>Male</key>
+      <value>Männlich</value>
+    </entry>
+    <entry>
+      <key>Activity</key>
+      <value>Aktivität</value>
+    </entry>
+    <entry>
+      <key>participants will be added to the selected campaign step</key>
+      <value>Teilnehmer/innen werden zur ausgewählten Kampagnenstufe hinzugefügt</value>
+    </entry>
+    <entry>
+      <key>Name</key>
+      <value>Name</value>
+    </entry>
+    <entry>
+      <key>Austria</key>
+      <value>Österreich</value>
+    </entry>
+    <entry>
+      <key>Set campaign step</key>
+      <value>Kampagnenstufe setzen</value>
+    </entry>
+    <entry>
+      <key>New time tracking</key>
+      <value>Neuer Zeiteintrag</value>
+    </entry>
+    <entry>
+      <key>Customercode</key>
+      <value>Kundennummer</value>
+    </entry>
+    <entry>
+      <key>The person is already associated with another employee!</key>
+      <value>Die Person ist bereits mit einem anderen Mitarbeiter verknüpft!</value>
+    </entry>
+    <entry>
+      <key>Time expenses</key>
+      <value>Aufwand</value>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_OFFER}</key>
+      <value>Offer</value>
+    </entry>
+    <entry>
+      <key>Status</key>
+      <value>Status</value>
+    </entry>
+    <entry>
+      <key>Campaigns</key>
+      <value>Kampagnen</value>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_MEMBER}</key>
+      <value>Projektteam</value>
+    </entry>
+    <entry>
+      <key>${QUANTITY_LOWER_THAN_1}</key>
+      <value>Die Menge muss mindestens 1 sein.</value>
+    </entry>
+    <entry>
+      <key>date of birth must not be in the future</key>
+      <value>Geburtsdatum darf nicht in der Zukunft liegen</value>
+    </entry>
+    <entry>
+      <key>Days inactive</key>
+      <value>Tage inaktiv</value>
+    </entry>
+    <entry>
+      <key>Choose a campaign and a step to add the contact to a  campaign</key>
+      <value>Wählen Sie eine Kampagne und eine Stufe aus um den Kontakt hinzuzufügen</value>
+    </entry>
+    <entry>
+      <key>Active</key>
+      <value>Aktiv</value>
+    </entry>
+    <entry>
+      <key>Medium</key>
+      <value>Medium</value>
+    </entry>
+    <entry>
+      <key>Internet</key>
+      <value>Internet</value>
+    </entry>
+    <entry>
+      <key>Germany</key>
+      <value>Deutschland</value>
+    </entry>
+    <entry>
+      <key>Online-Meeting</key>
+      <value>Online-Meeting</value>
+    </entry>
+    <entry>
+      <key>Set password</key>
+      <value>Passwort setzen</value>
+    </entry>
+    <entry>
+      <key>Choose address</key>
+      <value>Adresse auswählen</value>
+    </entry>
+    <entry>
+      <key>Social Media</key>
+      <value>Social Media</value>
+    </entry>
+    <entry>
+      <key>Visit</key>
+      <value>Besuch</value>
+    </entry>
+    <entry>
+      <key>Information</key>
+      <value>Information</value>
+    </entry>
+    <entry>
+      <key>Language</key>
+      <value>Sprache</value>
+    </entry>
+    <entry>
+      <key>Phone</key>
+      <value>Telefon</value>
+    </entry>
+    <entry>
+      <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>360 Degree</key>
+      <value>360 Grad</value>
+    </entry>
+    <entry>
+      <key>Activities</key>
+      <value>Aktivitäten</value>
+    </entry>
+    <entry>
+      <key>Female</key>
+      <value>Weiblich</value>
+    </entry>
+    <entry>
+      <key>Contactmanagement</key>
+      <value>Kontaktmanagement</value>
+    </entry>
+    <entry>
+      <key>Mobile</key>
+      <value>Mobil</value>
+    </entry>
+    <entry>
+      <key>Office address</key>
+      <value>Firmenadresse</value>
+    </entry>
+    <entry>
+      <key>Contact</key>
+      <value>Kontakt</value>
+    </entry>
+    <entry>
+      <key>Home address</key>
+      <value>Privatadresse</value>
+    </entry>
+    <entry>
+      <key>Type</key>
+      <value>Typ</value>
+    </entry>
+    <entry>
+      <key>Contacts</key>
+      <value>Kontakte</value>
+    </entry>
+    <entry>
+      <key>Norway</key>
+      <value>Norwegen</value>
+    </entry>
+    <entry>
+      <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
+    </entry>
+    <entry>
+      <key>Address</key>
+      <value>Adresse</value>
+    </entry>
+    <entry>
+      <key>Addresses</key>
+      <value>Adressen</value>
+    </entry>
+    <entry>
+      <key>Contact type</key>
+      <value>Kontaktart</value>
+    </entry>
+    <entry>
+      <key>${COMM_ADDRESS}</key>
+      <value>Adresse</value>
+    </entry>
+    <entry>
+      <key>Gender</key>
+      <value>Geschlecht</value>
+    </entry>
+    <entry>
+      <key>Campaign Steps</key>
+      <value>Kampagnen Stufen</value>
+    </entry>
+    <entry>
+      <key>Show all companies</key>
+      <value>Alle Firmen anzeigen</value>
+    </entry>
+    <entry>
+      <key>Date of birth</key>
+      <value>Geburtsdatum</value>
+    </entry>
+    <entry>
+      <key>Lastname</key>
+      <value>Nachname</value>
+    </entry>
+    <entry>
+      <key>Salutation</key>
+      <value>Anrede</value>
+    </entry>
+    <entry>
+      <key>setRead</key>
+      <value>Gelesen setzen</value>
+    </entry>
+    <entry>
+      <key>Middlename</key>
+      <value>Zwischenname</value>
+    </entry>
+    <entry>
+      <key>Title</key>
+      <value>Titel</value>
+    </entry>
+    <entry>
+      <key>Addresstype</key>
+      <value>Adresstyp</value>
+    </entry>
+    <entry>
+      <key>Add participants to Campaign</key>
+      <value>Kampagnenteilnehmer/innen hinzufügen</value>
+    </entry>
+    <entry>
+      <key>Firstname</key>
+      <value>Vorname</value>
+    </entry>
+    <entry>
+      <key>Show all contacts</key>
+      <value>Alle Kontaktpersonen anzeigen</value>
+    </entry>
+    <entry>
+      <key>Description</key>
+      <value>Beschreibung</value>
+    </entry>
+    <entry>
+      <key>Direction</key>
+      <value>Richtung</value>
+    </entry>
+    <entry>
+      <key>Entrydate</key>
+      <value>Eingangsdatum</value>
+    </entry>
+    <entry>
+      <key>Subject</key>
+      <value>Betreff</value>
+    </entry>
+    <entry>
+      <key>Post office box</key>
+      <value>Postfach</value>
+    </entry>
+    <entry>
+      <key>Delivery address</key>
+      <value>Lieferadresse</value>
+    </entry>
+    <entry>
+      <key>Participants</key>
+      <value>Teilnehmer/innen</value>
+    </entry>
+    <entry>
+      <key>House number</key>
+      <value>Hausnummer</value>
+    </entry>
+    <entry>
+      <key>Country</key>
+      <value>Land</value>
+    </entry>
+    <entry>
+      <key>Communication</key>
+      <value>Kommunikation</value>
+    </entry>
+    <entry>
+      <key>postcode</key>
+      <value>Postleitzahl</value>
+    </entry>
+    <entry>
+      <key>City</key>
+      <value>Ort</value>
+    </entry>
+    <entry>
+      <key>State</key>
+      <value>Status</value>
+    </entry>
+    <entry>
+      <key>Region</key>
+      <value>Region</value>
+    </entry>
+    <entry>
+      <key>District</key>
+      <value>Kreis</value>
+    </entry>
+    <entry>
+      <key>Companies</key>
+      <value>Firmen</value>
+    </entry>
+    <entry>
+      <key>Switzerland</key>
+      <value>Schweiz</value>
+    </entry>
+    <entry>
+      <key>Confirmed</key>
+      <value>Bestätigt</value>
+    </entry>
+    <entry>
+      <key>Free</key>
+      <value>Frei</value>
+    </entry>
+    <entry>
+      <key>Tentative</key>
+      <value>Vorläufig</value>
+    </entry>
+    <entry>
+      <key>Ignore series</key>
+      <value>Monatliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
+    </entry>
+    <entry>
+      <key>Attachments</key>
+      <value>Anhänge</value>
+    </entry>
+    <entry>
+      <key>Internal (2)</key>
+    </entry>
+    <entry>
+      <key>Touchpoints</key>
+      <value>Kontaktpunkte</value>
+    </entry>
+    <entry>
+      <key>archieve</key>
+      <value>Archivieren</value>
+    </entry>
+    <entry>
+      <key>Document Template</key>
+      <value>Dokumentvorlage</value>
+    </entry>
+    <entry>
+      <key>Attribute Tree</key>
+      <value>Eigenschaftsbaum</value>
+    </entry>
+    <entry>
+      <key>Company Addresses</key>
+      <value>Firmenadressen</value>
+    </entry>
+    <entry>
+      <key>yearly series not specified</key>
+      <value>Jährliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
+    </entry>
+    <entry>
+      <key>OutOfOffice</key>
+      <value>Außer Haus</value>
+    </entry>
+    <entry>
+      <key>Cancelled</key>
+      <value>Abgesagt</value>
+    </entry>
+    <entry>
+      <key>Ignore daily series</key>
+      <value>Tägliche Serie nicht genauer spezifiziert. Ignoriere Serie.</value>
+    </entry>
+    <entry>
+      <key>yyyyMMdd</key>
+      <value>yyyyMMdd</value>
+    </entry>
+    <entry>
+      <key>standard address</key>
+      <value>Standard-Adresse</value>
+    </entry>
+    <entry>
+      <key>Create receipt</key>
+      <value>Beleg erstellen</value>
+    </entry>
+    <entry>
+      <key>PP</key>
+      <value>EK</value>
+    </entry>
+    <entry>
+      <key>Liter</key>
+    </entry>
+    <entry>
+      <key>Key account</key>
+      <value>Großkunde</value>
+    </entry>
+    <entry>
+      <key>Cover letter</key>
+      <value>Anschreiben</value>
+    </entry>
+    <entry>
+      <key>VAT</key>
+      <value>UmsSt.</value>
+    </entry>
+    <entry>
+      <key>The expiry date must be after the start date!</key>
+      <value>Das Ende-Datum muss nach dem Beginn-Datum liegen!</value>
+    </entry>
+    <entry>
+      <key>Product</key>
+      <value>Produkt</value>
+    </entry>
+    <entry>
+      <key>Developer</key>
+      <value>Hersteller</value>
+    </entry>
+    <entry>
+      <key>Valid until</key>
+      <value>gültig bis</value>
+    </entry>
+    <entry>
+      <key>Department</key>
+      <value>Abteilung</value>
+    </entry>
+    <entry>
+      <key>Price list</key>
+      <value>Preisliste</value>
+    </entry>
+    <entry>
+      <key>Currency</key>
+      <value>Währung</value>
+    </entry>
+    <entry>
+      <key>Payment method</key>
+      <value>Zahlungsweise</value>
+    </entry>
+    <entry>
+      <key>Price list / Company</key>
+      <value>Preisliste / Firma</value>
+    </entry>
+    <entry>
+      <key>Curr. sales price</key>
+      <value>akt. VK-Preis</value>
+    </entry>
+    <entry>
+      <key>Contract</key>
+      <value>Vertrag</value>
+    </entry>
+    <entry>
+      <key>Stock</key>
+      <value>Lagerbestand</value>
+    </entry>
+    <entry>
+      <key>PP/SP</key>
+      <value>EK/VK</value>
+    </entry>
+    <entry>
+      <key>Next due date</key>
+      <value>nächste Fälligkeit</value>
+    </entry>
+    <entry>
+      <key>Discount</key>
+      <value>Rabatt</value>
+    </entry>
+    <entry>
+      <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
+      <value>Nächste Fälligkeit muss nach Vertragsbeginn und vor Vertragsende liegen!</value>
+    </entry>
+    <entry>
+      <key>Sales</key>
+      <value>Vertrieb</value>
+    </entry>
+    <entry>
+      <key>Contract number</key>
+      <value>Vertragsnummer</value>
+    </entry>
+    <entry>
+      <key>Min. stock</key>
+      <value>Min.-Bestand</value>
+    </entry>
+    <entry>
+      <key>SP</key>
+      <value>VK</value>
+    </entry>
+    <entry>
+      <key>Commodity group 3</key>
+      <value>Warengruppe 3</value>
+    </entry>
+    <entry>
+      <key>Commodity group 2</key>
+      <value>Warengruppe 2</value>
+    </entry>
+    <entry>
+      <key>setUnread</key>
+      <value>Ungelesen setzen</value>
+    </entry>
+    <entry>
+      <key>Campaign Step</key>
+      <value>Kampagnen Stufe</value>
+    </entry>
+    <entry>
+      <key>CampaignStep</key>
+      <value>Kampagnen Stufe</value>
+    </entry>
+    <entry>
+      <key>Commodity group 1</key>
+      <value>Warengruppe 1</value>
+    </entry>
+    <entry>
+      <key>Contract start date</key>
+      <value>Vertragsbeginn</value>
+    </entry>
+    <entry>
+      <key>Remaining Runtime</key>
+      <value>Restlaufzeit</value>
+    </entry>
+    <entry>
+      <key>Spare parts</key>
+      <value>Ersatzteile</value>
+    </entry>
+    <entry>
+      <key>Employee</key>
+      <value>Mitarbeiter</value>
+    </entry>
+    <entry>
+      <key>Unit</key>
+      <value>Einheit</value>
+    </entry>
+    <entry>
+      <key>Contract expiry date</key>
+      <value>Vertragsende</value>
+    </entry>
+    <entry>
+      <key>Yes</key>
+      <value>Ja</value>
+    </entry>
+    <entry>
+      <key>Type of contract</key>
+      <value>Vertragsart</value>
+    </entry>
+    <entry>
+      <key>No</key>
+      <value>Nein</value>
+    </entry>
+    <entry>
+      <key>Service</key>
+      <value>Dienstleistung</value>
+    </entry>
+    <entry>
+      <key>Advertising material</key>
+      <value>Werbemittel</value>
+    </entry>
+    <entry>
+      <key>Valid from</key>
+      <value>gültig ab</value>
+    </entry>
+    <entry>
+      <key>Product name</key>
+      <value>Produktname</value>
+    </entry>
+    <entry>
+      <key>Campaign</key>
+      <value>Kampagne</value>
+    </entry>
+    <entry>
+      <key>Product group</key>
+      <value>Produktgruppe</value>
+    </entry>
+    <entry>
+      <key>${CONTRACT_STATUS}</key>
+      <value>Status</value>
+    </entry>
+    <entry>
+      <key>From no. of units</key>
+      <value>ab Stückzahl</value>
+    </entry>
+    <entry>
+      <key>Maindocuments</key>
+      <value>Hauptdokumente</value>
+    </entry>
+    <entry>
+      <key>Price</key>
+      <value>Preis</value>
+    </entry>
+    <entry>
+      <key>Conditions</key>
+      <value>Konditionen</value>
+    </entry>
+    <entry>
+      <key>Standard</key>
+    </entry>
+    <entry>
+      <key>I / O</key>
+      <value>E / A</value>
+    </entry>
+    <entry>
+      <key>Date</key>
+      <value>Datum</value>
+    </entry>
+    <entry>
+      <key>IN</key>
+      <value>EIN</value>
+    </entry>
+    <entry>
+      <key>OUT</key>
+      <value>AUS</value>
+    </entry>
+    <entry>
+      <key>Warehouse</key>
+      <value>Lager</value>
+    </entry>
+    <entry>
+      <key>Reference</key>
+      <value>Referenz</value>
+    </entry>
+    <entry>
+      <key>The contract number already exists!</key>
+      <value>Die Vertragsnummer existiert bereits!</value>
+    </entry>
+    <entry>
+      <key>The product number already exists!</key>
+      <value>Die Produktnummer existiert bereits!</value>
+    </entry>
+    <entry>
+      <key>Quantity</key>
+      <value>Menge</value>
+    </entry>
+    <entry>
+      <key>Salesproject</key>
+      <value>Vertriebsprojekt</value>
+    </entry>
+    <entry>
+      <key>Rollout</key>
+      <value>Roll Out</value>
+    </entry>
+    <entry>
+      <key>Phase</key>
+      <value>Phase</value>
+    </entry>
+    <entry>
+      <key>Product number</key>
+      <value>Produktnummer</value>
+    </entry>
+    <entry>
+      <key>Project number</key>
+      <value>Projektnummer</value>
+    </entry>
+    <entry>
+      <key>Project title</key>
+      <value>Projekttitel</value>
+    </entry>
+    <entry>
+      <key>Project start</key>
+      <value>Projektstart</value>
+    </entry>
+    <entry>
+      <key>Volume</key>
+      <value>Volumen</value>
+    </entry>
+    <entry>
+      <key>Partial order</key>
+      <value>Teilauftrag</value>
+    </entry>
+    <entry>
+      <key>Open</key>
+      <value>Offen</value>
+    </entry>
+    <entry>
+      <key>Lost</key>
+      <value>Verloren</value>
+    </entry>
+    <entry>
+      <key>Order</key>
+      <value>Auftrag</value>
+    </entry>
+    <entry>
+      <key>Postponed</key>
+      <value>Vertagt</value>
+    </entry>
+    <entry>
+      <key>Aborted</key>
+      <value>Abgebrochen</value>
+    </entry>
+    <entry>
+      <key>Negotiation</key>
+      <value>Verhandlung</value>
+    </entry>
+    <entry>
+      <key>Workshop</key>
+      <value>Workshop</value>
+    </entry>
+    <entry>
+      <key>Presentation preparation</key>
+      <value>Präsentationsvorbereitung</value>
+    </entry>
+    <entry>
+      <key>Specifications in progress</key>
+      <value>Lastenheft in Bearbeitung</value>
+    </entry>
+    <entry>
+      <key>Project decision</key>
+      <value>Projektentscheidung</value>
+    </entry>
+    <entry>
+      <key>Lead</key>
+      <value>Lead</value>
+    </entry>
+    <entry>
+      <key>Total net</key>
+      <value>Betrag netto</value>
+    </entry>
+    <entry>
+      <key>Offer</key>
+      <value>Angebot</value>
+    </entry>
+    <entry>
+      <key>Offer number</key>
+      <value>Angebotsnummer</value>
+    </entry>
+    <entry>
+      <key>Show my activities</key>
+      <value>Meine Aktivitäten anzeigen</value>
+    </entry>
+    <entry>
+      <key>Probability</key>
+      <value>Wahrscheinlichkeit</value>
+    </entry>
+    <entry>
+      <key>Total VAT</key>
+      <value>Betrag MWST</value>
+    </entry>
+    <entry>
+      <key>The offer number already exists!</key>
+      <value>Die Angebotsnummer existiert bereits!</value>
+    </entry>
+    <entry>
+      <key>0 %</key>
+    </entry>
+    <entry>
+      <key>75 %</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>100 %</key>
+    </entry>
+    <entry>
+      <key>25 %</key>
+    </entry>
+    <entry>
+      <key>50 %</key>
+    </entry>
+    <entry>
+      <key>Competitors</key>
+      <value>Mitbewerber</value>
+    </entry>
+    <entry>
+      <key>Won</key>
+      <value>Gewonnen</value>
+    </entry>
+    <entry>
+      <key>Checked</key>
+      <value>Geprüft</value>
+    </entry>
+    <entry>
+      <key>Sent</key>
+      <value>Versendet</value>
+    </entry>
+    <entry>
+      <key>Offeritems</key>
+      <value>Angebotsposten</value>
+    </entry>
+    <entry>
+      <key>Header text</key>
+      <value>Kopftext</value>
+    </entry>
+    <entry>
+      <key>Commodity group</key>
+      <value>Warengruppe</value>
+    </entry>
+    <entry>
+      <key>Footer text</key>
+      <value>Fußtext</value>
+    </entry>
+    <entry>
+      <key>Designation</key>
+      <value>Bezeichnung</value>
+    </entry>
+    <entry>
+      <key>Position</key>
+      <value>Position</value>
+    </entry>
+    <entry>
+      <key>Receipt</key>
+      <value>Beleg</value>
+    </entry>
+    <entry>
+      <key>CONFIRMED</key>
+      <value>Gelesen</value>
+    </entry>
+    <entry>
+      <key>Show all receipts</key>
+      <value>Alle Belege anzeigen</value>
+    </entry>
+    <entry>
+      <key>Optional</key>
+      <value>Optional</value>
+    </entry>
+    <entry>
+      <key>Article</key>
+      <value>Artikel</value>
+    </entry>
+    <entry>
+      <key>Show open salesprojects</key>
+      <value>Offene Vertriebsprojekte anzeigen</value>
+    </entry>
+    <entry>
+      <key>Receipt number</key>
+      <value>Belegnummer</value>
+    </entry>
+    <entry>
+      <key>Offeritem</key>
+      <value>Angebotsposten</value>
+    </entry>
+    <entry>
+      <key>Sum</key>
+      <value>Summe</value>
+    </entry>
+    <entry>
+      <key>Option4</key>
+    </entry>
+    <entry>
+      <key>ARCHIVE</key>
+      <value>Archiviert</value>
+    </entry>
+    <entry>
+      <key>Offers</key>
+      <value>Angebote</value>
+    </entry>
+    <entry>
+      <key>Option3</key>
+    </entry>
+    <entry>
+      <key>Option2</key>
+    </entry>
+    <entry>
+      <key>Option1</key>
+    </entry>
+    <entry>
+      <key>Countries</key>
+      <value>Länder</value>
+    </entry>
+    <entry>
+      <key>Options</key>
+    </entry>
+    <entry>
+      <key>Total gross</key>
+      <value>Betrag brutto</value>
+    </entry>
+    <entry>
+      <key>Minimal Count</key>
+      <value>Minimale Anzahl</value>
+    </entry>
+    <entry>
+      <key>Identical price list found!</key>
+      <value>Identische Preisliste gefunden!</value>
+    </entry>
+    <entry>
+      <key>Imminent appointments for today</key>
+      <value>Bevorstehende Termine für heute</value>
+    </entry>
+    <entry>
+      <key>Parts list</key>
+      <value>Stückliste</value>
+    </entry>
+    <entry>
+      <key>${THOUSAND_SHORT}</key>
+      <value>T</value>
+    </entry>
+    <entry>
+      <key>Deliver opinion</key>
+      <value>Stellungnahme abgeben</value>
+    </entry>
+    <entry>
+      <key>Presentation follow-up</key>
+      <value>Präsentationsnachbereitung</value>
+    </entry>
+    <entry>
+      <key>Waiting for requirements</key>
+      <value>Warten auf Anforderungen</value>
+    </entry>
+    <entry>
+      <key>Parent</key>
+    </entry>
+    <entry>
+      <key>${EURO_SIGN}</key>
+      <value>€</value>
+    </entry>
+    <entry>
+      <key>Planned</key>
+      <value>Geplant
+</value>
+    </entry>
+    <entry>
+      <key>Info</key>
+      <value>Info
+</value>
+    </entry>
+    <entry>
+      <key>${VOLUME_MONEY}</key>
+      <value>Wert
+</value>
+    </entry>
+    <entry>
+      <key>Milestones</key>
+      <value>Meilensteine
+</value>
+    </entry>
+    <entry>
+      <key>Milestone</key>
+      <value>Meilenstein
+</value>
+    </entry>
+    <entry>
+      <key>Excreted</key>
+      <value>Ausgeschieden
+</value>
+    </entry>
+    <entry>
+      <key>Reason</key>
+      <value>Begründung</value>
+    </entry>
+    <entry>
+      <key>Document</key>
+      <value>Dokument</value>
+    </entry>
+    <entry>
+      <key>Remark</key>
+      <value>Anmerkung</value>
+    </entry>
+    <entry>
+      <key>Competition</key>
+      <value>Mitbewerber</value>
+    </entry>
+    <entry>
+      <key>Forecast</key>
+      <value>Forecast</value>
+    </entry>
+    <entry>
+      <key>Show all products</key>
+      <value>Alle Produkte anzeigen</value>
+    </entry>
+    <entry>
+      <key>Role</key>
+      <value>Rolle</value>
+    </entry>
+    <entry>
+      <key>End date</key>
+      <value>Enddatum</value>
+    </entry>
+    <entry>
+      <key>Documents</key>
+      <value>Dokumente</value>
+    </entry>
+    <entry>
+      <key>New offer version</key>
+      <value>Neue Angebotsversion</value>
+    </entry>
+    <entry>
+      <key>Copy offer</key>
+      <value>Angebot kopieren</value>
+    </entry>
+    <entry>
+      <key>Vers. no.</key>
+      <value>Vers.-Nr.</value>
+    </entry>
+    <entry>
+      <key>Curr. purchase price</key>
+      <value>akt. EK-Preis</value>
+    </entry>
+    <entry>
+      <key>Industry 3</key>
+      <value>Branche 3</value>
+    </entry>
+    <entry>
+      <key>Industry 2</key>
+      <value>Branche 2</value>
+    </entry>
+    <entry>
+      <key>Show all offers</key>
+      <value>Alle Angebote anzeigen</value>
+    </entry>
+    <entry>
+      <key>Filetype</key>
+      <value>Dateityp</value>
+    </entry>
+    <entry>
+      <key>child of</key>
+      <value>Kind von</value>
+    </entry>
+    <entry>
+      <key>Products</key>
+      <value>Produkte</value>
+    </entry>
+    <entry>
+      <key>Filesize</key>
+      <value>Dateigrösse</value>
+    </entry>
+    <entry>
+      <key>Industry 1</key>
+      <value>Branche 1</value>
+    </entry>
+    <entry>
+      <key>Contracts</key>
+      <value>Verträge</value>
+    </entry>
+    <entry>
+      <key>Classification</key>
+      <value>Klassifizierung</value>
+    </entry>
+    <entry>
+      <key>Class A</key>
+      <value>Klasse A</value>
+    </entry>
+    <entry>
+      <key>Class C</key>
+      <value>Klasse C</value>
+    </entry>
+    <entry>
+      <key>Class B</key>
+      <value>Klasse B</value>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
+      <value>fieldOrTableName muss ein String oder ein Array aus 2 Strings sein.</value>
+    </entry>
+    <entry>
+      <key>High price strategy</key>
+      <value>Hochpreisstrategie</value>
+    </entry>
+    <entry>
+      <key>Show all sent receipts</key>
+      <value>Alle versendeten Belege anzeigen</value>
+    </entry>
+    <entry>
+      <key>Low price strategy</key>
+      <value>Niedrigpreisstrategie</value>
+    </entry>
+    <entry>
+      <key>Uid</key>
+    </entry>
+    <entry>
+      <key>in 6 Months</key>
+    </entry>
+    <entry>
+      <key>Sent offers</key>
+      <value>Versendete Angebote</value>
+    </entry>
+    <entry>
+      <key>Budget (Project)</key>
+    </entry>
+    <entry>
+      <key>responsible</key>
+      <value>verantwortlich</value>
+    </entry>
+    <entry>
+      <key>False</key>
+      <value>Nein</value>
+    </entry>
+    <entry>
+      <key>Show all Facebook posts of a user</key>
+      <value>Alle Facebook Beiträge eines Benutzers anzeigen</value>
+    </entry>
+    <entry>
+      <key>My Activities</key>
+      <value>Meine Aktivitäten</value>
+    </entry>
+    <entry>
+      <key>Everyone</key>
+      <value>Jeder</value>
+    </entry>
+    <entry>
+      <key>Combobox Value</key>
+      <value>Combobox-Wert</value>
+    </entry>
+    <entry>
+      <key>Salesprojects</key>
+      <value>Vertriebsprojekte</value>
+    </entry>
+    <entry>
+      <key>to</key>
+    </entry>
+    <entry>
+      <key>Open salesprojects</key>
+      <value>Offene Vertriebsprojekte</value>
+    </entry>
+    <entry>
+      <key>Other</key>
+    </entry>
+    <entry>
+      <key>Show all sent offers</key>
+      <value>Alle versendeten Angebote anzeigen</value>
+    </entry>
+    <entry>
+      <key>Show all Facebook posts of ADITO</key>
+      <value>Alle Facebook Beiträge von ADITO anzeigen</value>
+    </entry>
+    <entry>
+      <key>Individual</key>
+    </entry>
+    <entry>
+      <key>Organisation</key>
+      <value>Organisation</value>
+    </entry>
+    <entry>
+      <key>Base</key>
+      <value>Base</value>
+    </entry>
+    <entry>
+      <key>Receipts</key>
+      <value>Belege</value>
+    </entry>
+    <entry>
+      <key>Show all salesprojects</key>
+      <value>Alle Vertriebsprojekte anzeigen</value>
+    </entry>
+    <entry>
+      <key>Abomodel</key>
+      <value>Abomodell</value>
+    </entry>
+    <entry>
+      <key>Show all tweets of ADITO</key>
+      <value>Alle tweets von ADITO anzeigen</value>
+    </entry>
+    <entry>
+      <key>Show all tweets of a user</key>
+      <value>Alle tweets eines Benutzers anzeigen</value>
+    </entry>
+    <entry>
+      <key>in 12 Months</key>
+    </entry>
+    <entry>
+      <key>Standard / Individual</key>
+    </entry>
+    <entry>
+      <key>Please update the ${FORECAST_ENGLISH}.</key>
+      <value>Bitte den Forecast überprüfen.</value>
+    </entry>
+    <entry>
+      <key>Industry</key>
+      <value>Branche</value>
+    </entry>
+    <entry>
+      <key>From</key>
+      <value>Von</value>
+    </entry>
+    <entry>
+      <key>no Project planned</key>
+    </entry>
+    <entry>
+      <key>Strength 3</key>
+      <value>Stärke 3</value>
+    </entry>
+    <entry>
+      <key>Strength 1</key>
+      <value>Stärke 1</value>
+    </entry>
+    <entry>
+      <key>Strength 2</key>
+      <value>Stärke 2</value>
+    </entry>
+    <entry>
+      <key>Value</key>
+      <value>Wert</value>
+    </entry>
+    <entry>
+      <key>Weakness 1</key>
+      <value>Schwäche 1</value>
+    </entry>
+    <entry>
+      <key>Weakness 2</key>
+      <value>Schwäche 2</value>
+    </entry>
+    <entry>
+      <key>Weakness 3</key>
+      <value>Schwäche 3</value>
+    </entry>
+    <entry>
+      <key>Projectstart</key>
+      <value>Projektstart</value>
+    </entry>
+    <entry>
+      <key>no standard email office</key>
+      <value>keine Standard-E-Mail Büro vorhanden !</value>
+    </entry>
+    <entry>
+      <key>no valid format</key>
+    </entry>
+    <entry>
+      <key>Deliveryspecification</key>
+      <value>Lieferbedingung</value>
+    </entry>
+    <entry>
+      <key>Plus Salestax</key>
+      <value>zzgl.Summe UmSt</value>
+    </entry>
+    <entry>
+      <key>Pos.</key>
+    </entry>
+    <entry>
+      <key>ISO 3166-1 alpha-3</key>
+    </entry>
+    <entry>
+      <key>ISO 3166-1 alpha-2</key>
+    </entry>
+    <entry>
+      <key>Field staff</key>
+      <value>Außendienst</value>
+    </entry>
+    <entry>
+      <key>0.00</key>
+    </entry>
+    <entry>
+      <key>Document Templates</key>
+      <value>Dokumentvorlagen</value>
+    </entry>
+    <entry>
+      <key>Conditions of payment</key>
+      <value>Zahlungsbedingung</value>
+    </entry>
+    <entry>
+      <key>Relationship</key>
+      <value>Beziehung</value>
+    </entry>
+    <entry>
+      <key>Text Modular</key>
+      <value>Textbaustein</value>
+    </entry>
+    <entry>
+      <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
+      <value>Für dieses Binärfeld ist nur ein Datensatz erlaubt.</value>
+    </entry>
+    <entry>
+      <key>Put Reciever Into To</key>
+      <value>Bitte einen Adressat in 'to' eintragen!</value>
+    </entry>
+    <entry>
+      <key>History</key>
+      <value>Verlauf</value>
+    </entry>
+    <entry>
+      <key>Total</key>
+      <value>Gesamt</value>
+    </entry>
+    <entry>
+      <key>Articlenumber</key>
+      <value>Artikelnummer</value>
+    </entry>
+    <entry>
+      <key>Native Name</key>
+      <value>Geburtsname</value>
+    </entry>
+    <entry>
+      <key>#,##0</key>
+    </entry>
+    <entry>
+      <key>Unitprice</key>
+      <value>Einzelpreis</value>
+    </entry>
+    <entry>
+      <key>Number</key>
+      <value>Nummer</value>
+    </entry>
+    <entry>
+      <key>Tasks</key>
+      <value>Aufgaben</value>
+    </entry>
+    <entry>
+      <key>New offer</key>
+      <value>Angebot erstellen</value>
+    </entry>
+    <entry>
+      <key>dd.MM.yyyy</key>
+      <value>dd.MM.yyyy</value>
+    </entry>
+    <entry>
+      <key>Articledescription</key>
+      <value>Artikelbezeichnung</value>
+    </entry>
+    <entry>
+      <key>Edit defaults</key>
+      <value>Standards anpassen</value>
+    </entry>
+    <entry>
+      <key>no valid mail-address format</key>
+    </entry>
+    <entry>
+      <key>Amount</key>
+      <value>Menge</value>
+    </entry>
+    <entry>
+      <key>#,##0.00</key>
+    </entry>
+    <entry>
+      <key>Latin Name</key>
+      <value>Lateinischer Name</value>
+    </entry>
+    <entry>
+      <key>Organisation name</key>
+      <value>Name der Organisation</value>
+    </entry>
+    <entry>
+      <key>Connection</key>
+      <value>Verknüpfung</value>
+    </entry>
+    <entry>
+      <key>standard email</key>
+      <value>Standard-Email</value>
+    </entry>
+    <entry>
+      <key>Creator</key>
+      <value>Ersteller</value>
+    </entry>
+    <entry>
+      <key>Timetracking</key>
+      <value>Zeiterfassung</value>
+    </entry>
+    <entry>
+      <key>Further informations</key>
+      <value>Weitere Informationen</value>
+    </entry>
+    <entry>
+      <key>Social</key>
+      <value>Sozial</value>
+    </entry>
+    <entry>
+      <key>Facebook Feed</key>
+      <value>Facebook Feed</value>
+    </entry>
+    <entry>
+      <key>Group1</key>
+    </entry>
+    <entry>
+      <key>Group2</key>
+    </entry>
+    <entry>
+      <key>Details</key>
+      <value>Details</value>
+    </entry>
+    <entry>
+      <key>Prices</key>
+      <value>Preise</value>
+    </entry>
+    <entry>
+      <key>Twitter</key>
+      <value>Twitter</value>
+    </entry>
+    <entry>
+      <key>Connections</key>
+      <value>Verknüpfungen</value>
+    </entry>
+    <entry>
+      <key>Object</key>
+      <value>Objekt</value>
+    </entry>
+    <entry>
+      <key>Attributes</key>
+      <value>Eigenschaften</value>
+    </entry>
+    <entry>
+      <key>Facebook</key>
+      <value>Facebook</value>
+    </entry>
+    <entry>
+      <key>Creation date</key>
+      <value>Erstellungsdatum</value>
+    </entry>
+    <entry>
+      <key>Year</key>
+      <value>Jahr</value>
+    </entry>
+    <entry>
+      <key>New receipt version</key>
+      <value>Neue Quittungsversion</value>
+    </entry>
+    <entry>
+      <key>Orderitems</key>
+      <value>Belegposten</value>
+    </entry>
+    <entry>
+      <key>Sent receipts</key>
+      <value>Versendete Belege</value>
+    </entry>
+    <entry>
+      <key>Copy receipt</key>
+      <value>Beleg kopieren</value>
+    </entry>
+    <entry>
+      <key>Orderitem</key>
+    </entry>
+    <entry>
+      <key>The order number already exists!</key>
+    </entry>
+    <entry>
+      <key>New activity</key>
+      <value>Neue Aktivität</value>
+    </entry>
+    <entry>
+      <key>July</key>
+      <value>Juli</value>
+    </entry>
+    <entry>
+      <key>ADITO Facebook Feed</key>
+    </entry>
+    <entry>
+      <key>ADITO Twitter Feed</key>
+    </entry>
+    <entry>
+      <key>June</key>
+      <value>Juni</value>
+    </entry>
+    <entry>
+      <key>October</key>
+      <value>Oktober</value>
+    </entry>
+    <entry>
+      <key>Take price</key>
+      <value>Preis übernehmen</value>
+    </entry>
+    <entry>
+      <key>Customer Base Sheet</key>
+      <value>Kundenstammblatt</value>
+    </entry>
+    <entry>
+      <key>Twitter Feed</key>
+      <value>Twitter Feed</value>
+    </entry>
+    <entry>
+      <key>November</key>
+      <value>November</value>
+    </entry>
+    <entry>
+      <key>December</key>
+      <value>Dezember</value>
+    </entry>
+    <entry>
+      <key>May</key>
+      <value>Mai</value>
+    </entry>
+    <entry>
+      <key>April</key>
+      <value>April</value>
+    </entry>
+    <entry>
+      <key>January</key>
+      <value>Januar</value>
+    </entry>
+    <entry>
+      <key>March</key>
+      <value>März</value>
+    </entry>
+    <entry>
+      <key>September</key>
+      <value>September</value>
+    </entry>
+    <entry>
+      <key>August</key>
+      <value>August</value>
+    </entry>
+    <entry>
+      <key>Category</key>
+      <value>Kategorie</value>
+    </entry>
+    <entry>
+      <key>February</key>
+      <value>Februar</value>
+    </entry>
+    <entry>
+      <key>{$TASK_STATUS}</key>
+      <value>Status</value>
+    </entry>
+    <entry>
+      <key>Task</key>
+      <value>Aufgabe</value>
+    </entry>
+    <entry>
+      <key>subject</key>
+      <value>Betreff</value>
+    </entry>
+    <entry>
+      <key>{$TASK_REQUESTOR}</key>
+      <value>Anforderer</value>
+    </entry>
+    <entry>
+      <key>task number</key>
+      <value>Aufgabennummer</value>
+    </entry>
+    <entry>
+      <key>description</key>
+      <value>Beschreibung</value>
+    </entry>
+    <entry>
+      <key>priority</key>
+      <value>Priorität</value>
+    </entry>
+    <entry>
+      <key>{$TASK_EDITOR}</key>
+      <value>Bearbeiter</value>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_HIGH}</key>
+      <value>hoch</value>
+    </entry>
+    <entry>
+      <key>Seite</key>
+    </entry>
+    <entry>
+      <key>Senden per E-Mail</key>
+    </entry>
+    <entry>
+      <key>Hauptdokument</key>
+    </entry>
+    <entry>
+      <key>Betreff</key>
+    </entry>
+    <entry>
+      <key>title</key>
+      <value>Titel</value>
+    </entry>
+    <entry>
+      <key>von</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_LOW}</key>
+      <value>niedrig</value>
+    </entry>
+    <entry>
+      <key>Nur Eigene anzeigen</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_NORMAL}</key>
+      <value>normal</value>
+    </entry>
+    <entry>
+      <key>Beschreibung</key>
+    </entry>
+    <entry>
+      <key>Unit price</key>
+      <value>Einzelpreis</value>
+    </entry>
+    <entry>
+      <key>Firma</key>
+    </entry>
+    <entry>
+      <key>type</key>
+      <value>Typ</value>
+    </entry>
+    <entry>
+      <key>Benutzer</key>
+    </entry>
+    <entry>
+      <key>Schlüsselwort</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_NONE}</key>
+      <value>keine</value>
+    </entry>
+    <entry>
+      <key>Directly responsible:</key>
+      <value>Ihr zuständiger Betreuer:</value>
+    </entry>
+    <entry>
+      <key>Appointment</key>
+      <value>Termin</value>
+    </entry>
+    <entry>
+      <key>Vorschau</key>
+    </entry>
+    <entry>
+      <key>Angebot</key>
+    </entry>
+    <entry>
+      <key>Salesdashboard</key>
+      <value>Vertriebsdashboard</value>
+    </entry>
+    <entry>
+      <key>details</key>
+      <value>details</value>
+    </entry>
+    <entry>
+      <key>Kundenstammblatt</key>
+    </entry>
+    <entry>
+      <key>Key figures</key>
+    </entry>
+    <entry>
+      <key>Person</key>
+    </entry>
+    <entry>
+      <key>Detail</key>
+      <value>Detail</value>
+    </entry>
+    <entry>
+      <key>Object 2</key>
+      <value>Objekt 2</value>
+    </entry>
+    <entry>
+      <key>Object 1</key>
+      <value>Objekt 1</value>
+    </entry>
+    <entry>
+      <key>Type 2</key>
+      <value>Typ 2</value>
+    </entry>
+    <entry>
+      <key>Type 1</key>
+      <value>Typ 1</value>
+    </entry>
+    <entry>
+      <key>Relations</key>
+      <value>Beziehungen</value>
+    </entry>
+    <entry>
+      <key>${FORECAST_ENGLISH}</key>
+      <value>Forecast</value>
+    </entry>
+    <entry>
+      <key>Title (original language)</key>
+      <value>Titel (ursprüngliche Sprache)</value>
+    </entry>
+    <entry>
+      <key>Attribute Relation</key>
+      <value>Eigenschaftsbeziehung</value>
+    </entry>
+    <entry>
+      <key>My Dashboard</key>
+      <value>My Dashboard</value>
+    </entry>
+    <entry>
+      <key>Attribute Usage</key>
+      <value>Eigenschaftsverwendung</value>
+    </entry>
+    <entry>
+      <key>Key</key>
+    </entry>
+    <entry>
+      <key>Attribute</key>
+      <value>Eigenschaft</value>
+    </entry>
+    <entry>
+      <key>Container</key>
+    </entry>
+    <entry>
+      <key>Administration</key>
+      <value>Administration</value>
+    </entry>
+    <entry>
+      <key>Keyword</key>
+      <value>Schlüsselwort</value>
+    </entry>
+    <entry>
+      <key>Sorting</key>
+      <value>Sortierung</value>
+    </entry>
+    <entry>
+      <key>jdito</key>
+    </entry>
+    <entry>
+      <key>Context id</key>
+    </entry>
+    <entry>
+      <key>Context name</key>
+    </entry>
+    <entry>
+      <key>Cambodia</key>
+      <value>Kambodscha</value>
+    </entry>
+    <entry>
+      <key>Resigned</key>
+      <value>gekündigt</value>
+    </entry>
+    <entry>
+      <key>Customer</key>
+      <value>Kunde</value>
+    </entry>
+    <entry>
+      <key>Outgoing</key>
+      <value>ausgehend</value>
+    </entry>
+    <entry>
+      <key>Paraguay</key>
+      <value>Paraguay</value>
+    </entry>
+    <entry>
+      <key>New attribute</key>
+      <value>Neues Attribut</value>
+    </entry>
+    <entry>
+      <key>Solomon Islands</key>
+      <value>Salomon-Inseln</value>
+    </entry>
+    <entry>
+      <key>Montserrat</key>
+      <value>Montserrat</value>
+    </entry>
+    <entry>
+      <key>Guadeloupe</key>
+      <value>Guadeloupe</value>
+    </entry>
+    <entry>
+      <key>Product_technic</key>
+      <value>Produkt_Technik</value>
+    </entry>
+    <entry>
+      <key>Moldova (Republic of)</key>
+      <value>Republik Moldau</value>
+    </entry>
+    <entry>
+      <key>Seychelles</key>
+      <value>Seychellen</value>
+    </entry>
+    <entry>
+      <key>Canadian dollar</key>
+      <value>Kanadischer Dollar</value>
+    </entry>
+    <entry>
+      <key>Bahrain</key>
+      <value>Bahrain</value>
+    </entry>
+    <entry>
+      <key>Comoros</key>
+      <value>Komoren</value>
+    </entry>
+    <entry>
+      <key>Faroe Islands</key>
+      <value>Färöer Inseln</value>
+    </entry>
+    <entry>
+      <key>Finland</key>
+      <value>Finnland</value>
+    </entry>
+    <entry>
+      <key>Project_duration</key>
+      <value>Projekt_Dauer</value>
+    </entry>
+    <entry>
+      <key>Company_internationality</key>
+      <value>Unternehmen_Internationalität</value>
+    </entry>
+    <entry>
+      <key>Eritrea</key>
+      <value>Eritrea</value>
+    </entry>
+    <entry>
+      <key>Puerto Rico</key>
+      <value>Puerto Rico</value>
+    </entry>
+    <entry>
+      <key>Viet Nam</key>
+      <value>Vietnam</value>
+    </entry>
+    <entry>
+      <key>Libya</key>
+      <value>Libyen</value>
+    </entry>
+    <entry>
+      <key>French</key>
+      <value>Französisch</value>
+    </entry>
+    <entry>
+      <key>Cocos (Keeling) Islands</key>
+      <value>Kokosinseln (Keelinginseln)</value>
+    </entry>
+    <entry>
+      <key>Saint Helena, Ascension and Tristan da Cunha</key>
+      <value>St. Helena, Himmelfahrt und Tristan da Cunha</value>
+    </entry>
+    <entry>
+      <key>Liechtenstein</key>
+      <value>Liechtenstein</value>
+    </entry>
+    <entry>
+      <key>Product_functionality</key>
+      <value>Produkt_Funktionalität</value>
+    </entry>
+    <entry>
+      <key>New appointment</key>
+      <value>Neuer Termin</value>
+    </entry>
+    <entry>
+      <key>Bulgaria</key>
+      <value>Bulgarien</value>
+    </entry>
+    <entry>
+      <key>Jordan</key>
+      <value>Jordan</value>
+    </entry>
+    <entry>
+      <key>Côte d'Ivoire</key>
+      <value>Elfenbeinküste</value>
+    </entry>
+    <entry>
+      <key>United Arab Emirates</key>
+      <value>Vereinigte Arabische Emirate</value>
+    </entry>
+    <entry>
+      <key>Kenya</key>
+      <value>Kenia</value>
+    </entry>
+    <entry>
+      <key>None, individual count</key>
+      <value>keiner, Einzelberechnung</value>
+    </entry>
+    <entry>
+      <key>French Polynesia</key>
+      <value>Französisch Polynesien</value>
+    </entry>
+    <entry>
+      <key>Djibouti</key>
+      <value>Dschibuti</value>
+    </entry>
+    <entry>
+      <key>Cuba</key>
+      <value>Kuba</value>
+    </entry>
+    <entry>
+      <key>Saint Lucia</key>
+      <value>St. Lucia</value>
+    </entry>
+    <entry>
+      <key>Mayotte</key>
+      <value>Mayotte</value>
+    </entry>
+    <entry>
+      <key>Israel</key>
+      <value>Israel</value>
+    </entry>
+    <entry>
+      <key>San Marino</key>
+      <value>San Marino</value>
+    </entry>
+    <entry>
+      <key>Tajikistan</key>
+      <value>Tadschikistan</value>
+    </entry>
+    <entry>
+      <key>Warehouse 2</key>
+      <value>Lager 2</value>
+    </entry>
+    <entry>
+      <key>Warehouse 1</key>
+      <value>Lager 1</value>
+    </entry>
+    <entry>
+      <key>Gibraltar</key>
+      <value>Gibraltar</value>
+    </entry>
+    <entry>
+      <key>Warehouse 3</key>
+      <value>Lager 3</value>
+    </entry>
+    <entry>
+      <key>Cyprus</key>
+      <value>Zypern</value>
+    </entry>
+    <entry>
+      <key>Semiannually</key>
+      <value>halbjährlich</value>
+    </entry>
+    <entry>
+      <key>Northern Mariana Islands</key>
+      <value>Nördliche Marianneninseln</value>
+    </entry>
+    <entry>
+      <key>Malaysia</key>
+      <value>Malaysia</value>
+    </entry>
+    <entry>
+      <key>Letter</key>
+      <value>Brief</value>
+    </entry>
+    <entry>
+      <key>Armenia</key>
+      <value>Armenien</value>
+    </entry>
+    <entry>
+      <key>Brazil</key>
+      <value>Brasilien</value>
+    </entry>
+    <entry>
+      <key>Turks and Caicos Islands</key>
+      <value>Turks- und Caicosinseln</value>
+    </entry>
+    <entry>
+      <key>Cabo Verde</key>
+      <value>Cabo Verde</value>
+    </entry>
+    <entry>
+      <key>Ecuador</key>
+      <value>Ecuador</value>
+    </entry>
+    <entry>
+      <key>Iran (Islamic Republic of)</key>
+      <value>Iran (Islamische Republik)</value>
+    </entry>
+    <entry>
+      <key>Decision maker</key>
+      <value>Entscheider</value>
+    </entry>
+    <entry>
+      <key>Lao People's Democratic Republic</key>
+      <value>Demokratische Volksrepublik Laos</value>
+    </entry>
+    <entry>
+      <key>Maintenance contract</key>
+      <value>Wartungsvertrag</value>
+    </entry>
+    <entry>
+      <key>United States Minor Outlying Islands</key>
+      <value>Kleinere abgelegene Inseln der Vereinigten Staaten</value>
+    </entry>
+    <entry>
+      <key>Italy</key>
+      <value>Italien</value>
+    </entry>
+    <entry>
+      <key>${ORGTYPE_OTHER}</key>
+      <value>Sonstiges</value>
+    </entry>
+    <entry>
+      <key>Haiti</key>
+      <value>Haiti</value>
+    </entry>
+    <entry>
+      <key>Afghanistan</key>
+      <value>Afghanistan</value>
+    </entry>
+    <entry>
+      <key>Russian Federation</key>
+      <value>Russische Föderation</value>
+    </entry>
+    <entry>
+      <key>waiting</key>
+      <value>warten auf Rückmeldung</value>
+    </entry>
+    <entry>
+      <key>American Samoa</key>
+      <value>Amerikanischen Samoa-Inseln</value>
+    </entry>
+    <entry>
+      <key>Korea (Democratic People's Republic of)</key>
+      <value>Korea, Demokratische Volksrepublik)</value>
+    </entry>
+    <entry>
+      <key>United States dollar</key>
+      <value>US-Dollar</value>
+    </entry>
+    <entry>
+      <key>Superordinate Attribute</key>
+      <value>Ãœbergeordnete Eigenschaft</value>
+    </entry>
+    <entry>
+      <key>Kyrgyzstan</key>
+      <value>Kirgisistan</value>
+    </entry>
+    <entry>
+      <key>Togo</key>
+      <value>Togo</value>
+    </entry>
+    <entry>
+      <key>Other_existing Customer</key>
+      <value>Sonstiges_Bestandskunde</value>
+    </entry>
+    <entry>
+      <key>Uzbekistan</key>
+      <value>Usbekistan</value>
+    </entry>
+    <entry>
+      <key>Dominica</key>
+      <value>Dominica</value>
+    </entry>
+    <entry>
+      <key>Benin</key>
+      <value>Benin</value>
+    </entry>
+    <entry>
+      <key>Virgin Islands (British)</key>
+      <value>Virgin Inseln, Britisch)</value>
+    </entry>
+    <entry>
+      <key>Sudan</key>
+      <value>Sudan</value>
+    </entry>
+    <entry>
+      <key>Portugal</key>
+      <value>Portugal</value>
+    </entry>
+    <entry>
+      <key>Grenada</key>
+      <value>Grenada</value>
+    </entry>
+    <entry>
+      <key>Latvia</key>
+      <value>Lettland</value>
+    </entry>
+    <entry>
+      <key>Mongolia</key>
+      <value>Mongolei</value>
+    </entry>
+    <entry>
+      <key>Morocco</key>
+      <value>Marokko</value>
+    </entry>
+    <entry>
+      <key>Guatemala</key>
+      <value>Guatemala</value>
+    </entry>
+    <entry>
+      <key>Pieces</key>
+      <value>Stück</value>
+    </entry>
+    <entry>
+      <key>Heard Island and McDonald Islands</key>
+      <value>Heard Island und McDonald Islands</value>
+    </entry>
+    <entry>
+      <key>Incoming</key>
+      <value>eingehend</value>
+    </entry>
+    <entry>
+      <key>Ghana</key>
+      <value>Ghana</value>
+    </entry>
+    <entry>
+      <key>Holy See</key>
+      <value>Heiliger Stuhl</value>
+    </entry>
+    <entry>
+      <key>India</key>
+      <value>Indien</value>
+    </entry>
+    <entry>
+      <key>Canada</key>
+      <value>Kanada</value>
+    </entry>
+    <entry>
+      <key>Attachment</key>
+      <value>Anhang</value>
+    </entry>
+    <entry>
+      <key>Maldives</key>
+      <value>Malediven</value>
+    </entry>
+    <entry>
+      <key>Service contract</key>
+      <value>Werksvertrag</value>
+    </entry>
+    <entry>
+      <key>Taiwan</key>
+      <value>Taiwan</value>
+    </entry>
+    <entry>
+      <key>Central African Republic</key>
+      <value>Zentralafrikanische Republik</value>
+    </entry>
+    <entry>
+      <key>Fiji</key>
+      <value>Fidschi</value>
+    </entry>
+    <entry>
+      <key>Guinea</key>
+      <value>Guinea</value>
+    </entry>
+    <entry>
+      <key>Somalia</key>
+      <value>Somalia</value>
+    </entry>
+    <entry>
+      <key>Sao Tome and Principe</key>
+      <value>Sao Tome und Principe</value>
+    </entry>
+    <entry>
+      <key>United Kingdom of Great Britain and Northern Ireland</key>
+      <value>Vereinigtes Königreich Großbritannien und Nordirland</value>
+    </entry>
+    <entry>
+      <key>Equatorial Guinea</key>
+      <value>Äquatorialguinea</value>
+    </entry>
+    <entry>
+      <key>Kiribati</key>
+      <value>Kiribati</value>
+    </entry>
+    <entry>
+      <key>Costa Rica</key>
+      <value>Costa Rica</value>
+    </entry>
+    <entry>
+      <key>Supplier</key>
+      <value>Lieferant</value>
+    </entry>
+    <entry>
+      <key>Nigeria</key>
+      <value>Nigeria</value>
+    </entry>
+    <entry>
+      <key>Syrian Arab Republic</key>
+      <value>Syrische Arabische Republik</value>
+    </entry>
+    <entry>
+      <key>Timor-Leste</key>
+      <value>Timor-Leste</value>
+    </entry>
+    <entry>
+      <key>Product_mobile use</key>
+      <value>Produkt_Mobiler Einsatz</value>
+    </entry>
+    <entry>
+      <key>Samoa</key>
+      <value>Samoa</value>
+    </entry>
+    <entry>
+      <key>Spain</key>
+      <value>Spanien</value>
+    </entry>
+    <entry>
+      <key>ObjectRelationType</key>
+      <value>Beziehungstyp</value>
+    </entry>
+    <entry>
+      <key>Palau</key>
+      <value>Palau</value>
+    </entry>
+    <entry>
+      <key>Prospect</key>
+      <value>Interessent</value>
+    </entry>
+    <entry>
+      <key>Estonia</key>
+      <value>Estland</value>
+    </entry>
+    <entry>
+      <key>Not signed yet</key>
+      <value>noch nicht unterschrieben</value>
+    </entry>
+    <entry>
+      <key>Niue</key>
+      <value>Niue</value>
+    </entry>
+    <entry>
+      <key>Mozambique</key>
+      <value>Mosambik</value>
+    </entry>
+    <entry>
+      <key>El Salvador</key>
+      <value>El Salvador</value>
+    </entry>
+    <entry>
+      <key>Guam</key>
+      <value>Guam</value>
+    </entry>
+    <entry>
+      <key>Lesotho</key>
+      <value>Lesotho</value>
+    </entry>
+    <entry>
+      <key>Tonga</key>
+      <value>Tonga</value>
+    </entry>
+    <entry>
+      <key>Western Sahara</key>
+      <value>Westsahara</value>
+    </entry>
+    <entry>
+      <key>new</key>
+      <value>neu</value>
+    </entry>
+    <entry>
+      <key>Adviser</key>
+      <value>Berater</value>
+    </entry>
+    <entry>
+      <key>Company_size</key>
+      <value>Unternehmen_Größe</value>
+    </entry>
+    <entry>
+      <key>Republic of Kosovo</key>
+      <value>Republik Kosovo</value>
+    </entry>
+    <entry>
+      <key>South Sudan</key>
+      <value>Südsudan</value>
+    </entry>
+    <entry>
+      <key>Mauritius</key>
+      <value>Mauritius</value>
+    </entry>
+    <entry>
+      <key>Bouvet Island</key>
+      <value>Bouvet Island</value>
+    </entry>
+    <entry>
+      <key>Bolivia (Plurinational State of)</key>
+      <value>Bolivien (plurinationaler Staat)</value>
+    </entry>
+    <entry>
+      <key>Norfolk Island</key>
+      <value>Norfolkinsel</value>
+    </entry>
+    <entry>
+      <key>Sint Maarten (Dutch part)</key>
+      <value>Sint Maarten (niederländischer Teil)</value>
+    </entry>
+    <entry>
+      <key>Micronesia (Federated States of)</key>
+      <value>Mikronesien (Föderierte Staaten von)</value>
+    </entry>
+    <entry>
+      <key>Product_industry knowhow</key>
+      <value>Produkt_Branchen KnowHow</value>
+    </entry>
+    <entry>
+      <key>Progress</key>
+      <value>Fortschritt</value>
+    </entry>
+    <entry>
+      <key>United States of America</key>
+      <value>Vereinigte Staaten von Amerika</value>
+    </entry>
+    <entry>
+      <key>In review</key>
+      <value>zur Prüfung</value>
+    </entry>
+    <entry>
+      <key>Address purchase</key>
+      <value>Adresserwerb</value>
+    </entry>
+    <entry>
+      <key>Malta</key>
+      <value>Malta</value>
+    </entry>
+    <entry>
+      <key>Project_volume</key>
+      <value>Projekt_Volumen</value>
+    </entry>
+    <entry>
+      <key>Ireland</key>
+      <value>Irland</value>
+    </entry>
+    <entry>
+      <key>Inactive</key>
+      <value>Inaktiv</value>
+    </entry>
+    <entry>
+      <key>France</key>
+      <value>Frankreich</value>
+    </entry>
+    <entry>
+      <key>Lithuania</key>
+      <value>Litauen</value>
+    </entry>
+    <entry>
+      <key>Korea (Republic of)</key>
+      <value>Korea (Republik)</value>
+    </entry>
+    <entry>
+      <key>${PRICELIST_SERVICE}</key>
+      <value>Service</value>
+    </entry>
+    <entry>
+      <key>English</key>
+      <value>Englisch</value>
+    </entry>
+    <entry>
+      <key>Nicaragua</key>
+      <value>Nicaragua</value>
+    </entry>
+    <entry>
+      <key>Macao</key>
+      <value>Macao</value>
+    </entry>
+    <entry>
+      <key>Mexico</key>
+      <value>Mexiko</value>
+    </entry>
+    <entry>
+      <key>Uganda</key>
+      <value>Uganda</value>
+    </entry>
+    <entry>
+      <key>Suriname</key>
+      <value>Suriname</value>
+    </entry>
+    <entry>
+      <key>Greenland</key>
+      <value>Grönland</value>
+    </entry>
+    <entry>
+      <key>Papua New Guinea</key>
+      <value>Papua Neu-Guinea</value>
+    </entry>
+    <entry>
+      <key>Kazakhstan</key>
+      <value>Kasachstan</value>
+    </entry>
+    <entry>
+      <key>Ã…land Islands</key>
+      <value>Ã…landinseln</value>
+    </entry>
+    <entry>
+      <key>Bahamas</key>
+      <value>Bahamas</value>
+    </entry>
+    <entry>
+      <key>Mali</key>
+      <value>Mali</value>
+    </entry>
+    <entry>
+      <key>Marshall Islands</key>
+      <value>Marshallinseln</value>
+    </entry>
+    <entry>
+      <key>Panama</key>
+      <value>Panama</value>
+    </entry>
+    <entry>
+      <key>Bonaire, Sint Eustatius and Saba</key>
+      <value>Bonaire, Sint Eustatius und Saba</value>
+    </entry>
+    <entry>
+      <key>Tanzania, United Republic of</key>
+      <value>Tansania, Vereinigte Republik</value>
+    </entry>
+    <entry>
+      <key>Argentina</key>
+      <value>Argentinien</value>
+    </entry>
+    <entry>
+      <key>Belize</key>
+      <value>Belize</value>
+    </entry>
+    <entry>
+      <key>Zambia</key>
+      <value>Sambia</value>
+    </entry>
+    <entry>
+      <key>Congo</key>
+      <value>Kongo</value>
+    </entry>
+    <entry>
+      <key>Guinea-Bissau</key>
+      <value>Guinea-Bissau</value>
+    </entry>
+    <entry>
+      <key>Namibia</key>
+      <value>Namibia</value>
+    </entry>
+    <entry>
+      <key>External sales manager</key>
+      <value>Externer Verkaufsleiter</value>
+    </entry>
+    <entry>
+      <key>Georgia</key>
+      <value>Georgia</value>
+    </entry>
+    <entry>
+      <key>Saint Kitts and Nevis</key>
+      <value>St. Kitts und Nevis</value>
+    </entry>
+    <entry>
+      <key>Yemen</key>
+      <value>Jemen</value>
+    </entry>
+    <entry>
+      <key>The minimal count can't be larger than the maximal count!</key>
+      <value>Die minimale Anzahl darf nicht größer als die maximale Anzahl sein!</value>
+    </entry>
+    <entry>
+      <key>Aruba</key>
+      <value>Aruba</value>
+    </entry>
+    <entry>
+      <key>Madagascar</key>
+      <value>Madagaskar</value>
+    </entry>
+    <entry>
+      <key>Valid, unlimited</key>
+      <value>gültig, unbefristet</value>
+    </entry>
+    <entry>
+      <key>Svalbard and Jan Mayen</key>
+      <value>Svalbard und Jan Mayen</value>
+    </entry>
+    <entry>
+      <key>South Georgia and the South Sandwich Islands</key>
+      <value>Süd-Georgien und die südlichen Sandwich-Inseln</value>
+    </entry>
+    <entry>
+      <key>Sweden</key>
+      <value>Schweden</value>
+    </entry>
+    <entry>
+      <key>Malawi</key>
+      <value>Malawi</value>
+    </entry>
+    <entry>
+      <key>Andorra</key>
+      <value>Andorra</value>
+    </entry>
+    <entry>
+      <key>Poland</key>
+      <value>Polen</value>
+    </entry>
+    <entry>
+      <key>Tunisia</key>
+      <value>Tunesien</value>
+    </entry>
+    <entry>
+      <key>Tuvalu</key>
+      <value>Tuvalu</value>
+    </entry>
+    <entry>
+      <key>Lebanon</key>
+      <value>Libanon</value>
+    </entry>
+    <entry>
+      <key>Azerbaijan</key>
+      <value>Aserbaidschan</value>
+    </entry>
+    <entry>
+      <key>Czech Republic</key>
+      <value>Tschechische Republik</value>
+    </entry>
+    <entry>
+      <key>Mauritania</key>
+      <value>Mauretanien</value>
+    </entry>
+    <entry>
+      <key>Guernsey</key>
+      <value>Guernsey</value>
+    </entry>
+    <entry>
+      <key>Kgs</key>
+      <value>Kg</value>
+    </entry>
+    <entry>
+      <key>Australia</key>
+      <value>Australien</value>
+    </entry>
+    <entry>
+      <key>Myanmar</key>
+      <value>Myanmar</value>
+    </entry>
+    <entry>
+      <key>Cameroon</key>
+      <value>Kamerun</value>
+    </entry>
+    <entry>
+      <key>Iceland</key>
+      <value>Island</value>
+    </entry>
+    <entry>
+      <key>Oman</key>
+      <value>Oman</value>
+    </entry>
+    <entry>
+      <key>Gabon</key>
+      <value>Gabun</value>
+    </entry>
+    <entry>
+      <key>Luxembourg</key>
+      <value>Luxemburg</value>
+    </entry>
+    <entry>
+      <key>Algeria</key>
+      <value>Algerien</value>
+    </entry>
+    <entry>
+      <key>Jersey</key>
+      <value>Jersey</value>
+    </entry>
+    <entry>
+      <key>Overview</key>
+      <value>Ãœbersicht</value>
+    </entry>
+    <entry>
+      <key>Slovenia</key>
+      <value>Slowenien</value>
+    </entry>
+    <entry>
+      <key>Antigua and Barbuda</key>
+      <value>Antigua und Barbuda</value>
+    </entry>
+    <entry>
+      <key>Annually</key>
+      <value>jährlich</value>
+    </entry>
+    <entry>
+      <key>Participated</key>
+      <value>Teilgenommen</value>
+    </entry>
+    <entry>
+      <key>Colombia</key>
+      <value>Kolumbien</value>
+    </entry>
+    <entry>
+      <key>Project_reference</key>
+      <value>Projekt_Referenz</value>
+    </entry>
+    <entry>
+      <key>Vanuatu</key>
+      <value>Vanuatu</value>
+    </entry>
+    <entry>
+      <key>Valid, limited</key>
+      <value>gültig, befristet</value>
+    </entry>
+    <entry>
+      <key>Honduras</key>
+      <value>Honduras</value>
+    </entry>
+    <entry>
+      <key>Antarctica</key>
+      <value>Antarktis</value>
+    </entry>
+    <entry>
+      <key>Nauru</key>
+      <value>Nauru</value>
+    </entry>
+    <entry>
+      <key>Burundi</key>
+      <value>Burundi</value>
+    </entry>
+    <entry>
+      <key>Project manager</key>
+      <value>Projektmanager</value>
+    </entry>
+    <entry>
+      <key>Singapore</key>
+      <value>Singapur</value>
+    </entry>
+    <entry>
+      <key>French Guiana</key>
+      <value>Französisch-Guayana</value>
+    </entry>
+    <entry>
+      <key>Hours</key>
+      <value>Stunden</value>
+    </entry>
+    <entry>
+      <key>Special price list</key>
+      <value>Sonderpreisliste</value>
+    </entry>
+    <entry>
+      <key>Christmas Island</key>
+      <value>Weihnachtsinsel</value>
+    </entry>
+    <entry>
+      <key>Project</key>
+      <value>Projekt</value>
+    </entry>
+    <entry>
+      <key>Netherlands</key>
+      <value>Niederlande</value>
+    </entry>
+    <entry>
+      <key>Product_flexibility</key>
+      <value>Produkt_Flexibilität</value>
+    </entry>
+    <entry>
+      <key>China</key>
+      <value>China</value>
+    </entry>
+    <entry>
+      <key>Martinique</key>
+      <value>Martinique</value>
+    </entry>
+    <entry>
+      <key>Own website</key>
+      <value>Eigene Website</value>
+    </entry>
+    <entry>
+      <key>Saint Pierre and Miquelon</key>
+      <value>Saint Pierre und Miquelon</value>
+    </entry>
+    <entry>
+      <key>Bhutan</key>
+      <value>Bhutan</value>
+    </entry>
+    <entry>
+      <key>Romania</key>
+      <value>Rumänien</value>
+    </entry>
+    <entry>
+      <key>Falkland Islands (Malvinas)</key>
+      <value>Falklandinseln (Malvinas)</value>
+    </entry>
+    <entry>
+      <key>Philippines</key>
+      <value>Philippinen</value>
+    </entry>
+    <entry>
+      <key>Pitcairn</key>
+      <value>Pitcairn</value>
+    </entry>
+    <entry>
+      <key>Zimbabwe</key>
+      <value>Zimbabwe</value>
+    </entry>
+    <entry>
+      <key>British Indian Ocean Territory</key>
+      <value>Britisches Territorium des Indischen Ozeans</value>
+    </entry>
+    <entry>
+      <key>Montenegro</key>
+      <value>Montenegro</value>
+    </entry>
+    <entry>
+      <key>Quarterly</key>
+      <value>vierteljährlich</value>
+    </entry>
+    <entry>
+      <key>Indonesia</key>
+      <value>Indonesien</value>
+    </entry>
+    <entry>
+      <key>Module</key>
+      <value>Modul</value>
+    </entry>
+    <entry>
+      <key>Angola</key>
+      <value>Angola</value>
+    </entry>
+    <entry>
+      <key>Internal</key>
+      <value>intern</value>
+    </entry>
+    <entry>
+      <key>Roles</key>
+      <value>Rollen</value>
+    </entry>
+    <entry>
+      <key>Brunei Darussalam</key>
+      <value>Brunei Darussalam</value>
+    </entry>
+    <entry>
+      <key>New Caledonia</key>
+      <value>Neu-Kaledonien</value>
+    </entry>
+    <entry>
+      <key>Cayman Islands</key>
+      <value>Cayman Inseln</value>
+    </entry>
+    <entry>
+      <key>Congo (Democratic Republic of the)</key>
+      <value>Kongo (Demokratische Republik)</value>
+    </entry>
+    <entry>
+      <key>Resource</key>
+      <value>Ressource</value>
+    </entry>
+    <entry>
+      <key>Greece</key>
+      <value>Griechenland</value>
+    </entry>
+    <entry>
+      <key>Guyana</key>
+      <value>Guyana</value>
+    </entry>
+    <entry>
+      <key>Project assistant</key>
+      <value>Projektassistent</value>
+    </entry>
+    <entry>
+      <key>Iraq</key>
+      <value>Irak</value>
+    </entry>
+    <entry>
+      <key>Chile</key>
+      <value>Chile</value>
+    </entry>
+    <entry>
+      <key>Nepal</key>
+      <value>Nepal</value>
+    </entry>
+    <entry>
+      <key>${PRICELIST_DEFAULT}</key>
+      <value>Standard</value>
+    </entry>
+    <entry>
+      <key>Customer recommendation</key>
+      <value>Kundenempfehlung</value>
+    </entry>
+    <entry>
+      <key>Other_unknown</key>
+      <value>Sonstiges_Unbekannt</value>
+    </entry>
+    <entry>
+      <key>Isle of Man</key>
+      <value>Isle of Man</value>
+    </entry>
+    <entry>
+      <key>Ukraine</key>
+      <value>Ukraine</value>
+    </entry>
+    <entry>
+      <key>Curaçao</key>
+      <value>Curacao</value>
+    </entry>
+    <entry>
+      <key>Anguilla</key>
+      <value>Anguilla</value>
+    </entry>
+    <entry>
+      <key>Euro</key>
+      <value>Euro</value>
+    </entry>
+    <entry>
+      <key>Product_GUI</key>
+      <value>Produkt_GUI</value>
+    </entry>
+    <entry>
+      <key>${GENDER_OTHER}</key>
+      <value>Divers</value>
+    </entry>
+    <entry>
+      <key>Touchpoint</key>
+      <value>Kontaktpunkt</value>
+    </entry>
+    <entry>
+      <key>Turkey</key>
+      <value>Türkei</value>
+    </entry>
+    <entry>
+      <key>Belgium</key>
+      <value>Belgien</value>
+    </entry>
+    <entry>
+      <key>South Africa</key>
+      <value>Südafrika</value>
+    </entry>
+    <entry>
+      <key>Trinidad and Tobago</key>
+      <value>Trinidad und Tobago</value>
+    </entry>
+    <entry>
+      <key>Bermuda</key>
+      <value>Bermuda</value>
+    </entry>
+    <entry>
+      <key>Jamaica</key>
+      <value>Jamaika</value>
+    </entry>
+    <entry>
+      <key>Peru</key>
+      <value>Peru</value>
+    </entry>
+    <entry>
+      <key>Turkmenistan</key>
+      <value>Turkmenistan</value>
+    </entry>
+    <entry>
+      <key>Venezuela (Bolivarian Republic of)</key>
+      <value>Venezuela (Bolivarische Republik)</value>
+    </entry>
+    <entry>
+      <key>Tokelau</key>
+      <value>Tokelau</value>
+    </entry>
+    <entry>
+      <key>Hong Kong</key>
+      <value>Hongkong</value>
+    </entry>
+    <entry>
+      <key>Password</key>
+      <value>Passwort</value>
+    </entry>
+    <entry>
+      <key>Chad</key>
+      <value>Tschad</value>
+    </entry>
+    <entry>
+      <key>German</key>
+      <value>Deutsch</value>
+    </entry>
+    <entry>
+      <key>Thailand</key>
+      <value>Thailand</value>
+    </entry>
+    <entry>
+      <key>in process</key>
+      <value>in Bearbeitung</value>
+    </entry>
+    <entry>
+      <key>Saint Martin (French part)</key>
+      <value>Saint Martin (französischer Teil)</value>
+    </entry>
+    <entry>
+      <key>Kuwait</key>
+      <value>Kuwait</value>
+    </entry>
+    <entry>
+      <key>Palestine, State of</key>
+      <value>Palästina, Bundesstaat</value>
+    </entry>
+    <entry>
+      <key>Croatia</key>
+      <value>Kroatien</value>
+    </entry>
+    <entry>
+      <key>Cook Islands</key>
+      <value>Cookinseln</value>
+    </entry>
+    <entry>
+      <key>Fair</key>
+      <value>Messe</value>
+    </entry>
+    <entry>
+      <key>Sri Lanka</key>
+      <value>Sri Lanka</value>
+    </entry>
+    <entry>
+      <key>Uruguay</key>
+      <value>Uruguay</value>
+    </entry>
+    <entry>
+      <key>Liberia</key>
+      <value>Liberia</value>
+    </entry>
+    <entry>
+      <key>Burkina Faso</key>
+      <value>Burkina Faso</value>
+    </entry>
+    <entry>
+      <key>Swiss franc</key>
+      <value>Schweizerfranken</value>
+    </entry>
+    <entry>
+      <key>Swaziland</key>
+      <value>Swasiland</value>
+    </entry>
+    <entry>
+      <key>ended</key>
+      <value>abgeschlossen</value>
+    </entry>
+    <entry>
+      <key>Saint Barthélemy</key>
+      <value>Saint Barthélemy</value>
+    </entry>
+    <entry>
+      <key>Wallis and Futuna</key>
+      <value>Wallis und Futuna</value>
+    </entry>
+    <entry>
+      <key>Company_industry knowhow</key>
+      <value>Unternehmen_Branchen KnowHow</value>
+    </entry>
+    <entry>
+      <key>Monaco</key>
+      <value>Monaco</value>
+    </entry>
+    <entry>
+      <key>Spanish</key>
+      <value>Spanisch</value>
+    </entry>
+    <entry>
+      <key>Hungary</key>
+      <value>Ungarn</value>
+    </entry>
+    <entry>
+      <key>Réunion</key>
+      <value>Réunion</value>
+    </entry>
+    <entry>
+      <key>Belarus</key>
+      <value>Weißrussland</value>
+    </entry>
+    <entry>
+      <key>Albania</key>
+      <value>Albanien</value>
+    </entry>
+    <entry>
+      <key>Internal sales manager</key>
+      <value>Interner Vertrieb</value>
+    </entry>
+    <entry>
+      <key>Virgin Islands (U.S.)</key>
+      <value>Jungferninseln (US)</value>
+    </entry>
+    <entry>
+      <key>New Zealand</key>
+      <value>Neuseeland</value>
+    </entry>
+    <entry>
+      <key>Senegal</key>
+      <value>Senegal</value>
+    </entry>
+    <entry>
+      <key>Ethiopia</key>
+      <value>Äthiopien</value>
+    </entry>
+    <entry>
+      <key>Macedonia (the former Yugoslav Republic of)</key>
+      <value>Mazedonien (ehemalige jugoslawische Republik)</value>
+    </entry>
+    <entry>
+      <key>Egypt</key>
+      <value>Ägypten</value>
+    </entry>
+    <entry>
+      <key>Sierra Leone</key>
+      <value>Sierra Leone</value>
+    </entry>
+    <entry>
+      <key>Saudi Arabia</key>
+      <value>Saudi Arabien</value>
+    </entry>
+    <entry>
+      <key>Pakistan</key>
+      <value>Pakistan</value>
+    </entry>
+    <entry>
+      <key>Gambia</key>
+      <value>Gambia</value>
+    </entry>
+    <entry>
+      <key>Qatar</key>
+      <value>Katar</value>
+    </entry>
+    <entry>
+      <key>Slovakia</key>
+      <value>Slowakei</value>
+    </entry>
+    <entry>
+      <key>Serbia</key>
+      <value>Serbien</value>
+    </entry>
+    <entry>
+      <key>Bosnia and Herzegovina</key>
+      <value>Bosnien und Herzegowina</value>
+    </entry>
+    <entry>
+      <key>Framework contract</key>
+      <value>Rahmenvertrag</value>
+    </entry>
+    <entry>
+      <key>Niger</key>
+      <value>Niger</value>
+    </entry>
+    <entry>
+      <key>Rwanda</key>
+      <value>Ruanda</value>
+    </entry>
+    <entry>
+      <key>French Southern Territories</key>
+      <value>Südfranzösische Territorien</value>
+    </entry>
+    <entry>
+      <key>Bangladesh</key>
+      <value>Bangladesch</value>
+    </entry>
+    <entry>
+      <key>Barbados</key>
+      <value>Barbados</value>
+    </entry>
+    <entry>
+      <key>Botswana</key>
+      <value>Botswana</value>
+    </entry>
+    <entry>
+      <key>Saint Vincent and the Grenadines</key>
+      <value>St. Vincent und die Grenadinen</value>
+    </entry>
+    <entry>
+      <key>Denmark</key>
+      <value>Dänemark</value>
+    </entry>
+    <entry>
+      <key>Dominican Republic</key>
+      <value>Dominikanische Republik</value>
+    </entry>
+    <entry>
+      <key>MAL</key>
+    </entry>
+    <entry>
+      <key>SQO</key>
+    </entry>
+    <entry>
+      <key>NQC</key>
+    </entry>
+    <entry>
+      <key>MQL</key>
+    </entry>
+    <entry>
+      <key>SAL</key>
+    </entry>
+    <entry>
+      <key>Checkbox</key>
+      <value>Checkbox</value>
+    </entry>
+    <entry>
+      <key>Numeric value</key>
+      <value>Zahlenwert</value>
+    </entry>
+    <entry>
+      <key>decline</key>
+      <value>Ablehnen</value>
+    </entry>
+    <entry>
+      <key>Text</key>
+    </entry>
+    <entry>
+      <key>Group</key>
+      <value>Gruppe</value>
+    </entry>
+    <entry>
+      <key>Combobox</key>
+      <value>Combobox</value>
+    </entry>
+    <entry>
+      <key>tentative</key>
+      <value>Vorläufig</value>
+    </entry>
+    <entry>
+      <key>${NUMBER}</key>
+      <value>Zahl</value>
+    </entry>
+    <entry>
+      <key>Name \"%0\" already used for container \"%1\"</key>
+    </entry>
+    <entry>
+      <key>CHAR_VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute</key>
+      <value>Schlüsselwort-Eigenschaft</value>
+    </entry>
+    <entry>
+      <key>in</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute Values</key>
+      <value>Schlüsselwort-Eigenschaft-Werte</value>
+    </entry>
+    <entry>
+      <key>Boolean value</key>
+    </entry>
+    <entry>
+      <key>accept</key>
+      <value>akzeptieren</value>
+    </entry>
+    <entry>
+      <key>The ZIP code does not match the format of the country.</key>
+      <value>Die Postleitzahl hat nicht das Format des ausgewählten Landes.</value>
+    </entry>
+    <entry>
+      <key>String value</key>
+      <value>String-Wert</value>
+    </entry>
+    <entry>
+      <key>The code number is not a valid number.</key>
+      <value>The code number is not a valid number.</value>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
+      <value>Der DB-Typ wird in der Funktion %0 nicht unterstützt.</value>
+    </entry>
+    <entry>
+      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
+      <value>Es wird der Funktion %0 keine Produktid übergeben.</value>
+    </entry>
+    <entry>
+      <key>Object type</key>
+      <value>Typ</value>
+    </entry>
+    <entry>
+      <key>Level</key>
+    </entry>
+    <entry>
+      <key>Print Offer</key>
+      <value>Angebot drucken</value>
+    </entry>
+    <entry>
+      <key>relations</key>
+    </entry>
+    <entry>
+      <key>Time</key>
+      <value>Zeit</value>
+    </entry>
+    <entry>
+      <key>New task</key>
+      <value>Neue Aufgabe</value>
+    </entry>
+    <entry>
+      <key>My tasks</key>
+      <value>Meine Aufgaben</value>
+    </entry>
+    <entry>
+      <key>Show my tasks</key>
+      <value>Meine Aufgaben anzeigen</value>
+    </entry>
+    <entry>
+      <key>the specified key has to be unique for that container but does already exist</key>
+    </entry>
+    <entry>
+      <key>Tree Entity</key>
+    </entry>
+    <entry>
+      <key>Add participant to Campaign</key>
+      <value>Kampagnenteilnehmer/in hinzufügen</value>
+    </entry>
+    <entry>
+      <key>Relationtype</key>
+      <value>Beziehungsart</value>
+    </entry>
+    <entry>
+      <key>Tree</key>
+      <value>Baum</value>
+    </entry>
+    <entry>
+      <key>100%</key>
+    </entry>
+    <entry>
+      <key>Mobil</key>
+    </entry>
+    <entry>
+      <key>25%</key>
+    </entry>
+    <entry>
+      <key>50%</key>
+    </entry>
+    <entry>
+      <key>75%</key>
+    </entry>
+    <entry>
+      <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
+    </entry>
+    <entry>
+      <key>competitor</key>
+      <value>Mitbewerber</value>
+    </entry>
+    <entry>
+      <key>0%</key>
+    </entry>
+    <entry>
+      <key>acquainted with</key>
+      <value>Bekannt mit</value>
+    </entry>
+    <entry>
+      <key>collaboration with</key>
+      <value>Zusammenarbeit mit</value>
+    </entry>
+    <entry>
+      <key>parent company</key>
+      <value>Konzernmutter</value>
+    </entry>
+    <entry>
+      <key>society</key>
+      <value>Verband</value>
+    </entry>
+    <entry>
+      <key>ankle of</key>
+      <value>Enkel/in von</value>
+    </entry>
+    <entry>
+      <key>solicits</key>
+      <value>Bewirbt</value>
+    </entry>
+    <entry>
+      <key>supervisor of</key>
+      <value>Vorgesetzter von</value>
+    </entry>
+    <entry>
+      <key>reports to</key>
+      <value>Berichtet an</value>
+    </entry>
+    <entry>
+      <key>subsidiary</key>
+      <value>Tochtergesellschaft</value>
+    </entry>
+    <entry>
+      <key>supported by</key>
+      <value>Wird unterstützt von</value>
+    </entry>
+    <entry>
+      <key>member</key>
+      <value>Mitglied</value>
+    </entry>
+    <entry>
+      <key>promotion target of</key>
+      <value>Werbezielgruppe von</value>
+    </entry>
+    <entry>
+      <key>supports</key>
+      <value>Unterstützt</value>
+    </entry>
+    <entry>
+      <key>parent of</key>
+      <value>Elternteil von</value>
+    </entry>
+    <entry>
+      <key>grandparents of</key>
+      <value>Großeltern von</value>
+    </entry>
+    <entry>
+      <key>Memo</key>
+      <value>Memo</value>
+    </entry>
+    <entry>
+      <key>Function</key>
+      <value>Funktion</value>
+    </entry>
+    <entry>
+      <key>Username already exists!</key>
+      <value>Der Benutzername existiert bereits!</value>
+    </entry>
+    <entry>
+      <key>Relational</key>
+    </entry>
+    <entry>
+      <key>Only numbers are allowed.</key>
+      <value>Es sind nur Zahlen erlaubt.</value>
+    </entry>
+    <entry>
+      <key>MQC</key>
+    </entry>
+    <entry>
+      <key>Datei</key>
+    </entry>
+    <entry>
+      <key>Japan</key>
+      <value>Japan</value>
+    </entry>
+    <entry>
+      <key>7 days net</key>
+      <value>7 Tage netto</value>
+    </entry>
+    <entry>
+      <key>carriage free</key>
+      <value>frei Haus</value>
+    </entry>
+    <entry>
+      <key>Relation tree</key>
+      <value>Beziehungsbaum</value>
+    </entry>
+    <entry>
+      <key>8 days 2% discount, 30 days net</key>
+      <value>8 Tage 2% Skonto, 30 Tage netto</value>
+    </entry>
+    <entry>
+      <key>CIF</key>
+    </entry>
+    <entry>
+      <key>ex works</key>
+      <value>ab Werk</value>
+    </entry>
+    <entry>
+      <key>Payment term</key>
+      <value>Zahlungsbedingung</value>
+    </entry>
+    <entry>
+      <key>30 days net</key>
+      <value>30 Tage netto</value>
+    </entry>
+    <entry>
+      <key>Contactrole</key>
+      <value>Funktion</value>
+    </entry>
+    <entry>
+      <key>Object tree</key>
+      <value>Beziehungen</value>
+    </entry>
+    <entry>
+      <key>&amp;Aufg / Term (%0/%1)</key>
+    </entry>
+    <entry>
+      <key>Verschieben auf Datum?</key>
+    </entry>
+    <entry>
+      <key>niedrig</key>
+    </entry>
+    <entry>
+      <key>Gebucht</key>
+    </entry>
+    <entry>
+      <key>Other Contactroles</key>
+      <value>Weitere Funktionen</value>
+    </entry>
+    <entry>
+      <key>Bitte Datumseingabe prüfen!</key>
+    </entry>
+    <entry>
+      <key>In Bearbeitung</key>
+    </entry>
+    <entry>
+      <key>OK</key>
+    </entry>
+    <entry>
+      <key>Nicht begonnen</key>
+    </entry>
+    <entry>
+      <key>Bitte Filterbedingungen setzen</key>
+    </entry>
+    <entry>
+      <key>Bestätigt</key>
+    </entry>
+    <entry>
+      <key>True</key>
+      <value>Ja</value>
+    </entry>
+    <entry>
+      <key>Vorläufig</key>
+    </entry>
+    <entry>
+      <key>keine</key>
+    </entry>
+    <entry>
+      <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+    </entry>
+    <entry>
+      <key>Aufgaben von</key>
+    </entry>
+    <entry>
+      <key>&amp;Aufgaben (%0)</key>
+    </entry>
+    <entry>
+      <key>erledigt / zurückgestellt</key>
+    </entry>
+    <entry>
+      <key>hoch</key>
+    </entry>
+    <entry>
+      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+    </entry>
+    <entry>
+      <key>Zurückgestellt</key>
+    </entry>
+    <entry>
+      <key>Erledigt</key>
+    </entry>
+    <entry>
+      <key>Usages</key>
+    </entry>
+    <entry>
+      <key>Abgesagt</key>
+    </entry>
+    <entry>
+      <key>Außer Haus</key>
+    </entry>
+    <entry>
+      <key>Abbrechen</key>
+    </entry>
+    <entry>
+      <key>Benutzer auswählen</key>
+    </entry>
+    <entry>
+      <key>delegiert</key>
+    </entry>
+    <entry>
+      <key>frei</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+    </entry>
+    <entry>
+      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+    </entry>
+    <entry>
+      <key>Username</key>
+      <value>Benutzername</value>
+    </entry>
+    <entry>
+      <key>normal</key>
+    </entry>
+    <entry>
+      <key>Termine von</key>
+    </entry>
+    <entry>
+      <key>nur Verschiebung in die Zukunft erlaubt!</key>
+    </entry>
+    <entry>
+      <key>Kategorie</key>
+    </entry>
+    <entry>
+      <key>Product content</key>
+      <value>Produktinhalt</value>
+    </entry>
+    <entry>
+      <key>Know How</key>
+      <value>Know How</value>
+    </entry>
+    <entry>
+      <key>Personal appearance</key>
+      <value>Persönliches Auftreten</value>
+    </entry>
+    <entry>
+      <key>Market situation</key>
+      <value>Marktsituation</value>
+    </entry>
+    <entry>
+      <key>Liquidity</key>
+      <value>Liquidität</value>
+    </entry>
+    <entry>
+      <key>Price policy</key>
+      <value>Preispolitik</value>
+    </entry>
+    <entry>
+      <key>VAT in %</key>
+      <value>UmsSt. in %</value>
+    </entry>
+    <entry>
+      <key>Time in minutes</key>
+      <value>Zeit in Minuten</value>
+    </entry>
+    <entry>
+      <key>Sales manager</key>
+      <value>Vertriebsleiter</value>
+    </entry>
+    <entry>
+      <key>IT</key>
+    </entry>
+    <entry>
+      <key>Administrator</key>
+    </entry>
+    <entry>
+      <key>Managing director</key>
+      <value>Geschäftsführer</value>
+    </entry>
+    <entry>
+      <key>Production manager</key>
+      <value>Produktionsleiter</value>
+    </entry>
+    <entry>
+      <key>Production</key>
+      <value>Produktion</value>
+    </entry>
+    <entry>
+      <key>CEO</key>
+    </entry>
+    <entry>
+      <key>Purchasing manager</key>
+      <value>Einkaufsleiter</value>
+    </entry>
+    <entry>
+      <key>Marketing manager</key>
+      <value>Marketingleiter</value>
+    </entry>
+    <entry>
+      <key>IT manager</key>
+      <value>IT-Leiter</value>
+    </entry>
+    <entry>
+      <key>Marketing</key>
+    </entry>
+    <entry>
+      <key>CSO</key>
+    </entry>
+    <entry>
+      <key>Executive board</key>
+      <value>Vorstand</value>
+    </entry>
+    <entry>
+      <key>Supervisory board</key>
+      <value>Aufsichtsrat</value>
+    </entry>
+    <entry>
+      <key>Management</key>
+    </entry>
+    <entry>
+      <key>Manufacturer</key>
+      <value>Hersteller</value>
+    </entry>
+    <entry>
+      <key>Prospective customer</key>
+      <value>Potenzieller Kunde</value>
+    </entry>
+    <entry>
+      <key>Competitor</key>
+      <value>Mitbewerber</value>
+    </entry>
+    <entry>
+      <key>Partner</key>
+      <value>Partner</value>
+    </entry>
+    <entry>
+      <key>Protected</key>
+      <value>Geschützt</value>
+    </entry>
+    <entry>
+      <key>false</key>
+    </entry>
+    <entry>
+      <key>true</key>
+    </entry>
+    <entry>
+      <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
+      <value>%0 muss zwischen %2 und %3 sein.</value>
+    </entry>
+    <entry>
+      <key>Email</key>
+      <value>E-Mail</value>
+    </entry>
+    <entry>
+      <key>{$OBJECTLINK_TYPE}</key>
+      <value>Art</value>
+    </entry>
+    <entry>
+      <key>{$OBJECTLINK_OBJECT}</key>
+      <value>Objekt</value>
+    </entry>
+    <entry>
+      <key>Password and confirmation must be the same!</key>
+      <value>Die Passwörter stimmen nicht überein!</value>
+    </entry>
+    <entry>
+      <key>Begin</key>
+      <value>Beginn</value>
+    </entry>
+    <entry>
+      <key>Maturity</key>
+      <value>Fällig</value>
+    </entry>
+    <entry>
+      <key>This private person doeas already exist and can not be created once more.</key>
+      <value>Diese Privatperson existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
+    </entry>
+    <entry>
+      <key>The title already exists!</key>
+    </entry>
+    <entry>
+      <key>Human resources</key>
+    </entry>
+    <entry>
+      <key>Note</key>
+    </entry>
+    <entry>
+      <key>Project Management</key>
+    </entry>
+    <entry>
+      <key>Support</key>
+    </entry>
+    <entry>
+      <key>{$ADDRESS_IDENTIFIER}</key>
+      <value>Bezeichnung</value>
+    </entry>
+    <entry>
+      <key>Turnover actual year</key>
+      <value>Umsatz aktuelles Jahr</value>
+    </entry>
+    <entry>
+      <key>Forecast actual year</key>
+      <value>Forecast aktuelles Jahr</value>
+    </entry>
+    <entry>
+      <key>Salesproject Phases</key>
+    </entry>
+    <entry>
+      <key>Objectrelation type</key>
+      <value>Beziehungstyp</value>
+    </entry>
+    <entry>
+      <key>Kennzahlen</key>
+    </entry>
+    <entry>
+      <key>Count</key>
+    </entry>
+    <entry>
+      <key>Forecast actual year </key>
+    </entry>
+    <entry>
+      <key>Chart</key>
+    </entry>
+    <entry>
+      <key>Salesproject Charts</key>
+    </entry>
+    <entry>
+      <key>Relation</key>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+    </entry>
+    <entry>
+      <key>Object type 1</key>
+      <value>Typ 1</value>
+    </entry>
+    <entry>
+      <key>Object type 2</key>
+      <value>Typ 2</value>
+    </entry>
+    <entry>
+      <key>Title 1</key>
+      <value>Titel 1</value>
+    </entry>
+    <entry>
+      <key>Title 2</key>
+      <value>Titel 2</value>
+    </entry>
+    <entry>
+      <key>Hierarchy</key>
+      <value>Hierarchie</value>
+    </entry>
+    <entry>
+      <key>Object relation</key>
+      <value>Beziehungen</value>
+    </entry>
+    <entry>
+      <key>Type 2 enabled</key>
+      <value>Typ 2 aktiviert</value>
+    </entry>
+    <entry>
+      <key>Relation type 1</key>
+      <value>Beziehungsart 1</value>
+    </entry>
+    <entry>
+      <key>Relation type 2</key>
+      <value>Beziehungsart 2</value>
+    </entry>
+    <entry>
+      <key>Relation type</key>
+      <value>Beziehungstyp</value>
+    </entry>
+    <entry>
+      <key>Context 1</key>
+      <value>Context 1</value>
+    </entry>
+    <entry>
+      <key>Context 2</key>
+      <value>Context 2</value>
+    </entry>
+    <entry>
+      <key>Tochter</key>
+    </entry>
+    <entry>
+      <key>Delete all usage</key>
+      <value>Lösche jede Verwendung</value>
+    </entry>
+    <entry>
+      <key>Deleted all usages of \"%0\".</key>
+      <value>Jede Verwendung von \"%0\" wurde gelöscht.</value>
+    </entry>
+    <entry>
+      <key>promotion target ofc</key>
+    </entry>
+    <entry>
+      <key>Successful</key>
+    </entry>
+    <entry>
+      <key>Enable relation type 2</key>
+      <value>Beziehungsart 2 aktiv</value>
+    </entry>
+    <entry>
+      <key>Salesproject Analyses</key>
+    </entry>
+    <entry>
+      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+    </entry>
+    <entry>
+      <key>Days count</key>
+      <value>Anzahl Tage</value>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to '%0'?</key>
+      <value>Forecast löschen und status auf '%0' setzen?</value>
+    </entry>
+    <entry>
+      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
+      <value>Möchten Sie wirklich den Forecast löschen und den status auf '%0' setzen?</value>
+    </entry>
+    <entry>
+      <key>This cannot be undone!</key>
+      <value>Das kann nicht rückgängig gemacht werden!</value>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>[%0]the tableName is not a string after interpreting</key>
+    </entry>
+    <entry>
+      <key>[%0]%1 has to be a string or array but it is %2</key>
+    </entry>
+    <entry>
+      <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+    </entry>
+    <entry>
+      <key>[%0]the columnName is not a string after interpreting</key>
+    </entry>
+    <entry>
+      <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+    </entry>
+    <entry>
+      <key>Responsible</key>
+      <value>Verantwortlich</value>
+    </entry>
+    <entry>
+      <key>Analyses</key>
+    </entry>
+    <entry>
+      <key>Imminent appointments for today </key>
+    </entry>
+    <entry>
+      <key>Variable costs</key>
+      <value>Variable Kosten</value>
+    </entry>
+    <entry>
+      <key>To-Do</key>
+    </entry>
+    <entry>
+      <key>My Tasks</key>
+    </entry>
+    <entry>
+      <key>Calendar</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
+      <value>Der Wert für das Feld %0 ist undefined.</value>
+    </entry>
+    <entry>
+      <key>MyTasks</key>
+    </entry>
+    <entry>
+      <key>Approved</key>
+      <value>Freigegeben</value>
+    </entry>
+    <entry>
+      <key>Completed</key>
+      <value>Abgeschlossen</value>
+    </entry>
+    <entry>
+      <key>In planning</key>
+      <value>In Planung</value>
+    </entry>
+    <entry>
+      <key>Auswertung</key>
+    </entry>
+    <entry>
+      <key>Reihenfolge</key>
+    </entry>
+    <entry>
+      <key>Zuständiger</key>
+    </entry>
+    <entry>
+      <key>Schritte</key>
+    </entry>
+    <entry>
+      <key>Teilnehmer</key>
+    </entry>
+    <entry>
+      <key>Kampagnen Schritte</key>
+    </entry>
+    <entry>
+      <key>Kampagnenschritte</key>
+    </entry>
+    <entry>
+      <key>Die maximale Anzahl Teilnehmer ist erreicht!</key>
+    </entry>
+    <entry>
+      <key>Neuer Kampagnenschritt</key>
+    </entry>
+    <entry>
+      <key>Kontakteasdasd</key>
+    </entry>
+    <entry>
+      <key>Ende</key>
+    </entry>
+    <entry>
+      <key>Neue Kampagne</key>
+    </entry>
+    <entry>
+      <key>Beginn</key>
+    </entry>
+    <entry>
+      <key>protected</key>
+    </entry>
+    <entry>
+      <key>Added</key>
+      <value>Hinzugefügt</value>
+    </entry>
+    <entry>
+      <key>Current participants</key>
+      <value>Aktuelle Teilnehmer</value>
+    </entry>
+    <entry>
+      <key>Kampagnenzeitraum</key>
+    </entry>
+    <entry>
+      <key>Hauptverantw.</key>
+    </entry>
+    <entry>
+      <key>New campaign step</key>
+    </entry>
+    <entry>
+      <key>Cost</key>
+      <value>Kosten</value>
+    </entry>
+    <entry>
+      <key>file '%0' cannot be read</key>
+    </entry>
+    <entry>
+      <key>Campaign costs</key>
+      <value>Kampagnen Kosten</value>
+    </entry>
+    <entry>
+      <key>Importer</key>
+    </entry>
+    <entry>
+      <key>Participant</key>
+      <value>Teilnehmer/in</value>
+    </entry>
+    <entry>
+      <key>Printing costs</key>
+      <value>Druckkosten</value>
+    </entry>
+    <entry>
+      <key>Shipping costs</key>
+      <value>Porto</value>
+    </entry>
+    <entry>
+      <key>yyyy-MM-dd HH:mm:ss</key>
+    </entry>
+    <entry>
+      <key>file '%0' does not exist or you have got no permission on this file</key>
+    </entry>
+    <entry>
+      <key>Zip</key>
+    </entry>
+    <entry>
+      <key>Add to campaign</key>
+    </entry>
+    <entry>
+      <key>Layout costs</key>
+      <value>Layout</value>
+    </entry>
+    <entry>
+      <key>Serial</key>
+      <value>Serie </value>
+    </entry>
+    <entry>
+      <key>Costs</key>
+      <value>Kosten</value>
+    </entry>
+    <entry>
+      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+      <value>Webservice nicht erreichbar. URL: %0 %1</value>
+    </entry>
+    <entry>
+      <key>Step</key>
+      <value>Stufe</value>
+    </entry>
+    <entry>
+      <key>Fix cost</key>
+      <value>Fixkosten</value>
+    </entry>
+    <entry>
+      <key>per</key>
+      <value>pro</value>
+    </entry>
+    <entry>
+      <key>The max participants count has to be equal or greater than the count of the current participants!</key>
+      <value>Die maximale Teilnehmerzahl muss gleich oder größer der aktuellen Teilnehmerzahl sein!</value>
+    </entry>
+    <entry>
+      <key>Version number</key>
+    </entry>
+    <entry>
+      <key>Id value</key>
+    </entry>
+    <entry>
+      <key>Order executed</key>
+    </entry>
+    <entry>
+      <key>Liquibase</key>
+    </entry>
+    <entry>
+      <key>Number value</key>
+    </entry>
+    <entry>
+      <key>Author</key>
+    </entry>
+    <entry>
+      <key>Position Id</key>
+    </entry>
+    <entry>
+      <key>ISO3</key>
+    </entry>
+    <entry>
+      <key>ISO2</key>
+    </entry>
+    <entry>
+      <key>Communication Id</key>
+    </entry>
+    <entry>
+      <key>Attribute Id</key>
+    </entry>
+    <entry>
+      <key>Modification user</key>
+    </entry>
+    <entry>
+      <key>Headline</key>
+    </entry>
+    <entry>
+      <key>Salesorder Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject milestone Id</key>
+    </entry>
+    <entry>
+      <key>Appointment Id</key>
+    </entry>
+    <entry>
+      <key>Locked</key>
+    </entry>
+    <entry>
+      <key>Timetracking Id</key>
+    </entry>
+    <entry>
+      <key>Salesorder date</key>
+    </entry>
+    <entry>
+      <key>Exec type</key>
+    </entry>
+    <entry>
+      <key>Date value</key>
+    </entry>
+    <entry>
+      <key>NUMBER VALUE</key>
+    </entry>
+    <entry>
+      <key>Salesproject forecast Id</key>
+    </entry>
+    <entry>
+      <key>ID</key>
+    </entry>
+    <entry>
+      <key>Keyword attribute relation Id</key>
+    </entry>
+    <entry>
+      <key>Minimal count</key>
+    </entry>
+    <entry>
+      <key>Id</key>
+    </entry>
+    <entry>
+      <key>Start date</key>
+    </entry>
+    <entry>
+      <key>Object 1 row Id</key>
+    </entry>
+    <entry>
+      <key>Side</key>
+    </entry>
+    <entry>
+      <key>Salesproject Id</key>
+    </entry>
+    <entry>
+      <key>Product Id</key>
+    </entry>
+    <entry>
+      <key>Sort</key>
+    </entry>
+    <entry>
+      <key>Relation Title</key>
+    </entry>
+    <entry>
+      <key>%0 \"%1\"</key>
+    </entry>
+    <entry>
+      <key>Maximal count</key>
+    </entry>
+    <entry>
+      <key>Data executed</key>
+    </entry>
+    <entry>
+      <key>Indexsearch</key>
+    </entry>
+    <entry>
+      <key>Appointment link Id</key>
+    </entry>
+    <entry>
+      <key>Relation Type</key>
+    </entry>
+    <entry>
+      <key>Salesproject member Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject source Id</key>
+    </entry>
+    <entry>
+      <key>Item sort</key>
+    </entry>
+    <entry>
+      <key>%0 modified.</key>
+      <value>%0 geändert.</value>
+    </entry>
+    <entry>
+      <key>Contract Id</key>
+    </entry>
+    <entry>
+      <key>Int value</key>
+    </entry>
+    <entry>
+      <key>Object 2 row Id</key>
+    </entry>
+    <entry>
+      <key>Source tablename Id</key>
+    </entry>
+    <entry>
+      <key>Source tablename</key>
+    </entry>
+    <entry>
+      <key>Contact Id</key>
+    </entry>
+    <entry>
+      <key>Sales area</key>
+    </entry>
+    <entry>
+      <key>Parent Id</key>
+    </entry>
+    <entry>
+      <key>Task link Id</key>
+    </entry>
+    <entry>
+      <key>Protection level</key>
+    </entry>
+    <entry>
+      <key>Salesorder code</key>
+    </entry>
+    <entry>
+      <key>Class</key>
+    </entry>
+    <entry>
+      <key>BOOL VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword attribute Id</key>
+    </entry>
+    <entry>
+      <key>Log type</key>
+    </entry>
+    <entry>
+      <key>Object row Id</key>
+    </entry>
+    <entry>
+      <key>Labels</key>
+    </entry>
+    <entry>
+      <key>%0 deleted.</key>
+      <value>%0 gelöscht.</value>
+    </entry>
+    <entry>
+      <key>Salesproject competition Id</key>
+    </entry>
+    <entry>
+      <key>Activity Id</key>
+    </entry>
+    <entry>
+      <key>Person Id</key>
+    </entry>
+    <entry>
+      <key>Offer item Id</key>
+    </entry>
+    <entry>
+      <key>Offer Id</key>
+    </entry>
+    <entry>
+      <key>Name native</key>
+    </entry>
+    <entry>
+      <key>Flag</key>
+    </entry>
+    <entry>
+      <key>SEEN</key>
+      <value>Neu</value>
+    </entry>
+    <entry>
+      <key>Address Id</key>
+    </entry>
+    <entry>
+      <key>Name latin</key>
+    </entry>
+    <entry>
+      <key>Destination Id</key>
+    </entry>
+    <entry>
+      <key>Sex</key>
+    </entry>
+    <entry>
+      <key>Product price Id</key>
+    </entry>
+    <entry>
+      <key>%0 added.</key>
+      <value>%0 eingefügt.</value>
+    </entry>
+    <entry>
+      <key>Object Relation Type</key>
+    </entry>
+    <entry>
+      <key>Entry date</key>
+    </entry>
+    <entry>
+      <key>Object relation type 2</key>
+    </entry>
+    <entry>
+      <key>Object relation type 1</key>
+    </entry>
+    <entry>
+      <key>Modification date</key>
+    </entry>
+    <entry>
+      <key>Object Type</key>
+    </entry>
+    <entry>
+      <key>%0 from \"%1\" to \"%2\"</key>
+      <value>%0 von \"%1\" auf \"%2\"</value>
+    </entry>
+    <entry>
+      <key>MD5 Sum</key>
+    </entry>
+    <entry>
+      <key>Letter salutation</key>
+    </entry>
+    <entry>
+      <key>Lock granted</key>
+    </entry>
+    <entry>
+      <key>Required fields</key>
+    </entry>
+    <entry>
+      <key>Address addition</key>
+    </entry>
+    <entry>
+      <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
+    </entry>
+    <entry>
+      <key>Attribute usage Id</key>
+    </entry>
+    <entry>
+      <key>LogHistory</key>
+    </entry>
+    <entry>
+      <key>Locked by</key>
+    </entry>
+    <entry>
+      <key>Desciption</key>
+    </entry>
+    <entry>
+      <key>Salutation Id</key>
+    </entry>
+    <entry>
+      <key>Comments</key>
+    </entry>
+    <entry>
+      <key>Task Id</key>
+    </entry>
+    <entry>
+      <key>Valid to</key>
+    </entry>
+    <entry>
+      <key>ZIP regex</key>
+    </entry>
+    <entry>
+      <key>Keyword entry Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject classification Id</key>
+    </entry>
+    <entry>
+      <key>Stop costs</key>
+    </entry>
+    <entry>
+      <key>Contexts</key>
+    </entry>
+    <entry>
+      <key>Assigned to</key>
+    </entry>
+    <entry>
+      <key>%0 from \"%1\" to %2 \"%3\"</key>
+      <value>%0 von \"%1\" auf %2 \"%3\"</value>
+    </entry>
+    <entry>
+      <key>Date start</key>
+    </entry>
+    <entry>
+      <key>Cover Letter</key>
+    </entry>
+    <entry>
+      <key>Deployment Id</key>
+    </entry>
+    <entry>
+      <key>Address format</key>
+    </entry>
+    <entry>
+      <key>Activity link Id</key>
+    </entry>
+    <entry>
+      <key>Date end</key>
+    </entry>
+    <entry>
+      <key>Creation user</key>
+    </entry>
+    <entry>
+      <key>Unit Price</key>
+    </entry>
+    <entry>
+      <key>Object Id</key>
+    </entry>
+    <entry>
+      <key>Is active</key>
+    </entry>
+    <entry>
+      <key>Product relationship</key>
+    </entry>
+    <entry>
+      <key>Salesorder item Id</key>
+    </entry>
+    <entry>
+      <key>Char value</key>
+    </entry>
+    <entry>
+      <key>Attribute relation Id</key>
+    </entry>
+    <entry>
+      <key>Tag</key>
+    </entry>
+    <entry>
+      <key>Title suffix</key>
+    </entry>
+    <entry>
+      <key>Step costs</key>
+    </entry>
+    <entry>
+      <key>Min. Stock</key>
+    </entry>
+    <entry>
+      <key>User</key>
+      <value>Benutzer</value>
+    </entry>
+    <entry>
+      <key>Stock Id</key>
+    </entry>
+    <entry>
+      <key>Tablename</key>
+    </entry>
+    <entry>
+      <key>CHAR VALUE</key>
+    </entry>
+    <entry>
+      <key>Parent context</key>
+    </entry>
+    <entry>
+      <key>Organisation Id</key>
+    </entry>
+    <entry>
+      <key>Tablename Id</key>
+    </entry>
+    <entry>
+      <key>Offer date</key>
+    </entry>
+    <entry>
+      <key>Termin</key>
+    </entry>
+    <entry>
+      <key>rebuild Index</key>
+    </entry>
+    <entry>
+      <key>Charts</key>
+    </entry>
+    <entry>
+      <key>Keywords</key>
+    </entry>
+    <entry>
+      <key>Days running</key>
+      <value>Tage laufend</value>
+    </entry>
+    <entry>
+      <key>Logs</key>
+    </entry>
+    <entry>
+      <key>Mail</key>
+    </entry>
+    <entry>
+      <key>Phonecall</key>
+    </entry>
+    <entry>
+      <key>Chart 2</key>
+    </entry>
+    <entry>
+      <key>Log</key>
+    </entry>
+    <entry>
+      <key>Offer Header Text</key>
+      <value>Angebot Kopftext</value>
+    </entry>
+    <entry>
+      <key>Employees</key>
+    </entry>
+    <entry>
+      <key>Todo</key>
+    </entry>
+    <entry>
+      <key>Days remaining</key>
+      <value>Tage verbleibend</value>
+    </entry>
+    <entry>
+      <key>Offer Footer Text</key>
+      <value>Angebot Fußtext</value>
+    </entry>
+    <entry>
+      <key>Date new</key>
+    </entry>
+    <entry>
+      <key>Date edit</key>
+    </entry>
+    <entry>
+      <key>Keyword Attributes</key>
+    </entry>
+    <entry>
+      <key>HTML</key>
+    </entry>
+    <entry>
+      <key>Student/Internship</key>
+      <value>Student/Praktikant</value>
+    </entry>
+    <entry>
+      <key>Food</key>
+      <value>Lebensmittel</value>
+    </entry>
+    <entry>
+      <key>200 to 349T</key>
+      <value>200 bis 349T</value>
+    </entry>
+    <entry>
+      <key>Within 6 months</key>
+      <value>Innerhalb 6 Monaten</value>
+    </entry>
+    <entry>
+      <key>No project planned</key>
+      <value>Kein Projekt geplant</value>
+    </entry>
+    <entry>
+      <key>Logistics</key>
+      <value>Logistik</value>
+    </entry>
+    <entry>
+      <key>Skilled workers</key>
+      <value>Fachkräfte</value>
+    </entry>
+    <entry>
+      <key>Purchasing</key>
+      <value>Einkauf</value>
+    </entry>
+    <entry>
+      <key>Rate</key>
+      <value>Bewerten</value>
+    </entry>
+    <entry>
+      <key>Choice</key>
+      <value>Auswahl</value>
+    </entry>
+    <entry>
+      <key>points</key>
+      <value>Punkte</value>
+    </entry>
+    <entry>
+      <key>Education</key>
+      <value>Bildung</value>
+    </entry>
+    <entry>
+      <key>Public</key>
+      <value>Öffentlich</value>
+    </entry>
+    <entry>
+      <key>Building and construction suppliers</key>
+      <value>Bau- und Bauzulieferer</value>
+    </entry>
+    <entry>
+      <key>0 to 49</key>
+      <value>0 bis 49</value>
+    </entry>
+    <entry>
+      <key>0 to 49T</key>
+      <value>0 bis 49T</value>
+    </entry>
+    <entry>
+      <key>CRM Manager</key>
+      <value>Leiter CRM</value>
+    </entry>
+    <entry>
+      <key>50 to 99T</key>
+      <value>50 bis 99T</value>
+    </entry>
+    <entry>
+      <key>Search</key>
+      <value>Suchen</value>
+    </entry>
+    <entry>
+      <key>Counsellor</key>
+      <value>Berater</value>
+    </entry>
+    <entry>
+      <key>50 to 100</key>
+      <value>50 bis 100</value>
+    </entry>
+    <entry>
+      <key>OnPremise</key>
+      <value>OnPremise</value>
+    </entry>
+    <entry>
+      <key>Head of IT</key>
+      <value>Leiter IT</value>
+    </entry>
+    <entry>
+      <key>Electric</key>
+      <value>Elektro</value>
+    </entry>
+    <entry>
+      <key>from 1,000</key>
+      <value>ab 1.000</value>
+    </entry>
+    <entry>
+      <key>Publishing house</key>
+      <value>Verlag</value>
+    </entry>
+    <entry>
+      <key>100 to 199T</key>
+      <value>100 bis 199T</value>
+    </entry>
+    <entry>
+      <key>101 to 250</key>
+      <value>101 bis 250</value>
+    </entry>
+    <entry>
+      <key>Overarching</key>
+      <value>Ãœbergreifend</value>
+    </entry>
+    <entry>
+      <key>Energy</key>
+      <value>Energie</value>
+    </entry>
+    <entry>
+      <key>Machinery and equipment</key>
+      <value>Maschinen und Anlagen</value>
+    </entry>
+    <entry>
+      <key>Trade</key>
+      <value>Handel</value>
+    </entry>
+    <entry>
+      <key>Consultation</key>
+      <value>Beratung</value>
+    </entry>
+    <entry>
+      <key>Cloud</key>
+      <value>Cloud</value>
+    </entry>
+    <entry>
+      <key>No date yet</key>
+      <value>Noch kein Termin</value>
+    </entry>
+    <entry>
+      <key>Classifications</key>
+      <value>Klassifizierungen</value>
+    </entry>
+    <entry>
+      <key>Service Manager</key>
+      <value>Leiter Service</value>
+    </entry>
+    <entry>
+      <key>Lifesience</key>
+      <value>Lifesience</value>
+    </entry>
+    <entry>
+      <key>Automotive</key>
+      <value>Automotive</value>
+    </entry>
+    <entry>
+      <key>Lottery</key>
+      <value>Lotterie</value>
+    </entry>
+    <entry>
+      <key>from 350T</key>
+      <value>ab 350T</value>
+    </entry>
+    <entry>
+      <key>Management/Sales Manager</key>
+      <value>GF/Leiter Vertrieb</value>
+    </entry>
+    <entry>
+      <key>Environment</key>
+      <value>Umwelt</value>
+    </entry>
+    <entry>
+      <key>Within 12 months</key>
+      <value>Innerhalb 12 Monaten</value>
+    </entry>
+    <entry>
+      <key>Finance</key>
+      <value>Finanz</value>
+    </entry>
+    <entry>
+      <key>ScoreProjectStart</key>
+      <value>Projektstart</value>
+    </entry>
+    <entry>
+      <key>ScoreStandard</key>
+      <value>Standard</value>
+    </entry>
+    <entry>
+      <key>ScoreCustomizing</key>
+      <value>Eigenentwicklung</value>
+    </entry>
+    <entry>
+      <key>ScoreDecisionPhase</key>
+      <value>Entscheidungsphase</value>
+    </entry>
+    <entry>
+      <key>ScoreUsers</key>
+      <value>Anzahl Anwender</value>
+    </entry>
+    <entry>
+      <key>ScoreBranch</key>
+      <value>Branche</value>
+    </entry>
+    <entry>
+      <key>ScorePosition</key>
+      <value>Position</value>
+    </entry>
+    <entry>
+      <key>ScoreBudget</key>
+      <value>Projektbudget</value>
+    </entry>
+    <entry>
+      <key>ScoreDepartment</key>
+      <value>Einsatzbereich</value>
+    </entry>
+    <entry>
+      <key>ScoreCloud</key>
+      <value>Betriebsmodel</value>
+    </entry>
+    <entry>
+      <key>ScoreBased</key>
+      <value>Unternehmenssitz</value>
+    </entry>
+    <entry>
+      <key>dfssdfsdf</key>
+    </entry>
+    <entry>
+      <key>Score</key>
+    </entry>
+    <entry>
+      <key>Scoretype</key>
+      <value>Bewertungstyp</value>
+    </entry>
+    <entry>
+      <key>${NUMBER_FORMAT_NEEDED}</key>
+      <value>Es wird eine Zahl erwartet.</value>
+    </entry>
+    <entry>
+      <key>Classification number</key>
+      <value>Klassifizierungsnummer</value>
+    </entry>
+    <entry>
+      <key>Possible values</key>
+      <value>Mögliche Werte</value>
+    </entry>
+    <entry>
+      <key>ARCHIEVED</key>
+    </entry>
+    <entry>
+      <key>${HIGHER_THAN_MAX} max: %0</key>
+      <value>Der eingegebene Wert ist über dem Maximalwert %0.</value>
+    </entry>
+    <entry>
+      <key>Rating</key>
+      <value>Bewertung</value>
+    </entry>
+    <entry>
+      <key>sum</key>
+      <value>Summe</value>
+    </entry>
+    <entry>
+      <key>A: 75 &lt; </key>
+    </entry>
+    <entry>
+      <key>Possible Values</key>
+    </entry>
+    <entry>
+      <key>251 to 1,000</key>
+    </entry>
+    <entry>
+      <key>${SCORETYPE_ALREADY_EXISTS}</key>
+    </entry>
+    <entry>
+      <key>Selection</key>
+      <value>Auswahl</value>
+    </entry>
+    <entry>
+      <key>Files</key>
+      <value>Dateien</value>
+    </entry>
+    <entry>
+      <key>Dateien</key>
+    </entry>
+  </keyValueMap>
+  <font name="Dialog" style="0" size="11" />
+</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 7280e3678b4d839ef25c5f33f49df6cad5b48b91..6e1aa23643de1307711be9d1bef03ee9b9cdaf9d 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1,3637 +1,3884 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<language 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/language/1.2.0">
-  <name>_____LANGUAGE_en</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <language>en</language>
-  <country></country>
-  <variant></variant>
-  <keyValueMap>
-    <entry>
-      <key>Company</key>
-    </entry>
-    <entry>
-      <key>E-Mail</key>
-    </entry>
-    <entry>
-      <key>Male</key>
-    </entry>
-    <entry>
-      <key>Activity</key>
-    </entry>
-    <entry>
-      <key>Name</key>
-    </entry>
-    <entry>
-      <key>Austria</key>
-    </entry>
-    <entry>
-      <key>Customercode</key>
-    </entry>
-    <entry>
-      <key>Status</key>
-    </entry>
-    <entry>
-      <key>Active</key>
-    </entry>
-    <entry>
-      <key>Medium</key>
-    </entry>
-    <entry>
-      <key>Internet</key>
-    </entry>
-    <entry>
-      <key>Germany</key>
-    </entry>
-    <entry>
-      <key>Online-Meeting</key>
-    </entry>
-    <entry>
-      <key>Social Media</key>
-    </entry>
-    <entry>
-      <key>Visit</key>
-    </entry>
-    <entry>
-      <key>Information</key>
-    </entry>
-    <entry>
-      <key>Print Offer</key>
-    </entry>
-    <entry>
-      <key>Language</key>
-    </entry>
-    <entry>
-      <key>Phone</key>
-    </entry>
-    <entry>
-      <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
-    </entry>
-    <entry>
-      <key>Activities</key>
-    </entry>
-    <entry>
-      <key>Female</key>
-    </entry>
-    <entry>
-      <key>Contactmanagement</key>
-    </entry>
-    <entry>
-      <key>Mobile</key>
-    </entry>
-    <entry>
-      <key>Office address</key>
-    </entry>
-    <entry>
-      <key>Contact</key>
-    </entry>
-    <entry>
-      <key>Home address</key>
-    </entry>
-    <entry>
-      <key>Type</key>
-    </entry>
-    <entry>
-      <key>Contacts</key>
-    </entry>
-    <entry>
-      <key>Norway</key>
-    </entry>
-    <entry>
-      <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
-    </entry>
-    <entry>
-      <key>Address</key>
-    </entry>
-    <entry>
-      <key>Addresses</key>
-    </entry>
-    <entry>
-      <key>${COMM_ADDRESS}</key>
-      <value>Address</value>
-    </entry>
-    <entry>
-      <key>Gender</key>
-    </entry>
-    <entry>
-      <key>Date of birth</key>
-    </entry>
-    <entry>
-      <key>Lastname</key>
-    </entry>
-    <entry>
-      <key>Salutation</key>
-    </entry>
-    <entry>
-      <key>Middlename</key>
-    </entry>
-    <entry>
-      <key>Title</key>
-    </entry>
-    <entry>
-      <key>Addresstype</key>
-    </entry>
-    <entry>
-      <key>Firstname</key>
-    </entry>
-    <entry>
-      <key>Description</key>
-    </entry>
-    <entry>
-      <key>Direction</key>
-    </entry>
-    <entry>
-      <key>Entrydate</key>
-    </entry>
-    <entry>
-      <key>Subject</key>
-    </entry>
-    <entry>
-      <key>Post office box</key>
-    </entry>
-    <entry>
-      <key>Delivery address</key>
-    </entry>
-    <entry>
-      <key>House number</key>
-    </entry>
-    <entry>
-      <key>Country</key>
-    </entry>
-    <entry>
-      <key>Communication</key>
-    </entry>
-    <entry>
-      <key>postcode</key>
-    </entry>
-    <entry>
-      <key>City</key>
-    </entry>
-    <entry>
-      <key>State</key>
-    </entry>
-    <entry>
-      <key>Region</key>
-    </entry>
-    <entry>
-      <key>District</key>
-    </entry>
-    <entry>
-      <key>Switzerland</key>
-    </entry>
-    <entry>
-      <key>Internal (2)</key>
-    </entry>
-    <entry>
-      <key>Company Addresses</key>
-    </entry>
-    <entry>
-      <key>yyyyMMdd</key>
-    </entry>
-    <entry>
-      <key>standard address</key>
-    </entry>
-    <entry>
-      <key>PP</key>
-    </entry>
-    <entry>
-      <key>VAT</key>
-    </entry>
-    <entry>
-      <key>The expiry date must be after the start date!</key>
-    </entry>
-    <entry>
-      <key>Product</key>
-    </entry>
-    <entry>
-      <key>Developer</key>
-    </entry>
-    <entry>
-      <key>Valid until</key>
-    </entry>
-    <entry>
-      <key>Price list</key>
-    </entry>
-    <entry>
-      <key>Currency</key>
-    </entry>
-    <entry>
-      <key>Payment method</key>
-    </entry>
-    <entry>
-      <key>Price list / Company</key>
-    </entry>
-    <entry>
-      <key>Curr. sales price</key>
-    </entry>
-    <entry>
-      <key>Contract</key>
-    </entry>
-    <entry>
-      <key>Stock</key>
-    </entry>
-    <entry>
-      <key>PP/SP</key>
-    </entry>
-    <entry>
-      <key>Next due date</key>
-    </entry>
-    <entry>
-      <key>Discount</key>
-    </entry>
-    <entry>
-      <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
-    </entry>
-    <entry>
-      <key>Sales</key>
-    </entry>
-    <entry>
-      <key>Contract number</key>
-    </entry>
-    <entry>
-      <key>Min. stock</key>
-    </entry>
-    <entry>
-      <key>SP</key>
-    </entry>
-    <entry>
-      <key>Commodity group 3</key>
-    </entry>
-    <entry>
-      <key>Commodity group 2</key>
-    </entry>
-    <entry>
-      <key>Commodity group 1</key>
-    </entry>
-    <entry>
-      <key>Contract start date</key>
-    </entry>
-    <entry>
-      <key>Spare parts</key>
-    </entry>
-    <entry>
-      <key>Unit</key>
-    </entry>
-    <entry>
-      <key>Contract expiry date</key>
-    </entry>
-    <entry>
-      <key>Yes</key>
-    </entry>
-    <entry>
-      <key>Type of contract</key>
-    </entry>
-    <entry>
-      <key>No</key>
-    </entry>
-    <entry>
-      <key>Service</key>
-    </entry>
-    <entry>
-      <key>Cancelled</key>
-    </entry>
-    <entry>
-      <key>Advertising material</key>
-    </entry>
-    <entry>
-      <key>Valid from</key>
-    </entry>
-    <entry>
-      <key>Product name</key>
-    </entry>
-    <entry>
-      <key>Product group</key>
-    </entry>
-    <entry>
-      <key>${CONTRACT_STATUS}</key>
-      <value>Status</value>
-    </entry>
-    <entry>
-      <key>From no. of units</key>
-    </entry>
-    <entry>
-      <key>Price</key>
-    </entry>
-    <entry>
-      <key>Conditions</key>
-    </entry>
-    <entry>
-      <key>Standard</key>
-    </entry>
-    <entry>
-      <key>I / O</key>
-    </entry>
-    <entry>
-      <key>Date</key>
-    </entry>
-    <entry>
-      <key>IN</key>
-    </entry>
-    <entry>
-      <key>OUT</key>
-    </entry>
-    <entry>
-      <key>Warehouse</key>
-    </entry>
-    <entry>
-      <key>Reference</key>
-    </entry>
-    <entry>
-      <key>The contract number already exists!</key>
-    </entry>
-    <entry>
-      <key>The product number already exists!</key>
-    </entry>
-    <entry>
-      <key>Quantity</key>
-    </entry>
-    <entry>
-      <key>Salesproject</key>
-    </entry>
-    <entry>
-      <key>Rollout</key>
-    </entry>
-    <entry>
-      <key>Phase</key>
-    </entry>
-    <entry>
-      <key>Product number</key>
-    </entry>
-    <entry>
-      <key>Project number</key>
-    </entry>
-    <entry>
-      <key>Project title</key>
-    </entry>
-    <entry>
-      <key>Project start</key>
-    </entry>
-    <entry>
-      <key>Volume</key>
-    </entry>
-    <entry>
-      <key>Partial order</key>
-    </entry>
-    <entry>
-      <key>Open</key>
-    </entry>
-    <entry>
-      <key>Lost</key>
-    </entry>
-    <entry>
-      <key>Order</key>
-    </entry>
-    <entry>
-      <key>Postponed</key>
-    </entry>
-    <entry>
-      <key>Aborted</key>
-    </entry>
-    <entry>
-      <key>Negotiation</key>
-    </entry>
-    <entry>
-      <key>Workshop</key>
-    </entry>
-    <entry>
-      <key>Presentation preparation</key>
-    </entry>
-    <entry>
-      <key>Specifications in progress</key>
-    </entry>
-    <entry>
-      <key>Project decision</key>
-    </entry>
-    <entry>
-      <key>Lead</key>
-    </entry>
-    <entry>
-      <key>Total net</key>
-    </entry>
-    <entry>
-      <key>Offer</key>
-    </entry>
-    <entry>
-      <key>Offer number</key>
-    </entry>
-    <entry>
-      <key>Probability</key>
-    </entry>
-    <entry>
-      <key>Total VAT</key>
-    </entry>
-    <entry>
-      <key>The offer number already exists!</key>
-    </entry>
-    <entry>
-      <key>0 %</key>
-    </entry>
-    <entry>
-      <key>75 %</key>
-    </entry>
-    <entry>
-      <key>100 %</key>
-    </entry>
-    <entry>
-      <key>25 %</key>
-    </entry>
-    <entry>
-      <key>50 %</key>
-    </entry>
-    <entry>
-      <key>Won</key>
-    </entry>
-    <entry>
-      <key>Checked</key>
-    </entry>
-    <entry>
-      <key>Sent</key>
-    </entry>
-    <entry>
-      <key>Offeritems</key>
-    </entry>
-    <entry>
-      <key>Header text</key>
-    </entry>
-    <entry>
-      <key>Commodity group</key>
-    </entry>
-    <entry>
-      <key>Footer text</key>
-    </entry>
-    <entry>
-      <key>Designation</key>
-    </entry>
-    <entry>
-      <key>Position</key>
-    </entry>
-    <entry>
-      <key>Optional</key>
-    </entry>
-    <entry>
-      <key>Article</key>
-    </entry>
-    <entry>
-      <key>Offeritem</key>
-    </entry>
-    <entry>
-      <key>Sum</key>
-    </entry>
-    <entry>
-      <key>Option4</key>
-    </entry>
-    <entry>
-      <key>Option3</key>
-    </entry>
-    <entry>
-      <key>Option2</key>
-    </entry>
-    <entry>
-      <key>Option1</key>
-    </entry>
-    <entry>
-      <key>Countries</key>
-    </entry>
-    <entry>
-      <key>Options</key>
-    </entry>
-    <entry>
-      <key>Total gross</key>
-    </entry>
-    <entry>
-      <key>Identical price list found!</key>
-    </entry>
-    <entry>
-      <key>Parts list</key>
-    </entry>
-    <entry>
-      <key>${THOUSAND_SHORT}</key>
-      <value>T</value>
-    </entry>
-    <entry>
-      <key>Deliver opinion</key>
-    </entry>
-    <entry>
-      <key>Presentation follow-up</key>
-    </entry>
-    <entry>
-      <key>Waiting for requirements</key>
-    </entry>
-    <entry>
-      <key>Parent</key>
-    </entry>
-    <entry>
-      <key>${EURO_SIGN}</key>
-      <value>?</value>
-    </entry>
-    <entry>
-      <key>Planned</key>
-    </entry>
-    <entry>
-      <key>Info</key>
-    </entry>
-    <entry>
-      <key>${VOLUME_MONEY}</key>
-      <value>Volume</value>
-    </entry>
-    <entry>
-      <key>Milestones</key>
-    </entry>
-    <entry>
-      <key>Milestone</key>
-    </entry>
-    <entry>
-      <key>Excreted</key>
-    </entry>
-    <entry>
-      <key>Reason</key>
-    </entry>
-    <entry>
-      <key>Document</key>
-    </entry>
-    <entry>
-      <key>Competition</key>
-    </entry>
-    <entry>
-      <key>Forecast</key>
-    </entry>
-    <entry>
-      <key>Datei</key>
-    </entry>
-    <entry>
-      <key>Role</key>
-    </entry>
-    <entry>
-      <key>End date</key>
-    </entry>
-    <entry>
-      <key>Documents</key>
-    </entry>
-    <entry>
-      <key>Curr. purchase price</key>
-    </entry>
-    <entry>
-      <key>New offer version</key>
-    </entry>
-    <entry>
-      <key>Vers. no.</key>
-    </entry>
-    <entry>
-      <key>Copy offer</key>
-    </entry>
-    <entry>
-      <key>Contracts</key>
-    </entry>
-    <entry>
-      <key>Classification</key>
-    </entry>
-    <entry>
-      <key>Class A</key>
-    </entry>
-    <entry>
-      <key>Class C</key>
-    </entry>
-    <entry>
-      <key>Class B</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
-      <value>fieldOrTableName has to be a string or array of 2 strings.</value>
-    </entry>
-    <entry>
-      <key>High price strategy</key>
-    </entry>
-    <entry>
-      <key>Low price strategy</key>
-    </entry>
-    <entry>
-      <key>Uid</key>
-    </entry>
-    <entry>
-      <key>in 6 Months</key>
-    </entry>
-    <entry>
-      <key>Budget (Project)</key>
-    </entry>
-    <entry>
-      <key>to</key>
-    </entry>
-    <entry>
-      <key>Other</key>
-    </entry>
-    <entry>
-      <key>Individual</key>
-    </entry>
-    <entry>
-      <key>Organisation</key>
-    </entry>
-    <entry>
-      <key>Base</key>
-    </entry>
-    <entry>
-      <key>in 12 Months</key>
-    </entry>
-    <entry>
-      <key>Standard / Individual</key>
-    </entry>
-    <entry>
-      <key>Please update the ${FORECAST_ENGLISH}.</key>
-      <value>Please update the forecast.</value>
-    </entry>
-    <entry>
-      <key>no Project planned</key>
-    </entry>
-    <entry>
-      <key>Strength 3</key>
-    </entry>
-    <entry>
-      <key>Strength 1</key>
-    </entry>
-    <entry>
-      <key>Strength 2</key>
-    </entry>
-    <entry>
-      <key>Value</key>
-    </entry>
-    <entry>
-      <key>Weakness 1</key>
-    </entry>
-    <entry>
-      <key>Weakness 2</key>
-    </entry>
-    <entry>
-      <key>Weakness 3</key>
-    </entry>
-    <entry>
-      <key>Projectstart</key>
-    </entry>
-    <entry>
-      <key>no valid format</key>
-    </entry>
-    <entry>
-      <key>Pos.</key>
-    </entry>
-    <entry>
-      <key>ISO 3166-1 alpha-3</key>
-    </entry>
-    <entry>
-      <key>ISO 3166-1 alpha-2</key>
-    </entry>
-    <entry>
-      <key>0.00</key>
-    </entry>
-    <entry>
-      <key>Relationship</key>
-    </entry>
-    <entry>
-      <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
-      <value>For this binary field only one data-item is allowed</value>
-    </entry>
-    <entry>
-      <key>Native Name</key>
-    </entry>
-    <entry>
-      <key>#,##0</key>
-    </entry>
-    <entry>
-      <key>New offer</key>
-    </entry>
-    <entry>
-      <key>dd.MM.yyyy</key>
-      <value>MM/dd/yyyy</value>
-    </entry>
-    <entry>
-      <key>no valid mail-address format</key>
-    </entry>
-    <entry>
-      <key>#,##0.00</key>
-    </entry>
-    <entry>
-      <key>Latin Name</key>
-    </entry>
-    <entry>
-      <key>Organisation name</key>
-    </entry>
-    <entry>
-      <key>Connection</key>
-    </entry>
-    <entry>
-      <key>standard email</key>
-    </entry>
-    <entry>
-      <key>Edit defaults</key>
-    </entry>
-    <entry>
-      <key>Creator</key>
-    </entry>
-    <entry>
-      <key>Timetracking</key>
-    </entry>
-    <entry>
-      <key>Further informations</key>
-    </entry>
-    <entry>
-      <key>asdf</key>
-    </entry>
-    <entry>
-      <key>Social</key>
-    </entry>
-    <entry>
-      <key>Facebook Feed</key>
-    </entry>
-    <entry>
-      <key>Group1</key>
-    </entry>
-    <entry>
-      <key>Group2</key>
-    </entry>
-    <entry>
-      <key>Details</key>
-    </entry>
-    <entry>
-      <key>Prices</key>
-    </entry>
-    <entry>
-      <key>Twitter</key>
-    </entry>
-    <entry>
-      <key>Connections</key>
-    </entry>
-    <entry>
-      <key>Object</key>
-    </entry>
-    <entry>
-      <key>Attributes</key>
-    </entry>
-    <entry>
-      <key>Facebook</key>
-    </entry>
-    <entry>
-      <key>Creation date</key>
-    </entry>
-    <entry>
-      <key>Maindocuments</key>
-    </entry>
-    <entry>
-      <key>Receipt</key>
-    </entry>
-    <entry>
-      <key>Receipt number</key>
-    </entry>
-    <entry>
-      <key>Year</key>
-    </entry>
-    <entry>
-      <key>New receipt version</key>
-    </entry>
-    <entry>
-      <key>Orderitems</key>
-    </entry>
-    <entry>
-      <key>Sent receipts</key>
-    </entry>
-    <entry>
-      <key>Copy receipt</key>
-    </entry>
-    <entry>
-      <key>Orderitem</key>
-    </entry>
-    <entry>
-      <key>The order number already exists!</key>
-    </entry>
-    <entry>
-      <key>New activity</key>
-    </entry>
-    <entry>
-      <key>Turnover</key>
-    </entry>
-    <entry>
-      <key>Sent offers</key>
-    </entry>
-    <entry>
-      <key>Show all activities</key>
-    </entry>
-    <entry>
-      <key>Offers</key>
-    </entry>
-    <entry>
-      <key>Show all sent offers</key>
-    </entry>
-    <entry>
-      <key>Show my activities</key>
-    </entry>
-    <entry>
-      <key>Show all receipts</key>
-    </entry>
-    <entry>
-      <key>Receipts</key>
-    </entry>
-    <entry>
-      <key>My Activities</key>
-    </entry>
-    <entry>
-      <key>Show all offers</key>
-    </entry>
-    <entry>
-      <key>Show all products</key>
-    </entry>
-    <entry>
-      <key>Show all Facebook posts of a user</key>
-    </entry>
-    <entry>
-      <key>Show all tweets of a user</key>
-    </entry>
-    <entry>
-      <key>Show all companies</key>
-    </entry>
-    <entry>
-      <key>Show all tweets of ADITO</key>
-    </entry>
-    <entry>
-      <key>Show all sent receipts</key>
-    </entry>
-    <entry>
-      <key>Products</key>
-    </entry>
-    <entry>
-      <key>Show all Facebook posts of ADITO</key>
-    </entry>
-    <entry>
-      <key>Companies</key>
-    </entry>
-    <entry>
-      <key>Show all contacts</key>
-    </entry>
-    <entry>
-      <key>Show open salesprojects</key>
-    </entry>
-    <entry>
-      <key>Show all contracts</key>
-    </entry>
-    <entry>
-      <key>Salesprojects</key>
-    </entry>
-    <entry>
-      <key>Show all salesprojects</key>
-    </entry>
-    <entry>
-      <key>Open salesprojects</key>
-    </entry>
-    <entry>
-      <key>July</key>
-    </entry>
-    <entry>
-      <key>ADITO Facebook Feed</key>
-    </entry>
-    <entry>
-      <key>ADITO Twitter Feed</key>
-    </entry>
-    <entry>
-      <key>June</key>
-    </entry>
-    <entry>
-      <key>October</key>
-    </entry>
-    <entry>
-      <key>Take price</key>
-    </entry>
-    <entry>
-      <key>Twitter Feed</key>
-    </entry>
-    <entry>
-      <key>November</key>
-    </entry>
-    <entry>
-      <key>December</key>
-    </entry>
-    <entry>
-      <key>May</key>
-    </entry>
-    <entry>
-      <key>April</key>
-    </entry>
-    <entry>
-      <key>January</key>
-    </entry>
-    <entry>
-      <key>March</key>
-    </entry>
-    <entry>
-      <key>September</key>
-    </entry>
-    <entry>
-      <key>August</key>
-    </entry>
-    <entry>
-      <key>Category</key>
-    </entry>
-    <entry>
-      <key>February</key>
-    </entry>
-    <entry>
-      <key>Abomodel</key>
-    </entry>
-    <entry>
-      <key>Confirmed</key>
-    </entry>
-    <entry>
-      <key>OutOfOffice</key>
-    </entry>
-    <entry>
-      <key>Articledescription</key>
-    </entry>
-    <entry>
-      <key>Articlenumber</key>
-    </entry>
-    <entry>
-      <key>Industry 3</key>
-    </entry>
-    <entry>
-      <key>Industry 2</key>
-    </entry>
-    <entry>
-      <key>Industry 1</key>
-    </entry>
-    <entry>
-      <key>Industry</key>
-    </entry>
-    <entry>
-      <key>Put Reciever Into To</key>
-    </entry>
-    <entry>
-      <key>Unitprice</key>
-    </entry>
-    <entry>
-      <key>Free</key>
-    </entry>
-    <entry>
-      <key>From</key>
-    </entry>
-    <entry>
-      <key>Total</key>
-    </entry>
-    <entry>
-      <key>yearly series not specified</key>
-    </entry>
-    <entry>
-      <key>no standard email office</key>
-    </entry>
-    <entry>
-      <key>Conditions of payment</key>
-    </entry>
-    <entry>
-      <key>Number</key>
-    </entry>
-    <entry>
-      <key>Amount</key>
-    </entry>
-    <entry>
-      <key>Deliveryspecification</key>
-    </entry>
-    <entry>
-      <key>Ignore daily series</key>
-    </entry>
-    <entry>
-      <key>Tentative</key>
-    </entry>
-    <entry>
-      <key>Ignore series</key>
-    </entry>
-    <entry>
-      <key>Plus Salestax</key>
-    </entry>
-    <entry>
-      <key>Choose address</key>
-    </entry>
-    <entry>
-      <key>Customer Base Sheet</key>
-    </entry>
-    <entry>
-      <key>{$TASK_STATUS}</key>
-      <value>status</value>
-    </entry>
-    <entry>
-      <key>Task</key>
-    </entry>
-    <entry>
-      <key>subject</key>
-    </entry>
-    <entry>
-      <key>{$TASK_REQUESTOR}</key>
-      <value>requestor</value>
-    </entry>
-    <entry>
-      <key>task number</key>
-    </entry>
-    <entry>
-      <key>{$TASK_EDITOR}</key>
-      <value>editor</value>
-    </entry>
-    <entry>
-      <key>description</key>
-    </entry>
-    <entry>
-      <key>priority</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_HIGH}</key>
-      <value>high</value>
-    </entry>
-    <entry>
-      <key>Seite</key>
-    </entry>
-    <entry>
-      <key>Note</key>
-    </entry>
-    <entry>
-      <key>Senden per E-Mail</key>
-    </entry>
-    <entry>
-      <key>Hauptdokument</key>
-    </entry>
-    <entry>
-      <key>Betreff</key>
-    </entry>
-    <entry>
-      <key>title</key>
-    </entry>
-    <entry>
-      <key>von</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_LOW}</key>
-      <value>low</value>
-    </entry>
-    <entry>
-      <key>Nur Eigene anzeigen</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_NORMAL}</key>
-      <value>normal</value>
-    </entry>
-    <entry>
-      <key>Beschreibung</key>
-    </entry>
-    <entry>
-      <key>Unit price</key>
-    </entry>
-    <entry>
-      <key>Firma</key>
-    </entry>
-    <entry>
-      <key>type</key>
-    </entry>
-    <entry>
-      <key>Benutzer</key>
-    </entry>
-    <entry>
-      <key>{$TASK_PRIORITY_NONE}</key>
-      <value>none</value>
-    </entry>
-    <entry>
-      <key>Termin</key>
-    </entry>
-    <entry>
-      <key>Vorschau</key>
-    </entry>
-    <entry>
-      <key>Angebot</key>
-    </entry>
-    <entry>
-      <key>details</key>
-    </entry>
-    <entry>
-      <key>Contact type</key>
-    </entry>
-    <entry>
-      <key>Communication data</key>
-    </entry>
-    <entry>
-      <key>Remark</key>
-    </entry>
-    <entry>
-      <key>Department</key>
-    </entry>
-    <entry>
-      <key>Tasks</key>
-    </entry>
-    <entry>
-      <key>Employee</key>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_MEMBER}</key>
-      <value>Project member</value>
-    </entry>
-    <entry>
-      <key>responsible</key>
-    </entry>
-    <entry>
-      <key>Kundenstammblatt</key>
-    </entry>
-    <entry>
-      <key>Person</key>
-    </entry>
-    <entry>
-      <key>Detail</key>
-    </entry>
-    <entry>
-      <key>Object 2</key>
-    </entry>
-    <entry>
-      <key>Object 1</key>
-    </entry>
-    <entry>
-      <key>Type 2</key>
-    </entry>
-    <entry>
-      <key>Type 1</key>
-    </entry>
-    <entry>
-      <key>Relations</key>
-    </entry>
-    <entry>
-      <key>${FORECAST_ENGLISH}</key>
-      <value>Forecast</value>
-    </entry>
-    <entry>
-      <key>Usage</key>
-    </entry>
-    <entry>
-      <key>Maximal Count</key>
-    </entry>
-    <entry>
-      <key>Minimal Count</key>
-    </entry>
-    <entry>
-      <key>${ADDRESS_STATE}</key>
-    </entry>
-    <entry>
-      <key>Title (original language)</key>
-    </entry>
-    <entry>
-      <key>Attribute Relation</key>
-    </entry>
-    <entry>
-      <key>Attribute Usage</key>
-    </entry>
-    <entry>
-      <key>Key</key>
-    </entry>
-    <entry>
-      <key>Attribute</key>
-    </entry>
-    <entry>
-      <key>Container</key>
-    </entry>
-    <entry>
-      <key>Administration</key>
-    </entry>
-    <entry>
-      <key>Keyword</key>
-    </entry>
-    <entry>
-      <key>Sorting</key>
-    </entry>
-    <entry>
-      <key>jdito</key>
-    </entry>
-    <entry>
-      <key>Time expenses</key>
-    </entry>
-    <entry>
-      <key>Context id</key>
-    </entry>
-    <entry>
-      <key>Context name</key>
-    </entry>
-    <entry>
-      <key>Cambodia</key>
-    </entry>
-    <entry>
-      <key>Resigned</key>
-    </entry>
-    <entry>
-      <key>Customer</key>
-    </entry>
-    <entry>
-      <key>Outgoing</key>
-    </entry>
-    <entry>
-      <key>Paraguay</key>
-    </entry>
-    <entry>
-      <key>Solomon Islands</key>
-    </entry>
-    <entry>
-      <key>Montserrat</key>
-    </entry>
-    <entry>
-      <key>Guadeloupe</key>
-    </entry>
-    <entry>
-      <key>Product_technic</key>
-    </entry>
-    <entry>
-      <key>Moldova (Republic of)</key>
-    </entry>
-    <entry>
-      <key>Seychelles</key>
-    </entry>
-    <entry>
-      <key>Canadian dollar</key>
-    </entry>
-    <entry>
-      <key>Bahrain</key>
-    </entry>
-    <entry>
-      <key>Comoros</key>
-    </entry>
-    <entry>
-      <key>Faroe Islands</key>
-    </entry>
-    <entry>
-      <key>Finland</key>
-    </entry>
-    <entry>
-      <key>Project_duration</key>
-    </entry>
-    <entry>
-      <key>Company_internationality</key>
-    </entry>
-    <entry>
-      <key>Eritrea</key>
-    </entry>
-    <entry>
-      <key>Puerto Rico</key>
-    </entry>
-    <entry>
-      <key>Viet Nam</key>
-    </entry>
-    <entry>
-      <key>Libya</key>
-    </entry>
-    <entry>
-      <key>French</key>
-    </entry>
-    <entry>
-      <key>Cocos (Keeling) Islands</key>
-    </entry>
-    <entry>
-      <key>Saint Helena, Ascension and Tristan da Cunha</key>
-    </entry>
-    <entry>
-      <key>Liechtenstein</key>
-    </entry>
-    <entry>
-      <key>Product_functionality</key>
-    </entry>
-    <entry>
-      <key>Bulgaria</key>
-    </entry>
-    <entry>
-      <key>Jordan</key>
-    </entry>
-    <entry>
-      <key>United Arab Emirates</key>
-    </entry>
-    <entry>
-      <key>Kenya</key>
-    </entry>
-    <entry>
-      <key>None, individual count</key>
-    </entry>
-    <entry>
-      <key>French Polynesia</key>
-    </entry>
-    <entry>
-      <key>Djibouti</key>
-    </entry>
-    <entry>
-      <key>Cuba</key>
-    </entry>
-    <entry>
-      <key>Saint Lucia</key>
-    </entry>
-    <entry>
-      <key>Mayotte</key>
-    </entry>
-    <entry>
-      <key>Israel</key>
-    </entry>
-    <entry>
-      <key>San Marino</key>
-    </entry>
-    <entry>
-      <key>Tajikistan</key>
-    </entry>
-    <entry>
-      <key>Warehouse 2</key>
-    </entry>
-    <entry>
-      <key>Warehouse 1</key>
-    </entry>
-    <entry>
-      <key>Gibraltar</key>
-    </entry>
-    <entry>
-      <key>Warehouse 3</key>
-    </entry>
-    <entry>
-      <key>Cyprus</key>
-    </entry>
-    <entry>
-      <key>Semiannually</key>
-    </entry>
-    <entry>
-      <key>Northern Mariana Islands</key>
-    </entry>
-    <entry>
-      <key>Malaysia</key>
-    </entry>
-    <entry>
-      <key>Armenia</key>
-    </entry>
-    <entry>
-      <key>Brazil</key>
-    </entry>
-    <entry>
-      <key>Turks and Caicos Islands</key>
-    </entry>
-    <entry>
-      <key>Cabo Verde</key>
-    </entry>
-    <entry>
-      <key>Ecuador</key>
-    </entry>
-    <entry>
-      <key>Iran (Islamic Republic of)</key>
-    </entry>
-    <entry>
-      <key>Decision maker</key>
-    </entry>
-    <entry>
-      <key>Lao People's Democratic Republic</key>
-    </entry>
-    <entry>
-      <key>Maintenance contract</key>
-    </entry>
-    <entry>
-      <key>United States Minor Outlying Islands</key>
-    </entry>
-    <entry>
-      <key>Italy</key>
-    </entry>
-    <entry>
-      <key>${ORGTYPE_OTHER}</key>
-      <value>Other</value>
-    </entry>
-    <entry>
-      <key>Haiti</key>
-    </entry>
-    <entry>
-      <key>Afghanistan</key>
-    </entry>
-    <entry>
-      <key>Russian Federation</key>
-    </entry>
-    <entry>
-      <key>waiting</key>
-    </entry>
-    <entry>
-      <key>American Samoa</key>
-    </entry>
-    <entry>
-      <key>Korea (Democratic People's Republic of)</key>
-    </entry>
-    <entry>
-      <key>United States dollar</key>
-    </entry>
-    <entry>
-      <key>Kyrgyzstan</key>
-    </entry>
-    <entry>
-      <key>Togo</key>
-    </entry>
-    <entry>
-      <key>Other_existing Customer</key>
-    </entry>
-    <entry>
-      <key>Uzbekistan</key>
-    </entry>
-    <entry>
-      <key>Dominica</key>
-    </entry>
-    <entry>
-      <key>Benin</key>
-    </entry>
-    <entry>
-      <key>Liter</key>
-    </entry>
-    <entry>
-      <key>Virgin Islands (British)</key>
-    </entry>
-    <entry>
-      <key>Sudan</key>
-    </entry>
-    <entry>
-      <key>Portugal</key>
-    </entry>
-    <entry>
-      <key>Grenada</key>
-    </entry>
-    <entry>
-      <key>Latvia</key>
-    </entry>
-    <entry>
-      <key>Mongolia</key>
-    </entry>
-    <entry>
-      <key>Morocco</key>
-    </entry>
-    <entry>
-      <key>Guatemala</key>
-    </entry>
-    <entry>
-      <key>Pieces</key>
-    </entry>
-    <entry>
-      <key>Heard Island and McDonald Islands</key>
-    </entry>
-    <entry>
-      <key>Incoming</key>
-    </entry>
-    <entry>
-      <key>Ghana</key>
-    </entry>
-    <entry>
-      <key>Holy See</key>
-    </entry>
-    <entry>
-      <key>India</key>
-    </entry>
-    <entry>
-      <key>Canada</key>
-    </entry>
-    <entry>
-      <key>Maldives</key>
-    </entry>
-    <entry>
-      <key>Service contract</key>
-    </entry>
-    <entry>
-      <key>Taiwan</key>
-    </entry>
-    <entry>
-      <key>Central African Republic</key>
-    </entry>
-    <entry>
-      <key>Fiji</key>
-    </entry>
-    <entry>
-      <key>Guinea</key>
-    </entry>
-    <entry>
-      <key>Somalia</key>
-    </entry>
-    <entry>
-      <key>Sao Tome and Principe</key>
-    </entry>
-    <entry>
-      <key>United Kingdom of Great Britain and Northern Ireland</key>
-    </entry>
-    <entry>
-      <key>Equatorial Guinea</key>
-    </entry>
-    <entry>
-      <key>Kiribati</key>
-    </entry>
-    <entry>
-      <key>Costa Rica</key>
-    </entry>
-    <entry>
-      <key>Supplier</key>
-    </entry>
-    <entry>
-      <key>Nigeria</key>
-    </entry>
-    <entry>
-      <key>Syrian Arab Republic</key>
-    </entry>
-    <entry>
-      <key>Timor-Leste</key>
-    </entry>
-    <entry>
-      <key>Product_mobile use</key>
-    </entry>
-    <entry>
-      <key>Samoa</key>
-    </entry>
-    <entry>
-      <key>Spain</key>
-    </entry>
-    <entry>
-      <key>Palau</key>
-    </entry>
-    <entry>
-      <key>Prospect</key>
-    </entry>
-    <entry>
-      <key>Estonia</key>
-    </entry>
-    <entry>
-      <key>Not signed yet</key>
-    </entry>
-    <entry>
-      <key>Niue</key>
-    </entry>
-    <entry>
-      <key>Mozambique</key>
-    </entry>
-    <entry>
-      <key>El Salvador</key>
-    </entry>
-    <entry>
-      <key>Guam</key>
-    </entry>
-    <entry>
-      <key>Lesotho</key>
-    </entry>
-    <entry>
-      <key>Tonga</key>
-    </entry>
-    <entry>
-      <key>Western Sahara</key>
-    </entry>
-    <entry>
-      <key>new</key>
-    </entry>
-    <entry>
-      <key>Adviser</key>
-    </entry>
-    <entry>
-      <key>Company_size</key>
-    </entry>
-    <entry>
-      <key>Republic of Kosovo</key>
-    </entry>
-    <entry>
-      <key>South Sudan</key>
-    </entry>
-    <entry>
-      <key>Mauritius</key>
-    </entry>
-    <entry>
-      <key>Bouvet Island</key>
-    </entry>
-    <entry>
-      <key>Bolivia (Plurinational State of)</key>
-    </entry>
-    <entry>
-      <key>Norfolk Island</key>
-    </entry>
-    <entry>
-      <key>Sint Maarten (Dutch part)</key>
-    </entry>
-    <entry>
-      <key>Micronesia (Federated States of)</key>
-    </entry>
-    <entry>
-      <key>Product_industry knowhow</key>
-    </entry>
-    <entry>
-      <key>United States of America</key>
-    </entry>
-    <entry>
-      <key>In review</key>
-    </entry>
-    <entry>
-      <key>Address purchase</key>
-    </entry>
-    <entry>
-      <key>Malta</key>
-    </entry>
-    <entry>
-      <key>Project_volume</key>
-    </entry>
-    <entry>
-      <key>Ireland</key>
-    </entry>
-    <entry>
-      <key>Inactive</key>
-    </entry>
-    <entry>
-      <key>France</key>
-    </entry>
-    <entry>
-      <key>Lithuania</key>
-    </entry>
-    <entry>
-      <key>Korea (Republic of)</key>
-    </entry>
-    <entry>
-      <key>${PRICELIST_SERVICE}</key>
-      <value>Service</value>
-    </entry>
-    <entry>
-      <key>English</key>
-    </entry>
-    <entry>
-      <key>Nicaragua</key>
-    </entry>
-    <entry>
-      <key>Macao</key>
-    </entry>
-    <entry>
-      <key>Mexico</key>
-    </entry>
-    <entry>
-      <key>Uganda</key>
-    </entry>
-    <entry>
-      <key>Suriname</key>
-    </entry>
-    <entry>
-      <key>Greenland</key>
-    </entry>
-    <entry>
-      <key>Papua New Guinea</key>
-    </entry>
-    <entry>
-      <key>Kazakhstan</key>
-    </entry>
-    <entry>
-      <key>Bahamas</key>
-    </entry>
-    <entry>
-      <key>Mali</key>
-    </entry>
-    <entry>
-      <key>Marshall Islands</key>
-    </entry>
-    <entry>
-      <key>Panama</key>
-    </entry>
-    <entry>
-      <key>Bonaire, Sint Eustatius and Saba</key>
-    </entry>
-    <entry>
-      <key>Tanzania, United Republic of</key>
-    </entry>
-    <entry>
-      <key>Argentina</key>
-    </entry>
-    <entry>
-      <key>Belize</key>
-    </entry>
-    <entry>
-      <key>Zambia</key>
-    </entry>
-    <entry>
-      <key>Congo</key>
-    </entry>
-    <entry>
-      <key>Guinea-Bissau</key>
-    </entry>
-    <entry>
-      <key>Namibia</key>
-    </entry>
-    <entry>
-      <key>External sales manager</key>
-    </entry>
-    <entry>
-      <key>Georgia</key>
-    </entry>
-    <entry>
-      <key>Saint Kitts and Nevis</key>
-    </entry>
-    <entry>
-      <key>Yemen</key>
-    </entry>
-    <entry>
-      <key>Aruba</key>
-    </entry>
-    <entry>
-      <key>Madagascar</key>
-    </entry>
-    <entry>
-      <key>Valid, unlimited</key>
-    </entry>
-    <entry>
-      <key>Svalbard and Jan Mayen</key>
-    </entry>
-    <entry>
-      <key>South Georgia and the South Sandwich Islands</key>
-    </entry>
-    <entry>
-      <key>Sweden</key>
-    </entry>
-    <entry>
-      <key>Malawi</key>
-    </entry>
-    <entry>
-      <key>Andorra</key>
-    </entry>
-    <entry>
-      <key>Poland</key>
-    </entry>
-    <entry>
-      <key>Tunisia</key>
-    </entry>
-    <entry>
-      <key>Tuvalu</key>
-    </entry>
-    <entry>
-      <key>Lebanon</key>
-    </entry>
-    <entry>
-      <key>Azerbaijan</key>
-    </entry>
-    <entry>
-      <key>Czech Republic</key>
-    </entry>
-    <entry>
-      <key>Mauritania</key>
-    </entry>
-    <entry>
-      <key>Guernsey</key>
-    </entry>
-    <entry>
-      <key>Kgs</key>
-    </entry>
-    <entry>
-      <key>Australia</key>
-    </entry>
-    <entry>
-      <key>Myanmar</key>
-    </entry>
-    <entry>
-      <key>Cameroon</key>
-    </entry>
-    <entry>
-      <key>Iceland</key>
-    </entry>
-    <entry>
-      <key>Oman</key>
-    </entry>
-    <entry>
-      <key>Gabon</key>
-    </entry>
-    <entry>
-      <key>Luxembourg</key>
-    </entry>
-    <entry>
-      <key>Algeria</key>
-    </entry>
-    <entry>
-      <key>Jersey</key>
-    </entry>
-    <entry>
-      <key>Slovenia</key>
-    </entry>
-    <entry>
-      <key>Antigua and Barbuda</key>
-    </entry>
-    <entry>
-      <key>Annually</key>
-    </entry>
-    <entry>
-      <key>Colombia</key>
-    </entry>
-    <entry>
-      <key>Project_reference</key>
-    </entry>
-    <entry>
-      <key>Vanuatu</key>
-    </entry>
-    <entry>
-      <key>Valid, limited</key>
-    </entry>
-    <entry>
-      <key>Honduras</key>
-    </entry>
-    <entry>
-      <key>Antarctica</key>
-    </entry>
-    <entry>
-      <key>Nauru</key>
-    </entry>
-    <entry>
-      <key>Burundi</key>
-    </entry>
-    <entry>
-      <key>Project manager</key>
-    </entry>
-    <entry>
-      <key>Singapore</key>
-    </entry>
-    <entry>
-      <key>French Guiana</key>
-    </entry>
-    <entry>
-      <key>Hours</key>
-    </entry>
-    <entry>
-      <key>Christmas Island</key>
-    </entry>
-    <entry>
-      <key>Netherlands</key>
-    </entry>
-    <entry>
-      <key>Product_flexibility</key>
-    </entry>
-    <entry>
-      <key>China</key>
-    </entry>
-    <entry>
-      <key>Martinique</key>
-    </entry>
-    <entry>
-      <key>Own website</key>
-    </entry>
-    <entry>
-      <key>Saint Pierre and Miquelon</key>
-    </entry>
-    <entry>
-      <key>Bhutan</key>
-    </entry>
-    <entry>
-      <key>Romania</key>
-    </entry>
-    <entry>
-      <key>Falkland Islands (Malvinas)</key>
-    </entry>
-    <entry>
-      <key>Philippines</key>
-    </entry>
-    <entry>
-      <key>Pitcairn</key>
-    </entry>
-    <entry>
-      <key>Zimbabwe</key>
-    </entry>
-    <entry>
-      <key>British Indian Ocean Territory</key>
-    </entry>
-    <entry>
-      <key>Montenegro</key>
-    </entry>
-    <entry>
-      <key>Quarterly</key>
-    </entry>
-    <entry>
-      <key>Indonesia</key>
-    </entry>
-    <entry>
-      <key>Angola</key>
-    </entry>
-    <entry>
-      <key>Internal</key>
-    </entry>
-    <entry>
-      <key>Key account</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>Brunei Darussalam</key>
-    </entry>
-    <entry>
-      <key>New Caledonia</key>
-    </entry>
-    <entry>
-      <key>Cayman Islands</key>
-    </entry>
-    <entry>
-      <key>Congo (Democratic Republic of the)</key>
-    </entry>
-    <entry>
-      <key>Greece</key>
-    </entry>
-    <entry>
-      <key>Guyana</key>
-    </entry>
-    <entry>
-      <key>Project assistant</key>
-    </entry>
-    <entry>
-      <key>Iraq</key>
-    </entry>
-    <entry>
-      <key>Chile</key>
-    </entry>
-    <entry>
-      <key>Nepal</key>
-    </entry>
-    <entry>
-      <key>${PRICELIST_DEFAULT}</key>
-      <value>Standard</value>
-    </entry>
-    <entry>
-      <key>Customer recommendation</key>
-    </entry>
-    <entry>
-      <key>Other_unknown</key>
-    </entry>
-    <entry>
-      <key>Isle of Man</key>
-    </entry>
-    <entry>
-      <key>Ukraine</key>
-    </entry>
-    <entry>
-      <key>Anguilla</key>
-    </entry>
-    <entry>
-      <key>Euro</key>
-    </entry>
-    <entry>
-      <key>Product_GUI</key>
-    </entry>
-    <entry>
-      <key>${GENDER_OTHER}</key>
-    </entry>
-    <entry>
-      <key>Turkey</key>
-    </entry>
-    <entry>
-      <key>Belgium</key>
-    </entry>
-    <entry>
-      <key>South Africa</key>
-    </entry>
-    <entry>
-      <key>Trinidad and Tobago</key>
-    </entry>
-    <entry>
-      <key>Bermuda</key>
-    </entry>
-    <entry>
-      <key>Jamaica</key>
-    </entry>
-    <entry>
-      <key>Peru</key>
-    </entry>
-    <entry>
-      <key>Turkmenistan</key>
-    </entry>
-    <entry>
-      <key>Venezuela (Bolivarian Republic of)</key>
-    </entry>
-    <entry>
-      <key>Tokelau</key>
-    </entry>
-    <entry>
-      <key>Hong Kong</key>
-    </entry>
-    <entry>
-      <key>Chad</key>
-    </entry>
-    <entry>
-      <key>German</key>
-    </entry>
-    <entry>
-      <key>Thailand</key>
-    </entry>
-    <entry>
-      <key>in process</key>
-    </entry>
-    <entry>
-      <key>Saint Martin (French part)</key>
-    </entry>
-    <entry>
-      <key>Kuwait</key>
-    </entry>
-    <entry>
-      <key>Palestine, State of</key>
-    </entry>
-    <entry>
-      <key>Croatia</key>
-    </entry>
-    <entry>
-      <key>Cook Islands</key>
-    </entry>
-    <entry>
-      <key>Fair</key>
-    </entry>
-    <entry>
-      <key>Sri Lanka</key>
-    </entry>
-    <entry>
-      <key>Uruguay</key>
-    </entry>
-    <entry>
-      <key>Liberia</key>
-    </entry>
-    <entry>
-      <key>Burkina Faso</key>
-    </entry>
-    <entry>
-      <key>Swiss franc</key>
-    </entry>
-    <entry>
-      <key>Swaziland</key>
-    </entry>
-    <entry>
-      <key>ended</key>
-    </entry>
-    <entry>
-      <key>Wallis and Futuna</key>
-    </entry>
-    <entry>
-      <key>Company_industry knowhow</key>
-    </entry>
-    <entry>
-      <key>Monaco</key>
-    </entry>
-    <entry>
-      <key>Spanish</key>
-    </entry>
-    <entry>
-      <key>Hungary</key>
-    </entry>
-    <entry>
-      <key>Japan</key>
-    </entry>
-    <entry>
-      <key>Belarus</key>
-    </entry>
-    <entry>
-      <key>Albania</key>
-    </entry>
-    <entry>
-      <key>Internal sales manager</key>
-    </entry>
-    <entry>
-      <key>Virgin Islands (U.S.)</key>
-    </entry>
-    <entry>
-      <key>New Zealand</key>
-    </entry>
-    <entry>
-      <key>Senegal</key>
-    </entry>
-    <entry>
-      <key>Ethiopia</key>
-    </entry>
-    <entry>
-      <key>Macedonia (the former Yugoslav Republic of)</key>
-    </entry>
-    <entry>
-      <key>Egypt</key>
-    </entry>
-    <entry>
-      <key>Sierra Leone</key>
-    </entry>
-    <entry>
-      <key>Saudi Arabia</key>
-    </entry>
-    <entry>
-      <key>Pakistan</key>
-    </entry>
-    <entry>
-      <key>Gambia</key>
-    </entry>
-    <entry>
-      <key>Qatar</key>
-    </entry>
-    <entry>
-      <key>Slovakia</key>
-    </entry>
-    <entry>
-      <key>Serbia</key>
-    </entry>
-    <entry>
-      <key>Bosnia and Herzegovina</key>
-    </entry>
-    <entry>
-      <key>Framework contract</key>
-    </entry>
-    <entry>
-      <key>Niger</key>
-    </entry>
-    <entry>
-      <key>Rwanda</key>
-    </entry>
-    <entry>
-      <key>French Southern Territories</key>
-    </entry>
-    <entry>
-      <key>Bangladesh</key>
-    </entry>
-    <entry>
-      <key>Barbados</key>
-    </entry>
-    <entry>
-      <key>Botswana</key>
-    </entry>
-    <entry>
-      <key>Saint Vincent and the Grenadines</key>
-    </entry>
-    <entry>
-      <key>Denmark</key>
-    </entry>
-    <entry>
-      <key>Dominican Republic</key>
-    </entry>
-    <entry>
-      <key>Cover letter</key>
-    </entry>
-    <entry>
-      <key>Create receipt</key>
-    </entry>
-    <entry>
-      <key>New time tracking</key>
-    </entry>
-    <entry>
-      <key>MAL</key>
-    </entry>
-    <entry>
-      <key>SQO</key>
-    </entry>
-    <entry>
-      <key>NQC</key>
-    </entry>
-    <entry>
-      <key>MQL</key>
-    </entry>
-    <entry>
-      <key>SAL</key>
-    </entry>
-    <entry>
-      <key>Checkbox</key>
-    </entry>
-    <entry>
-      <key>Numeric value</key>
-    </entry>
-    <entry>
-      <key>decline</key>
-    </entry>
-    <entry>
-      <key>Text</key>
-    </entry>
-    <entry>
-      <key>Group</key>
-    </entry>
-    <entry>
-      <key>Combobox</key>
-    </entry>
-    <entry>
-      <key>tentative</key>
-    </entry>
-    <entry>
-      <key>${NUMBER}</key>
-      <value>Number</value>
-    </entry>
-    <entry>
-      <key>Name \"%0\" already used for container \"%1\"</key>
-    </entry>
-    <entry>
-      <key>CHAR_VALUE</key>
-    </entry>
-    <entry>
-      <key>Keyword Attribute</key>
-    </entry>
-    <entry>
-      <key>in</key>
-    </entry>
-    <entry>
-      <key>Keyword Attribute Values</key>
-    </entry>
-    <entry>
-      <key>Boolean value</key>
-    </entry>
-    <entry>
-      <key>accept</key>
-    </entry>
-    <entry>
-      <key>The ZIP code does not match the format of the country.</key>
-    </entry>
-    <entry>
-      <key>String value</key>
-    </entry>
-    <entry>
-      <key>The code number is not a valid number.</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
-      <value>The DBTYPE is not supported by function %0.</value>
-    </entry>
-    <entry>
-      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
-      <value>Missing productId in function %0.</value>
-    </entry>
-    <entry>
-      <key>Object type</key>
-    </entry>
-    <entry>
-      <key>Level</key>
-    </entry>
-    <entry>
-      <key>Touchpoint</key>
-    </entry>
-    <entry>
-      <key>Touchpoints</key>
-    </entry>
-    <entry>
-      <key>Days inactive</key>
-    </entry>
-    <entry>
-      <key>Combobox Value</key>
-    </entry>
-    <entry>
-      <key>relations</key>
-    </entry>
-    <entry>
-      <key>Time</key>
-    </entry>
-    <entry>
-      <key>New task</key>
-    </entry>
-    <entry>
-      <key>MyTasks</key>
-    </entry>
-    <entry>
-      <key>Show my tasks</key>
-    </entry>
-    <entry>
-      <key>the specified key has to be unique for that container but does already exist</key>
-    </entry>
-    <entry>
-      <key>Tree Entity</key>
-    </entry>
-    <entry>
-      <key>Relationtype</key>
-    </entry>
-    <entry>
-      <key>Tree</key>
-    </entry>
-    <entry>
-      <key>100%</key>
-    </entry>
-    <entry>
-      <key>Mobil</key>
-    </entry>
-    <entry>
-      <key>25%</key>
-    </entry>
-    <entry>
-      <key>50%</key>
-    </entry>
-    <entry>
-      <key>75%</key>
-    </entry>
-    <entry>
-      <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
-    </entry>
-    <entry>
-      <key>competitor</key>
-    </entry>
-    <entry>
-      <key>0%</key>
-    </entry>
-    <entry>
-      <key>acquainted with</key>
-    </entry>
-    <entry>
-      <key>collaboration with</key>
-    </entry>
-    <entry>
-      <key>parent company</key>
-    </entry>
-    <entry>
-      <key>society</key>
-    </entry>
-    <entry>
-      <key>ankle of</key>
-    </entry>
-    <entry>
-      <key>solicits</key>
-    </entry>
-    <entry>
-      <key>child of</key>
-    </entry>
-    <entry>
-      <key>supervisor of</key>
-    </entry>
-    <entry>
-      <key>reports to</key>
-    </entry>
-    <entry>
-      <key>subsidiary</key>
-    </entry>
-    <entry>
-      <key>supported by</key>
-    </entry>
-    <entry>
-      <key>member</key>
-    </entry>
-    <entry>
-      <key>promotion target of</key>
-    </entry>
-    <entry>
-      <key>supports</key>
-    </entry>
-    <entry>
-      <key>parent of</key>
-    </entry>
-    <entry>
-      <key>grandparents of</key>
-    </entry>
-    <entry>
-      <key>Entrydate (Month)</key>
-    </entry>
-    <entry>
-      <key>Entrydate (Day)</key>
-    </entry>
-    <entry>
-      <key>My Dashboard</key>
-    </entry>
-    <entry>
-      <key>Salesdashboard</key>
-    </entry>
-    <entry>
-      <key>Discount %</key>
-    </entry>
-    <entry>
-      <key>Memo</key>
-    </entry>
-    <entry>
-      <key>Function</key>
-    </entry>
-    <entry>
-      <key>Relational</key>
-    </entry>
-    <entry>
-      <key>Only numbers are allowed.</key>
-    </entry>
-    <entry>
-      <key>Superordinate Attribute</key>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_OFFER}</key>
-      <value>Offer</value>
-    </entry>
-    <entry>
-      <key>${SALESPROJECT_NEGOTIATION}</key>
-      <value>Negotiation</value>
-    </entry>
-    <entry>
-      <key>Filesize</key>
-    </entry>
-    <entry>
-      <key>Filename</key>
-    </entry>
-    <entry>
-      <key>Filetype</key>
-    </entry>
-    <entry>
-      <key>Special price list</key>
-    </entry>
-    <entry>
-      <key>New attribute</key>
-    </entry>
-    <entry>
-      <key>MQC</key>
-    </entry>
-    <entry>
-      <key>History</key>
-    </entry>
-    <entry>
-      <key>Progress</key>
-    </entry>
-    <entry>
-      <key>Module</key>
-    </entry>
-    <entry>
-      <key>7 days net</key>
-    </entry>
-    <entry>
-      <key>carriage free</key>
-    </entry>
-    <entry>
-      <key>8 days 2% discount, 30 days net</key>
-    </entry>
-    <entry>
-      <key>CIF</key>
-    </entry>
-    <entry>
-      <key>ex works</key>
-    </entry>
-    <entry>
-      <key>30 days net</key>
-    </entry>
-    <entry>
-      <key>Relation tree</key>
-    </entry>
-    <entry>
-      <key>Directly responsible:</key>
-    </entry>
-    <entry>
-      <key>Payment term</key>
-    </entry>
-    <entry>
-      <key>Contactrole</key>
-    </entry>
-    <entry>
-      <key>Object tree</key>
-    </entry>
-    <entry>
-      <key>New appointment</key>
-    </entry>
-    <entry>
-      <key>&amp;Aufg / Term (%0/%1)</key>
-    </entry>
-    <entry>
-      <key>Verschieben auf Datum?</key>
-    </entry>
-    <entry>
-      <key>niedrig</key>
-    </entry>
-    <entry>
-      <key>Gebucht</key>
-    </entry>
-    <entry>
-      <key>Other Contactroles</key>
-    </entry>
-    <entry>
-      <key>In Bearbeitung</key>
-    </entry>
-    <entry>
-      <key>OK</key>
-    </entry>
-    <entry>
-      <key>Nicht begonnen</key>
-    </entry>
-    <entry>
-      <key>Bitte Filterbedingungen setzen</key>
-    </entry>
-    <entry>
-      <key>keine</key>
-    </entry>
-    <entry>
-      <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
-    </entry>
-    <entry>
-      <key>Aufgaben von</key>
-    </entry>
-    <entry>
-      <key>&amp;Aufgaben (%0)</key>
-    </entry>
-    <entry>
-      <key>hoch</key>
-    </entry>
-    <entry>
-      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
-    </entry>
-    <entry>
-      <key>Erledigt</key>
-    </entry>
-    <entry>
-      <key>Usages</key>
-    </entry>
-    <entry>
-      <key>Abgesagt</key>
-    </entry>
-    <entry>
-      <key>Abbrechen</key>
-    </entry>
-    <entry>
-      <key>delegiert</key>
-    </entry>
-    <entry>
-      <key>frei</key>
-    </entry>
-    <entry>
-      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
-    </entry>
-    <entry>
-      <key>normal</key>
-    </entry>
-    <entry>
-      <key>Termine von</key>
-    </entry>
-    <entry>
-      <key>nur Verschiebung in die Zukunft erlaubt!</key>
-    </entry>
-    <entry>
-      <key>Kategorie</key>
-    </entry>
-    <entry>
-      <key>Product content</key>
-    </entry>
-    <entry>
-      <key>Know How</key>
-    </entry>
-    <entry>
-      <key>Personal appearance</key>
-    </entry>
-    <entry>
-      <key>Market situation</key>
-    </entry>
-    <entry>
-      <key>Liquidity</key>
-    </entry>
-    <entry>
-      <key>Price policy</key>
-    </entry>
-    <entry>
-      <key>Approved</key>
-    </entry>
-    <entry>
-      <key>Completed</key>
-    </entry>
-    <entry>
-      <key>In planning</key>
-    </entry>
-    <entry>
-      <key>Campaign Step</key>
-    </entry>
-    <entry>
-      <key>Campaign Participant</key>
-    </entry>
-    <entry>
-      <key>Campaign Steps</key>
-    </entry>
-    <entry>
-      <key>360 Degree</key>
-    </entry>
-    <entry>
-      <key>Campaigns</key>
-    </entry>
-    <entry>
-      <key>Campaign</key>
-    </entry>
-    <entry>
-      <key>Auswertung</key>
-    </entry>
-    <entry>
-      <key>Reihenfolge</key>
-    </entry>
-    <entry>
-      <key>Zuständiger</key>
-    </entry>
-    <entry>
-      <key>Schritte</key>
-    </entry>
-    <entry>
-      <key>Teilnehmer</key>
-    </entry>
-    <entry>
-      <key>VAT in %</key>
-    </entry>
-    <entry>
-      <key>Kampagnen Schritte</key>
-    </entry>
-    <entry>
-      <key>Kampagnenschritte</key>
-    </entry>
-    <entry>
-      <key>Marketing</key>
-    </entry>
-    <entry>
-      <key>Die maximale Anzahl Teilnehmer ist erreicht!</key>
-    </entry>
-    <entry>
-      <key>Neuer Kampagnenschritt</key>
-    </entry>
-    <entry>
-      <key>Kontakteasdasd</key>
-    </entry>
-    <entry>
-      <key>Ende</key>
-    </entry>
-    <entry>
-      <key>Neue Kampagne</key>
-    </entry>
-    <entry>
-      <key>Beginn</key>
-    </entry>
-    <entry>
-      <key>${QUANTITY_LOWER_THAN_1}</key>
-      <value>Quantity should be greater than 0.</value>
-    </entry>
-    <entry>
-      <key>This combination of person and organisation does already exist and can not be created once more.</key>
-    </entry>
-    <entry>
-      <key>Time in minutes</key>
-    </entry>
-    <entry>
-      <key>Sales manager</key>
-    </entry>
-    <entry>
-      <key>IT</key>
-    </entry>
-    <entry>
-      <key>Administrator</key>
-    </entry>
-    <entry>
-      <key>Managing director</key>
-    </entry>
-    <entry>
-      <key>Production manager</key>
-    </entry>
-    <entry>
-      <key>Production</key>
-    </entry>
-    <entry>
-      <key>CEO</key>
-    </entry>
-    <entry>
-      <key>Purchasing manager</key>
-    </entry>
-    <entry>
-      <key>Marketing manager</key>
-    </entry>
-    <entry>
-      <key>IT manager</key>
-    </entry>
-    <entry>
-      <key>CSO</key>
-    </entry>
-    <entry>
-      <key>Executive board</key>
-    </entry>
-    <entry>
-      <key>Supervisory board</key>
-    </entry>
-    <entry>
-      <key>Management</key>
-    </entry>
-    <entry>
-      <key>New module</key>
-    </entry>
-    <entry>
-      <key>Côte d'Ivoire</key>
-    </entry>
-    <entry>
-      <key>Bitte Datumseingabe prüfen!</key>
-    </entry>
-    <entry>
-      <key>Bestätigt</key>
-    </entry>
-    <entry>
-      <key>Vorläufig</key>
-    </entry>
-    <entry>
-      <key>Saint Barthélemy</key>
-    </entry>
-    <entry>
-      <key>erledigt / zurückgestellt</key>
-    </entry>
-    <entry>
-      <key>Zurückgestellt</key>
-    </entry>
-    <entry>
-      <key>Außer Haus</key>
-    </entry>
-    <entry>
-      <key>Benutzer auswählen</key>
-    </entry>
-    <entry>
-      <key>Ã…land Islands</key>
-    </entry>
-    <entry>
-      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
-    </entry>
-    <entry>
-      <key>Curaçao</key>
-    </entry>
-    <entry>
-      <key>Schlüsselwort</key>
-    </entry>
-    <entry>
-      <key>Réunion</key>
-    </entry>
-    <entry>
-      <key>date of birth must not be in the future</key>
-    </entry>
-    <entry>
-      <key>Manufacturer</key>
-    </entry>
-    <entry>
-      <key>Prospective customer</key>
-    </entry>
-    <entry>
-      <key>Competitor</key>
-    </entry>
-    <entry>
-      <key>Partner</key>
-    </entry>
-    <entry>
-      <key>Attribute Tree</key>
-    </entry>
-    <entry>
-      <key>True</key>
-    </entry>
-    <entry>
-      <key>False</key>
-    </entry>
-    <entry>
-      <key>false</key>
-    </entry>
-    <entry>
-      <key>true</key>
-    </entry>
-    <entry>
-      <key>Protected</key>
-    </entry>
-    <entry>
-      <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
-      <value>%0 has to be between %2 and %3.</value>
-    </entry>
-    <entry>
-      <key>The title already exists!</key>
-    </entry>
-    <entry>
-      <key>Password</key>
-    </entry>
-    <entry>
-      <key>Confirm password</key>
-    </entry>
-    <entry>
-      <key>Set password</key>
-    </entry>
-    <entry>
-      <key>Email</key>
-    </entry>
-    <entry>
-      <key>{$OBJECTLINK_TYPE}</key>
-      <value>Type</value>
-    </entry>
-    <entry>
-      <key>{$OBJECTLINK_OBJECT}</key>
-      <value>Object</value>
-    </entry>
-    <entry>
-      <key>Roles</key>
-    </entry>
-    <entry>
-      <key>Password and confirmation must be the same!</key>
-    </entry>
-    <entry>
-      <key>Begin</key>
-    </entry>
-    <entry>
-      <key>Maturity</key>
-    </entry>
-    <entry>
-      <key>Stored selections</key>
-    </entry>
-    <entry>
-      <key>Username</key>
-    </entry>
-    <entry>
-      <key>The person is already associated with another employee!</key>
-    </entry>
-    <entry>
-      <key>Username already exists!</key>
-    </entry>
-    <entry>
-      <key>Salesproject Phases</key>
-    </entry>
-    <entry>
-      <key>Turnover actual year</key>
-    </entry>
-    <entry>
-      <key>Forecast actual year</key>
-    </entry>
-    <entry>
-      <key>This private person doeas already exist and can not be created once more.</key>
-    </entry>
-    <entry>
-      <key>Everyone</key>
-    </entry>
-    <entry>
-      <key>Project</key>
-    </entry>
-    <entry>
-      <key>Human resources</key>
-    </entry>
-    <entry>
-      <key>Project management</key>
-    </entry>
-    <entry>
-      <key>Office staff</key>
-    </entry>
-    <entry>
-      <key>Field staff</key>
-    </entry>
-    <entry>
-      <key>Resource</key>
-    </entry>
-    <entry>
-      <key>Human Resources</key>
-    </entry>
-    <entry>
-      <key>Email must be unique!</key>
-    </entry>
-    <entry>
-      <key>Project Management</key>
-    </entry>
-    <entry>
-      <key>Support</key>
-    </entry>
-    <entry>
-      <key>{$ADDRESS_IDENTIFIER}</key>
-      <value>Identifier</value>
-    </entry>
-    <entry>
-      <key>Salesproject phases</key>
-    </entry>
-    <entry>
-      <key>Add to Campaign</key>
-    </entry>
-    <entry>
-      <key>Choose a campaign and a step to add the contact to a  campaign</key>
-    </entry>
-    <entry>
-      <key>Max participants</key>
-    </entry>
-    <entry>
-      <key>Participants</key>
-    </entry>
-    <entry>
-      <key>Add the selection to a campaign</key>
-    </entry>
-    <entry>
-      <key>protected</key>
-    </entry>
-    <entry>
-      <key>participants will be added to the selected campaign step</key>
-    </entry>
-    <entry>
-      <key>Add participants to Campaign</key>
-    </entry>
-    <entry>
-      <key>Key figures</key>
-    </entry>
-    <entry>
-      <key>Relation</key>
-    </entry>
-    <entry>
-      <key>Object type 1</key>
-    </entry>
-    <entry>
-      <key>Object type 2</key>
-    </entry>
-    <entry>
-      <key>Title 1</key>
-    </entry>
-    <entry>
-      <key>Title 2</key>
-    </entry>
-    <entry>
-      <key>Hierarchy</key>
-    </entry>
-    <entry>
-      <key>Object relation</key>
-    </entry>
-    <entry>
-      <key>Relation type 1</key>
-    </entry>
-    <entry>
-      <key>Relation type 2</key>
-    </entry>
-    <entry>
-      <key>Relation type</key>
-    </entry>
-    <entry>
-      <key>Context 1</key>
-    </entry>
-    <entry>
-      <key>Context 2</key>
-    </entry>
-    <entry>
-      <key>Delete all usage</key>
-    </entry>
-    <entry>
-      <key>Deleted all usages of \"%0\".</key>
-    </entry>
-    <entry>
-      <key>promotion target ofc</key>
-    </entry>
-    <entry>
-      <key>Successful</key>
-    </entry>
-    <entry>
-      <key>Objectrelation type</key>
-    </entry>
-    <entry>
-      <key>test1eee</key>
-    </entry>
-    <entry>
-      <key>Kennzahlen</key>
-    </entry>
-    <entry>
-      <key>Count</key>
-    </entry>
-    <entry>
-      <key>Forecast actual year </key>
-    </entry>
-    <entry>
-      <key>Type 2 enabled</key>
-    </entry>
-    <entry>
-      <key>test2</key>
-    </entry>
-    <entry>
-      <key>Picture</key>
-    </entry>
-    <entry>
-      <key>Chart</key>
-    </entry>
-    <entry>
-      <key>Salesproject Charts</key>
-    </entry>
-    <entry>
-      <key>Tochter</key>
-    </entry>
-    <entry>
-      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
-    </entry>
-    <entry>
-      <key>Enable relation type 2</key>
-    </entry>
-    <entry>
-      <key>Salesproject Analyses</key>
-    </entry>
-    <entry>
-      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
-    </entry>
-    <entry>
-      <key>ObjectRelationType</key>
-    </entry>
-    <entry>
-      <key>SalesprojectPhase</key>
-    </entry>
-    <entry>
-      <key>SalesprojectState</key>
-    </entry>
-    <entry>
-      <key>Days count</key>
-    </entry>
-    <entry>
-      <key>Clear forecast and set state to \"%0\"?</key>
-    </entry>
-    <entry>
-      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
-    </entry>
-    <entry>
-      <key>Clear forecast and set state to '%0'?</key>
-    </entry>
-    <entry>
-      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
-    </entry>
-    <entry>
-      <key>This cannot be undone!</key>
-    </entry>
-    <entry>
-      <key>Campaign status</key>
-    </entry>
-    <entry>
-      <key>Set campaign step</key>
-    </entry>
-    <entry>
-      <key>Add participant to Campaign</key>
-    </entry>
-    <entry>
-      <key>Steps</key>
-    </entry>
-    <entry>
-      <key>CampaignStep</key>
-    </entry>
-    <entry>
-      <key>Added</key>
-    </entry>
-    <entry>
-      <key>Current participants</key>
-    </entry>
-    <entry>
-      <key>Overdue tasks</key>
-    </entry>
-    <entry>
-      <key>Open tasks</key>
-    </entry>
-    <entry>
-      <key>[%0]the tableName is not a string after interpreting</key>
-    </entry>
-    <entry>
-      <key>[%0]%1 has to be a string or array but it is %2</key>
-    </entry>
-    <entry>
-      <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
-    </entry>
-    <entry>
-      <key>[%0]the columnName is not a string after interpreting</key>
-    </entry>
-    <entry>
-      <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
-    </entry>
-    <entry>
-      <key>Responsible</key>
-    </entry>
-    <entry>
-      <key>New tasks</key>
-    </entry>
-    <entry>
-      <key>Imminent appointments for today</key>
-    </entry>
-    <entry>
-      <key>Analyses</key>
-    </entry>
-    <entry>
-      <key>Imminent appointments for today </key>
-    </entry>
-    <entry>
-      <key>To-Do</key>
-    </entry>
-    <entry>
-      <key>My Tasks</key>
-    </entry>
-    <entry>
-      <key>Calendar</key>
-    </entry>
-    <entry>
-      <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
-      <value>The value for the field %0 is undefined.</value>
-    </entry>
-    <entry>
-      <key>My tasks</key>
-    </entry>
-    <entry>
-      <key>${ATTRIBUTE_VOID}</key>
-      <value>Tag</value>
-    </entry>
-    <entry>
-      <key>Kampagnenzeitraum</key>
-    </entry>
-    <entry>
-      <key>Hauptverantw.</key>
-    </entry>
-    <entry>
-      <key>New campaign step</key>
-    </entry>
-    <entry>
-      <key>Cost</key>
-    </entry>
-    <entry>
-      <key>file '%0' cannot be read</key>
-    </entry>
-    <entry>
-      <key>Campaign costs</key>
-    </entry>
-    <entry>
-      <key>Importer</key>
-    </entry>
-    <entry>
-      <key>Participant</key>
-    </entry>
-    <entry>
-      <key>Printing costs</key>
-    </entry>
-    <entry>
-      <key>Shipping costs</key>
-    </entry>
-    <entry>
-      <key>yyyy-MM-dd HH:mm:ss</key>
-    </entry>
-    <entry>
-      <key>file '%0' does not exist or you have got no permission on this file</key>
-    </entry>
-    <entry>
-      <key>Zip</key>
-    </entry>
-    <entry>
-      <key>Add to campaign</key>
-    </entry>
-    <entry>
-      <key>Layout costs</key>
-    </entry>
-    <entry>
-      <key>Costs</key>
-    </entry>
-    <entry>
-      <key>Fix cost</key>
-    </entry>
-    <entry>
-      <key>Step</key>
-    </entry>
-    <entry>
-      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
-      <value>Webservice not available. URL: %0 %1</value>
-    </entry>
-    <entry>
-      <key>per</key>
-    </entry>
-    <entry>
-      <key>The minimal count can't be larger than the maximal count!</key>
-    </entry>
-    <entry>
-      <key>The max participants count has to be equal or greater than the count of the current participants!</key>
-    </entry>
-    <entry>
-      <key>Variable costs</key>
-    </entry>
-    <entry>
-      <key>Version number</key>
-    </entry>
-    <entry>
-      <key>Id value</key>
-    </entry>
-    <entry>
-      <key>Order executed</key>
-    </entry>
-    <entry>
-      <key>Liquibase</key>
-    </entry>
-    <entry>
-      <key>Number value</key>
-    </entry>
-    <entry>
-      <key>Author</key>
-    </entry>
-    <entry>
-      <key>Position Id</key>
-    </entry>
-    <entry>
-      <key>ISO3</key>
-    </entry>
-    <entry>
-      <key>ISO2</key>
-    </entry>
-    <entry>
-      <key>Communication Id</key>
-    </entry>
-    <entry>
-      <key>Attribute Id</key>
-    </entry>
-    <entry>
-      <key>Modification user</key>
-    </entry>
-    <entry>
-      <key>Headline</key>
-    </entry>
-    <entry>
-      <key>Salesorder Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject milestone Id</key>
-    </entry>
-    <entry>
-      <key>Appointment Id</key>
-    </entry>
-    <entry>
-      <key>Locked</key>
-    </entry>
-    <entry>
-      <key>Timetracking Id</key>
-    </entry>
-    <entry>
-      <key>Salesorder date</key>
-    </entry>
-    <entry>
-      <key>Exec type</key>
-    </entry>
-    <entry>
-      <key>Date value</key>
-    </entry>
-    <entry>
-      <key>NUMBER VALUE</key>
-    </entry>
-    <entry>
-      <key>Salesproject forecast Id</key>
-    </entry>
-    <entry>
-      <key>ID</key>
-    </entry>
-    <entry>
-      <key>Keyword attribute relation Id</key>
-    </entry>
-    <entry>
-      <key>Minimal count</key>
-    </entry>
-    <entry>
-      <key>Id</key>
-    </entry>
-    <entry>
-      <key>Start date</key>
-    </entry>
-    <entry>
-      <key>Object 1 row Id</key>
-    </entry>
-    <entry>
-      <key>Side</key>
-    </entry>
-    <entry>
-      <key>Salesproject Id</key>
-    </entry>
-    <entry>
-      <key>Product Id</key>
-    </entry>
-    <entry>
-      <key>Sort</key>
-    </entry>
-    <entry>
-      <key>Relation Title</key>
-    </entry>
-    <entry>
-      <key>%0 \"%1\"</key>
-    </entry>
-    <entry>
-      <key>Maximal count</key>
-    </entry>
-    <entry>
-      <key>Data executed</key>
-    </entry>
-    <entry>
-      <key>Indexsearch</key>
-    </entry>
-    <entry>
-      <key>Appointment link Id</key>
-    </entry>
-    <entry>
-      <key>Relation Type</key>
-    </entry>
-    <entry>
-      <key>Salesproject member Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject source Id</key>
-    </entry>
-    <entry>
-      <key>Item sort</key>
-    </entry>
-    <entry>
-      <key>%0 modified.</key>
-    </entry>
-    <entry>
-      <key>Contract Id</key>
-    </entry>
-    <entry>
-      <key>Int value</key>
-    </entry>
-    <entry>
-      <key>Object 2 row Id</key>
-    </entry>
-    <entry>
-      <key>Source tablename Id</key>
-    </entry>
-    <entry>
-      <key>Source tablename</key>
-    </entry>
-    <entry>
-      <key>Contact Id</key>
-    </entry>
-    <entry>
-      <key>Sales area</key>
-    </entry>
-    <entry>
-      <key>Parent Id</key>
-    </entry>
-    <entry>
-      <key>Task link Id</key>
-    </entry>
-    <entry>
-      <key>Protection level</key>
-    </entry>
-    <entry>
-      <key>Salesorder code</key>
-    </entry>
-    <entry>
-      <key>Class</key>
-    </entry>
-    <entry>
-      <key>BOOL VALUE</key>
-    </entry>
-    <entry>
-      <key>Keyword attribute Id</key>
-    </entry>
-    <entry>
-      <key>Log type</key>
-    </entry>
-    <entry>
-      <key>Object row Id</key>
-    </entry>
-    <entry>
-      <key>Labels</key>
-    </entry>
-    <entry>
-      <key>%0 deleted.</key>
-    </entry>
-    <entry>
-      <key>Salesproject competition Id</key>
-    </entry>
-    <entry>
-      <key>Activity Id</key>
-    </entry>
-    <entry>
-      <key>Person Id</key>
-    </entry>
-    <entry>
-      <key>Offer item Id</key>
-    </entry>
-    <entry>
-      <key>Offer Id</key>
-    </entry>
-    <entry>
-      <key>Name native</key>
-    </entry>
-    <entry>
-      <key>Flag</key>
-    </entry>
-    <entry>
-      <key>Address Id</key>
-    </entry>
-    <entry>
-      <key>Name latin</key>
-    </entry>
-    <entry>
-      <key>Destination Id</key>
-    </entry>
-    <entry>
-      <key>Sex</key>
-    </entry>
-    <entry>
-      <key>Product price Id</key>
-    </entry>
-    <entry>
-      <key>%0 added.</key>
-    </entry>
-    <entry>
-      <key>Object Relation Type</key>
-    </entry>
-    <entry>
-      <key>Entry date</key>
-    </entry>
-    <entry>
-      <key>Object relation type 2</key>
-    </entry>
-    <entry>
-      <key>Object relation type 1</key>
-    </entry>
-    <entry>
-      <key>Modification date</key>
-    </entry>
-    <entry>
-      <key>Object Type</key>
-    </entry>
-    <entry>
-      <key>%0 from \"%1\" to \"%2\"</key>
-    </entry>
-    <entry>
-      <key>MD5 Sum</key>
-    </entry>
-    <entry>
-      <key>Letter salutation</key>
-    </entry>
-    <entry>
-      <key>Lock granted</key>
-    </entry>
-    <entry>
-      <key>Required fields</key>
-    </entry>
-    <entry>
-      <key>Address addition</key>
-    </entry>
-    <entry>
-      <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
-    </entry>
-    <entry>
-      <key>Attribute usage Id</key>
-    </entry>
-    <entry>
-      <key>LogHistory</key>
-    </entry>
-    <entry>
-      <key>Locked by</key>
-    </entry>
-    <entry>
-      <key>Desciption</key>
-    </entry>
-    <entry>
-      <key>Salutation Id</key>
-    </entry>
-    <entry>
-      <key>Comments</key>
-    </entry>
-    <entry>
-      <key>Task Id</key>
-    </entry>
-    <entry>
-      <key>Valid to</key>
-    </entry>
-    <entry>
-      <key>ZIP regex</key>
-    </entry>
-    <entry>
-      <key>Keyword entry Id</key>
-    </entry>
-    <entry>
-      <key>Salesproject classification Id</key>
-    </entry>
-    <entry>
-      <key>Stop costs</key>
-    </entry>
-    <entry>
-      <key>Contexts</key>
-    </entry>
-    <entry>
-      <key>Assigned to</key>
-    </entry>
-    <entry>
-      <key>%0 from \"%1\" to %2 \"%3\"</key>
-    </entry>
-    <entry>
-      <key>Date start</key>
-    </entry>
-    <entry>
-      <key>Cover Letter</key>
-    </entry>
-    <entry>
-      <key>Deployment Id</key>
-    </entry>
-    <entry>
-      <key>Address format</key>
-    </entry>
-    <entry>
-      <key>Activity link Id</key>
-    </entry>
-    <entry>
-      <key>Date end</key>
-    </entry>
-    <entry>
-      <key>Creation user</key>
-    </entry>
-    <entry>
-      <key>Unit Price</key>
-    </entry>
-    <entry>
-      <key>Object Id</key>
-    </entry>
-    <entry>
-      <key>Is active</key>
-    </entry>
-    <entry>
-      <key>Product relationship</key>
-    </entry>
-    <entry>
-      <key>Salesorder item Id</key>
-    </entry>
-    <entry>
-      <key>Char value</key>
-    </entry>
-    <entry>
-      <key>Attribute relation Id</key>
-    </entry>
-    <entry>
-      <key>Tag</key>
-    </entry>
-    <entry>
-      <key>Title suffix</key>
-    </entry>
-    <entry>
-      <key>Step costs</key>
-    </entry>
-    <entry>
-      <key>Min. Stock</key>
-    </entry>
-    <entry>
-      <key>User</key>
-    </entry>
-    <entry>
-      <key>Stock Id</key>
-    </entry>
-    <entry>
-      <key>Tablename</key>
-    </entry>
-    <entry>
-      <key>CHAR VALUE</key>
-    </entry>
-    <entry>
-      <key>Parent context</key>
-    </entry>
-    <entry>
-      <key>Organisation Id</key>
-    </entry>
-    <entry>
-      <key>Tablename Id</key>
-    </entry>
-    <entry>
-      <key>Offer date</key>
-    </entry>
-    <entry>
-      <key>Competitors</key>
-    </entry>
-    <entry>
-      <key>Notifications</key>
-    </entry>
-    <entry>
-      <key>Overview</key>
-    </entry>
-    <entry>
-      <key>Participated</key>
-    </entry>
-    <entry>
-      <key>Remaining Runtime</key>
-    </entry>
-    <entry>
-      <key>Document Template</key>
-    </entry>
-    <entry>
-      <key>Document Templates</key>
-    </entry>
-    <entry>
-      <key>Text Modular</key>
-    </entry>
-    <entry>
-      <key>Serial</key>
-    </entry>
-    <entry>
-      <key>Campaign Period</key>
-    </entry>
-    <entry>
-      <key>Single</key>
-    </entry>
-    <entry>
-      <key>Attachment</key>
-    </entry>
-    <entry>
-      <key>Attachments</key>
-    </entry>
-    <entry>
-      <key>Letter</key>
-    </entry>
-    <entry>
-      <key>Appointment</key>
-    </entry>
-    <entry>
-      <key>ARCHIEVED</key>
-    </entry>
-    <entry>
-      <key>UNSEEN</key>
-    </entry>
-    <entry>
-      <key>TODELETE</key>
-    </entry>
-    <entry>
-      <key>CONFIRMED</key>
-    </entry>
-    <entry>
-      <key>SEEN</key>
-    </entry>
-    <entry>
-      <key>rebuild Index</key>
-    </entry>
-    <entry>
-      <key>Charts</key>
-    </entry>
-    <entry>
-      <key>Keywords</key>
-    </entry>
-    <entry>
-      <key>Days running</key>
-    </entry>
-    <entry>
-      <key>Logs</key>
-    </entry>
-    <entry>
-      <key>Mail</key>
-    </entry>
-    <entry>
-      <key>Phonecall</key>
-    </entry>
-    <entry>
-      <key>Chart 2</key>
-    </entry>
-    <entry>
-      <key>Log</key>
-    </entry>
-    <entry>
-      <key>Offer Header Text</key>
-    </entry>
-    <entry>
-      <key>Employees</key>
-    </entry>
-    <entry>
-      <key>Todo</key>
-    </entry>
-    <entry>
-      <key>Days remaining</key>
-    </entry>
-    <entry>
-      <key>Offer Footer Text</key>
-    </entry>
-    <entry>
-      <key>Date new</key>
-    </entry>
-    <entry>
-      <key>Date edit</key>
-    </entry>
-    <entry>
-      <key>Keyword Attributes</key>
-    </entry>
-    <entry>
-      <key>HTML</key>
-    </entry>
-  </keyValueMap>
-  <font name="Dialog" style="0" size="11" />
-</language>
+<?xml version="1.0" encoding="UTF-8"?>
+<language 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/language/1.2.0">
+  <name>_____LANGUAGE_en</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <language>en</language>
+  <country></country>
+  <variant></variant>
+  <keyValueMap>
+    <entry>
+      <key>Company</key>
+    </entry>
+    <entry>
+      <key>E-Mail</key>
+    </entry>
+    <entry>
+      <key>Male</key>
+    </entry>
+    <entry>
+      <key>Activity</key>
+    </entry>
+    <entry>
+      <key>Name</key>
+    </entry>
+    <entry>
+      <key>Austria</key>
+    </entry>
+    <entry>
+      <key>Customercode</key>
+    </entry>
+    <entry>
+      <key>Status</key>
+    </entry>
+    <entry>
+      <key>Active</key>
+    </entry>
+    <entry>
+      <key>Medium</key>
+    </entry>
+    <entry>
+      <key>Internet</key>
+    </entry>
+    <entry>
+      <key>Germany</key>
+    </entry>
+    <entry>
+      <key>Online-Meeting</key>
+    </entry>
+    <entry>
+      <key>Social Media</key>
+    </entry>
+    <entry>
+      <key>Visit</key>
+    </entry>
+    <entry>
+      <key>Information</key>
+    </entry>
+    <entry>
+      <key>Print Offer</key>
+    </entry>
+    <entry>
+      <key>Language</key>
+    </entry>
+    <entry>
+      <key>Phone</key>
+    </entry>
+    <entry>
+      <key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
+    </entry>
+    <entry>
+      <key>Activities</key>
+    </entry>
+    <entry>
+      <key>Female</key>
+    </entry>
+    <entry>
+      <key>Contactmanagement</key>
+    </entry>
+    <entry>
+      <key>Mobile</key>
+    </entry>
+    <entry>
+      <key>Office address</key>
+    </entry>
+    <entry>
+      <key>Contact</key>
+    </entry>
+    <entry>
+      <key>Home address</key>
+    </entry>
+    <entry>
+      <key>Type</key>
+    </entry>
+    <entry>
+      <key>Contacts</key>
+    </entry>
+    <entry>
+      <key>Norway</key>
+    </entry>
+    <entry>
+      <key>the param \"%0\" in \"%1\" is mandatory and has to be set</key>
+    </entry>
+    <entry>
+      <key>Address</key>
+    </entry>
+    <entry>
+      <key>Addresses</key>
+    </entry>
+    <entry>
+      <key>${COMM_ADDRESS}</key>
+      <value>Address</value>
+    </entry>
+    <entry>
+      <key>Gender</key>
+    </entry>
+    <entry>
+      <key>Date of birth</key>
+    </entry>
+    <entry>
+      <key>Lastname</key>
+    </entry>
+    <entry>
+      <key>Salutation</key>
+    </entry>
+    <entry>
+      <key>Middlename</key>
+    </entry>
+    <entry>
+      <key>Title</key>
+    </entry>
+    <entry>
+      <key>Addresstype</key>
+    </entry>
+    <entry>
+      <key>Firstname</key>
+    </entry>
+    <entry>
+      <key>Description</key>
+    </entry>
+    <entry>
+      <key>Direction</key>
+    </entry>
+    <entry>
+      <key>Entrydate</key>
+    </entry>
+    <entry>
+      <key>Subject</key>
+    </entry>
+    <entry>
+      <key>Post office box</key>
+    </entry>
+    <entry>
+      <key>Delivery address</key>
+    </entry>
+    <entry>
+      <key>House number</key>
+    </entry>
+    <entry>
+      <key>Country</key>
+    </entry>
+    <entry>
+      <key>Communication</key>
+    </entry>
+    <entry>
+      <key>postcode</key>
+    </entry>
+    <entry>
+      <key>City</key>
+    </entry>
+    <entry>
+      <key>State</key>
+    </entry>
+    <entry>
+      <key>Region</key>
+    </entry>
+    <entry>
+      <key>District</key>
+    </entry>
+    <entry>
+      <key>Switzerland</key>
+    </entry>
+    <entry>
+      <key>Internal (2)</key>
+    </entry>
+    <entry>
+      <key>Company Addresses</key>
+    </entry>
+    <entry>
+      <key>yyyyMMdd</key>
+    </entry>
+    <entry>
+      <key>standard address</key>
+    </entry>
+    <entry>
+      <key>PP</key>
+    </entry>
+    <entry>
+      <key>VAT</key>
+    </entry>
+    <entry>
+      <key>The expiry date must be after the start date!</key>
+    </entry>
+    <entry>
+      <key>Product</key>
+    </entry>
+    <entry>
+      <key>Developer</key>
+    </entry>
+    <entry>
+      <key>Valid until</key>
+    </entry>
+    <entry>
+      <key>Price list</key>
+    </entry>
+    <entry>
+      <key>Currency</key>
+    </entry>
+    <entry>
+      <key>Payment method</key>
+    </entry>
+    <entry>
+      <key>Price list / Company</key>
+    </entry>
+    <entry>
+      <key>Curr. sales price</key>
+    </entry>
+    <entry>
+      <key>Contract</key>
+    </entry>
+    <entry>
+      <key>Stock</key>
+    </entry>
+    <entry>
+      <key>PP/SP</key>
+    </entry>
+    <entry>
+      <key>Next due date</key>
+    </entry>
+    <entry>
+      <key>Discount</key>
+    </entry>
+    <entry>
+      <key>The next due date must be after the start of the contract and before the expiry of the contract!</key>
+    </entry>
+    <entry>
+      <key>Sales</key>
+    </entry>
+    <entry>
+      <key>Contract number</key>
+    </entry>
+    <entry>
+      <key>Min. stock</key>
+    </entry>
+    <entry>
+      <key>SP</key>
+    </entry>
+    <entry>
+      <key>Commodity group 3</key>
+    </entry>
+    <entry>
+      <key>Commodity group 2</key>
+    </entry>
+    <entry>
+      <key>Commodity group 1</key>
+    </entry>
+    <entry>
+      <key>Contract start date</key>
+    </entry>
+    <entry>
+      <key>Spare parts</key>
+    </entry>
+    <entry>
+      <key>Unit</key>
+    </entry>
+    <entry>
+      <key>Contract expiry date</key>
+    </entry>
+    <entry>
+      <key>Yes</key>
+    </entry>
+    <entry>
+      <key>Type of contract</key>
+    </entry>
+    <entry>
+      <key>No</key>
+    </entry>
+    <entry>
+      <key>Service</key>
+    </entry>
+    <entry>
+      <key>Cancelled</key>
+    </entry>
+    <entry>
+      <key>Advertising material</key>
+    </entry>
+    <entry>
+      <key>Valid from</key>
+    </entry>
+    <entry>
+      <key>Product name</key>
+    </entry>
+    <entry>
+      <key>Product group</key>
+    </entry>
+    <entry>
+      <key>${CONTRACT_STATUS}</key>
+      <value>Status</value>
+    </entry>
+    <entry>
+      <key>From no. of units</key>
+    </entry>
+    <entry>
+      <key>Price</key>
+    </entry>
+    <entry>
+      <key>Conditions</key>
+    </entry>
+    <entry>
+      <key>Standard</key>
+    </entry>
+    <entry>
+      <key>I / O</key>
+    </entry>
+    <entry>
+      <key>Date</key>
+    </entry>
+    <entry>
+      <key>IN</key>
+    </entry>
+    <entry>
+      <key>OUT</key>
+    </entry>
+    <entry>
+      <key>Warehouse</key>
+    </entry>
+    <entry>
+      <key>Reference</key>
+    </entry>
+    <entry>
+      <key>The contract number already exists!</key>
+    </entry>
+    <entry>
+      <key>The product number already exists!</key>
+    </entry>
+    <entry>
+      <key>Quantity</key>
+    </entry>
+    <entry>
+      <key>Salesproject</key>
+    </entry>
+    <entry>
+      <key>Rollout</key>
+    </entry>
+    <entry>
+      <key>Phase</key>
+    </entry>
+    <entry>
+      <key>Product number</key>
+    </entry>
+    <entry>
+      <key>Project number</key>
+    </entry>
+    <entry>
+      <key>Project title</key>
+    </entry>
+    <entry>
+      <key>Project start</key>
+    </entry>
+    <entry>
+      <key>Volume</key>
+    </entry>
+    <entry>
+      <key>Partial order</key>
+    </entry>
+    <entry>
+      <key>Open</key>
+    </entry>
+    <entry>
+      <key>Lost</key>
+    </entry>
+    <entry>
+      <key>Order</key>
+    </entry>
+    <entry>
+      <key>Postponed</key>
+    </entry>
+    <entry>
+      <key>Aborted</key>
+    </entry>
+    <entry>
+      <key>Negotiation</key>
+    </entry>
+    <entry>
+      <key>Workshop</key>
+    </entry>
+    <entry>
+      <key>Presentation preparation</key>
+    </entry>
+    <entry>
+      <key>Specifications in progress</key>
+    </entry>
+    <entry>
+      <key>Project decision</key>
+    </entry>
+    <entry>
+      <key>Lead</key>
+    </entry>
+    <entry>
+      <key>Total net</key>
+    </entry>
+    <entry>
+      <key>Offer</key>
+    </entry>
+    <entry>
+      <key>Offer number</key>
+    </entry>
+    <entry>
+      <key>Probability</key>
+    </entry>
+    <entry>
+      <key>Total VAT</key>
+    </entry>
+    <entry>
+      <key>The offer number already exists!</key>
+    </entry>
+    <entry>
+      <key>0 %</key>
+    </entry>
+    <entry>
+      <key>75 %</key>
+    </entry>
+    <entry>
+      <key>100 %</key>
+    </entry>
+    <entry>
+      <key>25 %</key>
+    </entry>
+    <entry>
+      <key>50 %</key>
+    </entry>
+    <entry>
+      <key>Won</key>
+    </entry>
+    <entry>
+      <key>Checked</key>
+    </entry>
+    <entry>
+      <key>Sent</key>
+    </entry>
+    <entry>
+      <key>Offeritems</key>
+    </entry>
+    <entry>
+      <key>Header text</key>
+    </entry>
+    <entry>
+      <key>Commodity group</key>
+    </entry>
+    <entry>
+      <key>Footer text</key>
+    </entry>
+    <entry>
+      <key>Designation</key>
+    </entry>
+    <entry>
+      <key>Position</key>
+    </entry>
+    <entry>
+      <key>Optional</key>
+    </entry>
+    <entry>
+      <key>Article</key>
+    </entry>
+    <entry>
+      <key>Offeritem</key>
+    </entry>
+    <entry>
+      <key>Sum</key>
+    </entry>
+    <entry>
+      <key>Option4</key>
+    </entry>
+    <entry>
+      <key>Option3</key>
+    </entry>
+    <entry>
+      <key>Option2</key>
+    </entry>
+    <entry>
+      <key>Option1</key>
+    </entry>
+    <entry>
+      <key>Countries</key>
+    </entry>
+    <entry>
+      <key>Options</key>
+    </entry>
+    <entry>
+      <key>Total gross</key>
+    </entry>
+    <entry>
+      <key>Identical price list found!</key>
+    </entry>
+    <entry>
+      <key>Parts list</key>
+    </entry>
+    <entry>
+      <key>${THOUSAND_SHORT}</key>
+      <value>T</value>
+    </entry>
+    <entry>
+      <key>Deliver opinion</key>
+    </entry>
+    <entry>
+      <key>Presentation follow-up</key>
+    </entry>
+    <entry>
+      <key>Waiting for requirements</key>
+    </entry>
+    <entry>
+      <key>Parent</key>
+    </entry>
+    <entry>
+      <key>${EURO_SIGN}</key>
+      <value>?</value>
+    </entry>
+    <entry>
+      <key>Planned</key>
+    </entry>
+    <entry>
+      <key>Info</key>
+    </entry>
+    <entry>
+      <key>${VOLUME_MONEY}</key>
+      <value>Volume</value>
+    </entry>
+    <entry>
+      <key>Milestones</key>
+    </entry>
+    <entry>
+      <key>Milestone</key>
+    </entry>
+    <entry>
+      <key>Excreted</key>
+    </entry>
+    <entry>
+      <key>Reason</key>
+    </entry>
+    <entry>
+      <key>Document</key>
+    </entry>
+    <entry>
+      <key>Competition</key>
+    </entry>
+    <entry>
+      <key>Forecast</key>
+    </entry>
+    <entry>
+      <key>Datei</key>
+    </entry>
+    <entry>
+      <key>Role</key>
+    </entry>
+    <entry>
+      <key>End date</key>
+    </entry>
+    <entry>
+      <key>Documents</key>
+    </entry>
+    <entry>
+      <key>Curr. purchase price</key>
+    </entry>
+    <entry>
+      <key>New offer version</key>
+    </entry>
+    <entry>
+      <key>Vers. no.</key>
+    </entry>
+    <entry>
+      <key>Copy offer</key>
+    </entry>
+    <entry>
+      <key>Contracts</key>
+    </entry>
+    <entry>
+      <key>Classification</key>
+    </entry>
+    <entry>
+      <key>Class A</key>
+    </entry>
+    <entry>
+      <key>Class C</key>
+    </entry>
+    <entry>
+      <key>Class B</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_WRONG_FIELD_TYPE}</key>
+      <value>fieldOrTableName has to be a string or array of 2 strings.</value>
+    </entry>
+    <entry>
+      <key>High price strategy</key>
+    </entry>
+    <entry>
+      <key>Low price strategy</key>
+    </entry>
+    <entry>
+      <key>Uid</key>
+    </entry>
+    <entry>
+      <key>in 6 Months</key>
+    </entry>
+    <entry>
+      <key>Budget (Project)</key>
+    </entry>
+    <entry>
+      <key>to</key>
+    </entry>
+    <entry>
+      <key>Other</key>
+    </entry>
+    <entry>
+      <key>Individual</key>
+    </entry>
+    <entry>
+      <key>Organisation</key>
+    </entry>
+    <entry>
+      <key>Base</key>
+    </entry>
+    <entry>
+      <key>in 12 Months</key>
+    </entry>
+    <entry>
+      <key>Standard / Individual</key>
+    </entry>
+    <entry>
+      <key>Please update the ${FORECAST_ENGLISH}.</key>
+      <value>Please update the forecast.</value>
+    </entry>
+    <entry>
+      <key>no Project planned</key>
+    </entry>
+    <entry>
+      <key>Strength 3</key>
+    </entry>
+    <entry>
+      <key>Strength 1</key>
+    </entry>
+    <entry>
+      <key>Strength 2</key>
+    </entry>
+    <entry>
+      <key>Value</key>
+    </entry>
+    <entry>
+      <key>Weakness 1</key>
+    </entry>
+    <entry>
+      <key>Weakness 2</key>
+    </entry>
+    <entry>
+      <key>Weakness 3</key>
+    </entry>
+    <entry>
+      <key>Projectstart</key>
+    </entry>
+    <entry>
+      <key>no valid format</key>
+    </entry>
+    <entry>
+      <key>Pos.</key>
+    </entry>
+    <entry>
+      <key>ISO 3166-1 alpha-3</key>
+    </entry>
+    <entry>
+      <key>ISO 3166-1 alpha-2</key>
+    </entry>
+    <entry>
+      <key>0.00</key>
+    </entry>
+    <entry>
+      <key>Relationship</key>
+    </entry>
+    <entry>
+      <key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
+      <value>For this binary field only one data-item is allowed</value>
+    </entry>
+    <entry>
+      <key>Native Name</key>
+    </entry>
+    <entry>
+      <key>#,##0</key>
+    </entry>
+    <entry>
+      <key>New offer</key>
+    </entry>
+    <entry>
+      <key>dd.MM.yyyy</key>
+      <value>MM/dd/yyyy</value>
+    </entry>
+    <entry>
+      <key>no valid mail-address format</key>
+    </entry>
+    <entry>
+      <key>#,##0.00</key>
+    </entry>
+    <entry>
+      <key>Latin Name</key>
+    </entry>
+    <entry>
+      <key>Organisation name</key>
+    </entry>
+    <entry>
+      <key>Connection</key>
+    </entry>
+    <entry>
+      <key>standard email</key>
+    </entry>
+    <entry>
+      <key>Edit defaults</key>
+    </entry>
+    <entry>
+      <key>Creator</key>
+    </entry>
+    <entry>
+      <key>Timetracking</key>
+    </entry>
+    <entry>
+      <key>Further informations</key>
+    </entry>
+    <entry>
+      <key>Social</key>
+    </entry>
+    <entry>
+      <key>Facebook Feed</key>
+    </entry>
+    <entry>
+      <key>Group1</key>
+    </entry>
+    <entry>
+      <key>Group2</key>
+    </entry>
+    <entry>
+      <key>Details</key>
+    </entry>
+    <entry>
+      <key>Prices</key>
+    </entry>
+    <entry>
+      <key>Twitter</key>
+    </entry>
+    <entry>
+      <key>Connections</key>
+    </entry>
+    <entry>
+      <key>Object</key>
+    </entry>
+    <entry>
+      <key>Attributes</key>
+    </entry>
+    <entry>
+      <key>Facebook</key>
+    </entry>
+    <entry>
+      <key>Creation date</key>
+    </entry>
+    <entry>
+      <key>Maindocuments</key>
+    </entry>
+    <entry>
+      <key>Receipt</key>
+    </entry>
+    <entry>
+      <key>Receipt number</key>
+    </entry>
+    <entry>
+      <key>Year</key>
+    </entry>
+    <entry>
+      <key>New receipt version</key>
+    </entry>
+    <entry>
+      <key>Orderitems</key>
+    </entry>
+    <entry>
+      <key>Sent receipts</key>
+    </entry>
+    <entry>
+      <key>Copy receipt</key>
+    </entry>
+    <entry>
+      <key>Orderitem</key>
+    </entry>
+    <entry>
+      <key>The order number already exists!</key>
+    </entry>
+    <entry>
+      <key>New activity</key>
+    </entry>
+    <entry>
+      <key>Turnover</key>
+    </entry>
+    <entry>
+      <key>Sent offers</key>
+    </entry>
+    <entry>
+      <key>Show all activities</key>
+    </entry>
+    <entry>
+      <key>Offers</key>
+    </entry>
+    <entry>
+      <key>Show all sent offers</key>
+    </entry>
+    <entry>
+      <key>Show my activities</key>
+    </entry>
+    <entry>
+      <key>Show all receipts</key>
+    </entry>
+    <entry>
+      <key>Receipts</key>
+    </entry>
+    <entry>
+      <key>My Activities</key>
+    </entry>
+    <entry>
+      <key>Show all offers</key>
+    </entry>
+    <entry>
+      <key>Show all products</key>
+    </entry>
+    <entry>
+      <key>Show all Facebook posts of a user</key>
+    </entry>
+    <entry>
+      <key>Show all tweets of a user</key>
+    </entry>
+    <entry>
+      <key>Show all companies</key>
+    </entry>
+    <entry>
+      <key>Show all tweets of ADITO</key>
+    </entry>
+    <entry>
+      <key>Show all sent receipts</key>
+    </entry>
+    <entry>
+      <key>Products</key>
+    </entry>
+    <entry>
+      <key>Show all Facebook posts of ADITO</key>
+    </entry>
+    <entry>
+      <key>Companies</key>
+    </entry>
+    <entry>
+      <key>Show all contacts</key>
+    </entry>
+    <entry>
+      <key>Show open salesprojects</key>
+    </entry>
+    <entry>
+      <key>Show all contracts</key>
+    </entry>
+    <entry>
+      <key>Salesprojects</key>
+    </entry>
+    <entry>
+      <key>Show all salesprojects</key>
+    </entry>
+    <entry>
+      <key>Open salesprojects</key>
+    </entry>
+    <entry>
+      <key>July</key>
+    </entry>
+    <entry>
+      <key>ADITO Facebook Feed</key>
+    </entry>
+    <entry>
+      <key>ADITO Twitter Feed</key>
+    </entry>
+    <entry>
+      <key>June</key>
+    </entry>
+    <entry>
+      <key>October</key>
+    </entry>
+    <entry>
+      <key>Take price</key>
+    </entry>
+    <entry>
+      <key>Twitter Feed</key>
+    </entry>
+    <entry>
+      <key>November</key>
+    </entry>
+    <entry>
+      <key>December</key>
+    </entry>
+    <entry>
+      <key>May</key>
+    </entry>
+    <entry>
+      <key>April</key>
+    </entry>
+    <entry>
+      <key>January</key>
+    </entry>
+    <entry>
+      <key>March</key>
+    </entry>
+    <entry>
+      <key>September</key>
+    </entry>
+    <entry>
+      <key>August</key>
+    </entry>
+    <entry>
+      <key>Category</key>
+    </entry>
+    <entry>
+      <key>February</key>
+    </entry>
+    <entry>
+      <key>Abomodel</key>
+    </entry>
+    <entry>
+      <key>Confirmed</key>
+    </entry>
+    <entry>
+      <key>OutOfOffice</key>
+    </entry>
+    <entry>
+      <key>Articledescription</key>
+    </entry>
+    <entry>
+      <key>Articlenumber</key>
+    </entry>
+    <entry>
+      <key>Industry 3</key>
+    </entry>
+    <entry>
+      <key>Industry 2</key>
+    </entry>
+    <entry>
+      <key>Industry 1</key>
+    </entry>
+    <entry>
+      <key>Industry</key>
+    </entry>
+    <entry>
+      <key>Put Reciever Into To</key>
+    </entry>
+    <entry>
+      <key>Unitprice</key>
+    </entry>
+    <entry>
+      <key>Free</key>
+    </entry>
+    <entry>
+      <key>From</key>
+    </entry>
+    <entry>
+      <key>Total</key>
+    </entry>
+    <entry>
+      <key>yearly series not specified</key>
+    </entry>
+    <entry>
+      <key>no standard email office</key>
+    </entry>
+    <entry>
+      <key>Conditions of payment</key>
+    </entry>
+    <entry>
+      <key>Number</key>
+    </entry>
+    <entry>
+      <key>Amount</key>
+    </entry>
+    <entry>
+      <key>Deliveryspecification</key>
+    </entry>
+    <entry>
+      <key>Ignore daily series</key>
+    </entry>
+    <entry>
+      <key>Tentative</key>
+    </entry>
+    <entry>
+      <key>Ignore series</key>
+    </entry>
+    <entry>
+      <key>Plus Salestax</key>
+    </entry>
+    <entry>
+      <key>Choose address</key>
+    </entry>
+    <entry>
+      <key>Customer Base Sheet</key>
+    </entry>
+    <entry>
+      <key>{$TASK_STATUS}</key>
+      <value>status</value>
+    </entry>
+    <entry>
+      <key>Task</key>
+    </entry>
+    <entry>
+      <key>subject</key>
+    </entry>
+    <entry>
+      <key>{$TASK_REQUESTOR}</key>
+      <value>requestor</value>
+    </entry>
+    <entry>
+      <key>task number</key>
+    </entry>
+    <entry>
+      <key>{$TASK_EDITOR}</key>
+      <value>editor</value>
+    </entry>
+    <entry>
+      <key>description</key>
+    </entry>
+    <entry>
+      <key>priority</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_HIGH}</key>
+      <value>high</value>
+    </entry>
+    <entry>
+      <key>Seite</key>
+    </entry>
+    <entry>
+      <key>Note</key>
+    </entry>
+    <entry>
+      <key>Senden per E-Mail</key>
+    </entry>
+    <entry>
+      <key>Hauptdokument</key>
+    </entry>
+    <entry>
+      <key>Betreff</key>
+    </entry>
+    <entry>
+      <key>title</key>
+    </entry>
+    <entry>
+      <key>von</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_LOW}</key>
+      <value>low</value>
+    </entry>
+    <entry>
+      <key>Nur Eigene anzeigen</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_NORMAL}</key>
+      <value>normal</value>
+    </entry>
+    <entry>
+      <key>Beschreibung</key>
+    </entry>
+    <entry>
+      <key>Unit price</key>
+    </entry>
+    <entry>
+      <key>Firma</key>
+    </entry>
+    <entry>
+      <key>type</key>
+    </entry>
+    <entry>
+      <key>Benutzer</key>
+    </entry>
+    <entry>
+      <key>{$TASK_PRIORITY_NONE}</key>
+      <value>none</value>
+    </entry>
+    <entry>
+      <key>Termin</key>
+    </entry>
+    <entry>
+      <key>Vorschau</key>
+    </entry>
+    <entry>
+      <key>Angebot</key>
+    </entry>
+    <entry>
+      <key>details</key>
+    </entry>
+    <entry>
+      <key>Contact type</key>
+    </entry>
+    <entry>
+      <key>Communication data</key>
+    </entry>
+    <entry>
+      <key>Remark</key>
+    </entry>
+    <entry>
+      <key>Department</key>
+    </entry>
+    <entry>
+      <key>Tasks</key>
+    </entry>
+    <entry>
+      <key>Employee</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_MEMBER}</key>
+      <value>Project member</value>
+    </entry>
+    <entry>
+      <key>responsible</key>
+    </entry>
+    <entry>
+      <key>Kundenstammblatt</key>
+    </entry>
+    <entry>
+      <key>Person</key>
+    </entry>
+    <entry>
+      <key>Detail</key>
+    </entry>
+    <entry>
+      <key>Object 2</key>
+    </entry>
+    <entry>
+      <key>Object 1</key>
+    </entry>
+    <entry>
+      <key>Type 2</key>
+    </entry>
+    <entry>
+      <key>Type 1</key>
+    </entry>
+    <entry>
+      <key>Relations</key>
+    </entry>
+    <entry>
+      <key>${FORECAST_ENGLISH}</key>
+      <value>Forecast</value>
+    </entry>
+    <entry>
+      <key>Usage</key>
+    </entry>
+    <entry>
+      <key>Maximal Count</key>
+    </entry>
+    <entry>
+      <key>Minimal Count</key>
+    </entry>
+    <entry>
+      <key>${ADDRESS_STATE}</key>
+    </entry>
+    <entry>
+      <key>Title (original language)</key>
+    </entry>
+    <entry>
+      <key>Attribute Relation</key>
+    </entry>
+    <entry>
+      <key>Attribute Usage</key>
+    </entry>
+    <entry>
+      <key>Key</key>
+    </entry>
+    <entry>
+      <key>Attribute</key>
+    </entry>
+    <entry>
+      <key>Container</key>
+    </entry>
+    <entry>
+      <key>Administration</key>
+    </entry>
+    <entry>
+      <key>Keyword</key>
+    </entry>
+    <entry>
+      <key>Sorting</key>
+    </entry>
+    <entry>
+      <key>jdito</key>
+    </entry>
+    <entry>
+      <key>Time expenses</key>
+    </entry>
+    <entry>
+      <key>Context id</key>
+    </entry>
+    <entry>
+      <key>Context name</key>
+    </entry>
+    <entry>
+      <key>Cambodia</key>
+    </entry>
+    <entry>
+      <key>Resigned</key>
+    </entry>
+    <entry>
+      <key>Customer</key>
+    </entry>
+    <entry>
+      <key>Outgoing</key>
+    </entry>
+    <entry>
+      <key>Paraguay</key>
+    </entry>
+    <entry>
+      <key>Solomon Islands</key>
+    </entry>
+    <entry>
+      <key>Montserrat</key>
+    </entry>
+    <entry>
+      <key>Guadeloupe</key>
+    </entry>
+    <entry>
+      <key>Product_technic</key>
+    </entry>
+    <entry>
+      <key>Moldova (Republic of)</key>
+    </entry>
+    <entry>
+      <key>Seychelles</key>
+    </entry>
+    <entry>
+      <key>Canadian dollar</key>
+    </entry>
+    <entry>
+      <key>Bahrain</key>
+    </entry>
+    <entry>
+      <key>Comoros</key>
+    </entry>
+    <entry>
+      <key>Faroe Islands</key>
+    </entry>
+    <entry>
+      <key>Finland</key>
+    </entry>
+    <entry>
+      <key>Project_duration</key>
+    </entry>
+    <entry>
+      <key>Company_internationality</key>
+    </entry>
+    <entry>
+      <key>Eritrea</key>
+    </entry>
+    <entry>
+      <key>Puerto Rico</key>
+    </entry>
+    <entry>
+      <key>Viet Nam</key>
+    </entry>
+    <entry>
+      <key>Libya</key>
+    </entry>
+    <entry>
+      <key>French</key>
+    </entry>
+    <entry>
+      <key>Cocos (Keeling) Islands</key>
+    </entry>
+    <entry>
+      <key>Saint Helena, Ascension and Tristan da Cunha</key>
+    </entry>
+    <entry>
+      <key>Liechtenstein</key>
+    </entry>
+    <entry>
+      <key>Product_functionality</key>
+    </entry>
+    <entry>
+      <key>Bulgaria</key>
+    </entry>
+    <entry>
+      <key>Jordan</key>
+    </entry>
+    <entry>
+      <key>United Arab Emirates</key>
+    </entry>
+    <entry>
+      <key>Kenya</key>
+    </entry>
+    <entry>
+      <key>None, individual count</key>
+    </entry>
+    <entry>
+      <key>French Polynesia</key>
+    </entry>
+    <entry>
+      <key>Djibouti</key>
+    </entry>
+    <entry>
+      <key>Cuba</key>
+    </entry>
+    <entry>
+      <key>Saint Lucia</key>
+    </entry>
+    <entry>
+      <key>Mayotte</key>
+    </entry>
+    <entry>
+      <key>Israel</key>
+    </entry>
+    <entry>
+      <key>San Marino</key>
+    </entry>
+    <entry>
+      <key>Tajikistan</key>
+    </entry>
+    <entry>
+      <key>Warehouse 2</key>
+    </entry>
+    <entry>
+      <key>Warehouse 1</key>
+    </entry>
+    <entry>
+      <key>Gibraltar</key>
+    </entry>
+    <entry>
+      <key>Warehouse 3</key>
+    </entry>
+    <entry>
+      <key>Cyprus</key>
+    </entry>
+    <entry>
+      <key>Semiannually</key>
+    </entry>
+    <entry>
+      <key>Northern Mariana Islands</key>
+    </entry>
+    <entry>
+      <key>Malaysia</key>
+    </entry>
+    <entry>
+      <key>Armenia</key>
+    </entry>
+    <entry>
+      <key>Brazil</key>
+    </entry>
+    <entry>
+      <key>Turks and Caicos Islands</key>
+    </entry>
+    <entry>
+      <key>Cabo Verde</key>
+    </entry>
+    <entry>
+      <key>Ecuador</key>
+    </entry>
+    <entry>
+      <key>Iran (Islamic Republic of)</key>
+    </entry>
+    <entry>
+      <key>Decision maker</key>
+    </entry>
+    <entry>
+      <key>Lao People's Democratic Republic</key>
+    </entry>
+    <entry>
+      <key>Maintenance contract</key>
+    </entry>
+    <entry>
+      <key>United States Minor Outlying Islands</key>
+    </entry>
+    <entry>
+      <key>Italy</key>
+    </entry>
+    <entry>
+      <key>${ORGTYPE_OTHER}</key>
+      <value>Other</value>
+    </entry>
+    <entry>
+      <key>Haiti</key>
+    </entry>
+    <entry>
+      <key>Afghanistan</key>
+    </entry>
+    <entry>
+      <key>Russian Federation</key>
+    </entry>
+    <entry>
+      <key>waiting</key>
+    </entry>
+    <entry>
+      <key>American Samoa</key>
+    </entry>
+    <entry>
+      <key>Korea (Democratic People's Republic of)</key>
+    </entry>
+    <entry>
+      <key>United States dollar</key>
+    </entry>
+    <entry>
+      <key>Kyrgyzstan</key>
+    </entry>
+    <entry>
+      <key>Togo</key>
+    </entry>
+    <entry>
+      <key>Other_existing Customer</key>
+    </entry>
+    <entry>
+      <key>Uzbekistan</key>
+    </entry>
+    <entry>
+      <key>Dominica</key>
+    </entry>
+    <entry>
+      <key>Benin</key>
+    </entry>
+    <entry>
+      <key>Liter</key>
+    </entry>
+    <entry>
+      <key>Virgin Islands (British)</key>
+    </entry>
+    <entry>
+      <key>Sudan</key>
+    </entry>
+    <entry>
+      <key>Portugal</key>
+    </entry>
+    <entry>
+      <key>Grenada</key>
+    </entry>
+    <entry>
+      <key>Latvia</key>
+    </entry>
+    <entry>
+      <key>Mongolia</key>
+    </entry>
+    <entry>
+      <key>Morocco</key>
+    </entry>
+    <entry>
+      <key>Guatemala</key>
+    </entry>
+    <entry>
+      <key>Pieces</key>
+    </entry>
+    <entry>
+      <key>Heard Island and McDonald Islands</key>
+    </entry>
+    <entry>
+      <key>Incoming</key>
+    </entry>
+    <entry>
+      <key>Ghana</key>
+    </entry>
+    <entry>
+      <key>Holy See</key>
+    </entry>
+    <entry>
+      <key>India</key>
+    </entry>
+    <entry>
+      <key>Canada</key>
+    </entry>
+    <entry>
+      <key>Maldives</key>
+    </entry>
+    <entry>
+      <key>Service contract</key>
+    </entry>
+    <entry>
+      <key>Taiwan</key>
+    </entry>
+    <entry>
+      <key>Central African Republic</key>
+    </entry>
+    <entry>
+      <key>Fiji</key>
+    </entry>
+    <entry>
+      <key>Guinea</key>
+    </entry>
+    <entry>
+      <key>Somalia</key>
+    </entry>
+    <entry>
+      <key>Sao Tome and Principe</key>
+    </entry>
+    <entry>
+      <key>United Kingdom of Great Britain and Northern Ireland</key>
+    </entry>
+    <entry>
+      <key>Equatorial Guinea</key>
+    </entry>
+    <entry>
+      <key>Kiribati</key>
+    </entry>
+    <entry>
+      <key>Costa Rica</key>
+    </entry>
+    <entry>
+      <key>Supplier</key>
+    </entry>
+    <entry>
+      <key>Nigeria</key>
+    </entry>
+    <entry>
+      <key>Syrian Arab Republic</key>
+    </entry>
+    <entry>
+      <key>Timor-Leste</key>
+    </entry>
+    <entry>
+      <key>Product_mobile use</key>
+    </entry>
+    <entry>
+      <key>Samoa</key>
+    </entry>
+    <entry>
+      <key>Spain</key>
+    </entry>
+    <entry>
+      <key>Palau</key>
+    </entry>
+    <entry>
+      <key>Prospect</key>
+    </entry>
+    <entry>
+      <key>Estonia</key>
+    </entry>
+    <entry>
+      <key>Not signed yet</key>
+    </entry>
+    <entry>
+      <key>Niue</key>
+    </entry>
+    <entry>
+      <key>Mozambique</key>
+    </entry>
+    <entry>
+      <key>El Salvador</key>
+    </entry>
+    <entry>
+      <key>Guam</key>
+    </entry>
+    <entry>
+      <key>Lesotho</key>
+    </entry>
+    <entry>
+      <key>Tonga</key>
+    </entry>
+    <entry>
+      <key>Western Sahara</key>
+    </entry>
+    <entry>
+      <key>new</key>
+    </entry>
+    <entry>
+      <key>Adviser</key>
+    </entry>
+    <entry>
+      <key>Company_size</key>
+    </entry>
+    <entry>
+      <key>Republic of Kosovo</key>
+    </entry>
+    <entry>
+      <key>South Sudan</key>
+    </entry>
+    <entry>
+      <key>Mauritius</key>
+    </entry>
+    <entry>
+      <key>Bouvet Island</key>
+    </entry>
+    <entry>
+      <key>Bolivia (Plurinational State of)</key>
+    </entry>
+    <entry>
+      <key>Norfolk Island</key>
+    </entry>
+    <entry>
+      <key>Sint Maarten (Dutch part)</key>
+    </entry>
+    <entry>
+      <key>Micronesia (Federated States of)</key>
+    </entry>
+    <entry>
+      <key>Product_industry knowhow</key>
+    </entry>
+    <entry>
+      <key>United States of America</key>
+    </entry>
+    <entry>
+      <key>In review</key>
+    </entry>
+    <entry>
+      <key>Address purchase</key>
+    </entry>
+    <entry>
+      <key>Malta</key>
+    </entry>
+    <entry>
+      <key>Project_volume</key>
+    </entry>
+    <entry>
+      <key>Ireland</key>
+    </entry>
+    <entry>
+      <key>Inactive</key>
+    </entry>
+    <entry>
+      <key>France</key>
+    </entry>
+    <entry>
+      <key>Lithuania</key>
+    </entry>
+    <entry>
+      <key>Korea (Republic of)</key>
+    </entry>
+    <entry>
+      <key>${PRICELIST_SERVICE}</key>
+      <value>Service</value>
+    </entry>
+    <entry>
+      <key>English</key>
+    </entry>
+    <entry>
+      <key>Nicaragua</key>
+    </entry>
+    <entry>
+      <key>Macao</key>
+    </entry>
+    <entry>
+      <key>Mexico</key>
+    </entry>
+    <entry>
+      <key>Uganda</key>
+    </entry>
+    <entry>
+      <key>Suriname</key>
+    </entry>
+    <entry>
+      <key>Greenland</key>
+    </entry>
+    <entry>
+      <key>Papua New Guinea</key>
+    </entry>
+    <entry>
+      <key>Kazakhstan</key>
+    </entry>
+    <entry>
+      <key>Bahamas</key>
+    </entry>
+    <entry>
+      <key>Mali</key>
+    </entry>
+    <entry>
+      <key>Marshall Islands</key>
+    </entry>
+    <entry>
+      <key>Panama</key>
+    </entry>
+    <entry>
+      <key>Bonaire, Sint Eustatius and Saba</key>
+    </entry>
+    <entry>
+      <key>Tanzania, United Republic of</key>
+    </entry>
+    <entry>
+      <key>Argentina</key>
+    </entry>
+    <entry>
+      <key>Belize</key>
+    </entry>
+    <entry>
+      <key>Zambia</key>
+    </entry>
+    <entry>
+      <key>Congo</key>
+    </entry>
+    <entry>
+      <key>Guinea-Bissau</key>
+    </entry>
+    <entry>
+      <key>Namibia</key>
+    </entry>
+    <entry>
+      <key>External sales manager</key>
+    </entry>
+    <entry>
+      <key>Georgia</key>
+    </entry>
+    <entry>
+      <key>Saint Kitts and Nevis</key>
+    </entry>
+    <entry>
+      <key>Yemen</key>
+    </entry>
+    <entry>
+      <key>Aruba</key>
+    </entry>
+    <entry>
+      <key>Madagascar</key>
+    </entry>
+    <entry>
+      <key>Valid, unlimited</key>
+    </entry>
+    <entry>
+      <key>Svalbard and Jan Mayen</key>
+    </entry>
+    <entry>
+      <key>South Georgia and the South Sandwich Islands</key>
+    </entry>
+    <entry>
+      <key>Sweden</key>
+    </entry>
+    <entry>
+      <key>Malawi</key>
+    </entry>
+    <entry>
+      <key>Andorra</key>
+    </entry>
+    <entry>
+      <key>Poland</key>
+    </entry>
+    <entry>
+      <key>Tunisia</key>
+    </entry>
+    <entry>
+      <key>Tuvalu</key>
+    </entry>
+    <entry>
+      <key>Lebanon</key>
+    </entry>
+    <entry>
+      <key>Azerbaijan</key>
+    </entry>
+    <entry>
+      <key>Czech Republic</key>
+    </entry>
+    <entry>
+      <key>Mauritania</key>
+    </entry>
+    <entry>
+      <key>Guernsey</key>
+    </entry>
+    <entry>
+      <key>Kgs</key>
+    </entry>
+    <entry>
+      <key>Australia</key>
+    </entry>
+    <entry>
+      <key>Myanmar</key>
+    </entry>
+    <entry>
+      <key>Cameroon</key>
+    </entry>
+    <entry>
+      <key>Iceland</key>
+    </entry>
+    <entry>
+      <key>Oman</key>
+    </entry>
+    <entry>
+      <key>Gabon</key>
+    </entry>
+    <entry>
+      <key>Luxembourg</key>
+    </entry>
+    <entry>
+      <key>Algeria</key>
+    </entry>
+    <entry>
+      <key>Jersey</key>
+    </entry>
+    <entry>
+      <key>Slovenia</key>
+    </entry>
+    <entry>
+      <key>Antigua and Barbuda</key>
+    </entry>
+    <entry>
+      <key>Annually</key>
+    </entry>
+    <entry>
+      <key>Colombia</key>
+    </entry>
+    <entry>
+      <key>Project_reference</key>
+    </entry>
+    <entry>
+      <key>Vanuatu</key>
+    </entry>
+    <entry>
+      <key>Valid, limited</key>
+    </entry>
+    <entry>
+      <key>Honduras</key>
+    </entry>
+    <entry>
+      <key>Antarctica</key>
+    </entry>
+    <entry>
+      <key>Nauru</key>
+    </entry>
+    <entry>
+      <key>Burundi</key>
+    </entry>
+    <entry>
+      <key>Project manager</key>
+    </entry>
+    <entry>
+      <key>Singapore</key>
+    </entry>
+    <entry>
+      <key>French Guiana</key>
+    </entry>
+    <entry>
+      <key>Hours</key>
+    </entry>
+    <entry>
+      <key>Christmas Island</key>
+    </entry>
+    <entry>
+      <key>Netherlands</key>
+    </entry>
+    <entry>
+      <key>Product_flexibility</key>
+    </entry>
+    <entry>
+      <key>China</key>
+    </entry>
+    <entry>
+      <key>Martinique</key>
+    </entry>
+    <entry>
+      <key>Own website</key>
+    </entry>
+    <entry>
+      <key>Saint Pierre and Miquelon</key>
+    </entry>
+    <entry>
+      <key>Bhutan</key>
+    </entry>
+    <entry>
+      <key>Romania</key>
+    </entry>
+    <entry>
+      <key>Falkland Islands (Malvinas)</key>
+    </entry>
+    <entry>
+      <key>Philippines</key>
+    </entry>
+    <entry>
+      <key>Pitcairn</key>
+    </entry>
+    <entry>
+      <key>Zimbabwe</key>
+    </entry>
+    <entry>
+      <key>British Indian Ocean Territory</key>
+    </entry>
+    <entry>
+      <key>Montenegro</key>
+    </entry>
+    <entry>
+      <key>Quarterly</key>
+    </entry>
+    <entry>
+      <key>Indonesia</key>
+    </entry>
+    <entry>
+      <key>Angola</key>
+    </entry>
+    <entry>
+      <key>Internal</key>
+    </entry>
+    <entry>
+      <key>Key account</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>Brunei Darussalam</key>
+    </entry>
+    <entry>
+      <key>New Caledonia</key>
+    </entry>
+    <entry>
+      <key>Cayman Islands</key>
+    </entry>
+    <entry>
+      <key>Congo (Democratic Republic of the)</key>
+    </entry>
+    <entry>
+      <key>Greece</key>
+    </entry>
+    <entry>
+      <key>Guyana</key>
+    </entry>
+    <entry>
+      <key>Project assistant</key>
+    </entry>
+    <entry>
+      <key>Iraq</key>
+    </entry>
+    <entry>
+      <key>Chile</key>
+    </entry>
+    <entry>
+      <key>Nepal</key>
+    </entry>
+    <entry>
+      <key>${PRICELIST_DEFAULT}</key>
+      <value>Standard</value>
+    </entry>
+    <entry>
+      <key>Customer recommendation</key>
+    </entry>
+    <entry>
+      <key>Other_unknown</key>
+    </entry>
+    <entry>
+      <key>Isle of Man</key>
+    </entry>
+    <entry>
+      <key>Ukraine</key>
+    </entry>
+    <entry>
+      <key>Anguilla</key>
+    </entry>
+    <entry>
+      <key>Euro</key>
+    </entry>
+    <entry>
+      <key>Product_GUI</key>
+    </entry>
+    <entry>
+      <key>${GENDER_OTHER}</key>
+    </entry>
+    <entry>
+      <key>Turkey</key>
+    </entry>
+    <entry>
+      <key>Belgium</key>
+    </entry>
+    <entry>
+      <key>South Africa</key>
+    </entry>
+    <entry>
+      <key>Trinidad and Tobago</key>
+    </entry>
+    <entry>
+      <key>Bermuda</key>
+    </entry>
+    <entry>
+      <key>Jamaica</key>
+    </entry>
+    <entry>
+      <key>Peru</key>
+    </entry>
+    <entry>
+      <key>Turkmenistan</key>
+    </entry>
+    <entry>
+      <key>Venezuela (Bolivarian Republic of)</key>
+    </entry>
+    <entry>
+      <key>Tokelau</key>
+    </entry>
+    <entry>
+      <key>Hong Kong</key>
+    </entry>
+    <entry>
+      <key>Chad</key>
+    </entry>
+    <entry>
+      <key>German</key>
+    </entry>
+    <entry>
+      <key>Thailand</key>
+    </entry>
+    <entry>
+      <key>in process</key>
+    </entry>
+    <entry>
+      <key>Saint Martin (French part)</key>
+    </entry>
+    <entry>
+      <key>Kuwait</key>
+    </entry>
+    <entry>
+      <key>Palestine, State of</key>
+    </entry>
+    <entry>
+      <key>Croatia</key>
+    </entry>
+    <entry>
+      <key>Cook Islands</key>
+    </entry>
+    <entry>
+      <key>Fair</key>
+    </entry>
+    <entry>
+      <key>Sri Lanka</key>
+    </entry>
+    <entry>
+      <key>Uruguay</key>
+    </entry>
+    <entry>
+      <key>Liberia</key>
+    </entry>
+    <entry>
+      <key>Burkina Faso</key>
+    </entry>
+    <entry>
+      <key>Swiss franc</key>
+    </entry>
+    <entry>
+      <key>Swaziland</key>
+    </entry>
+    <entry>
+      <key>ended</key>
+    </entry>
+    <entry>
+      <key>Wallis and Futuna</key>
+    </entry>
+    <entry>
+      <key>Company_industry knowhow</key>
+    </entry>
+    <entry>
+      <key>Monaco</key>
+    </entry>
+    <entry>
+      <key>Spanish</key>
+    </entry>
+    <entry>
+      <key>Hungary</key>
+    </entry>
+    <entry>
+      <key>Japan</key>
+    </entry>
+    <entry>
+      <key>Belarus</key>
+    </entry>
+    <entry>
+      <key>Albania</key>
+    </entry>
+    <entry>
+      <key>Internal sales manager</key>
+    </entry>
+    <entry>
+      <key>Virgin Islands (U.S.)</key>
+    </entry>
+    <entry>
+      <key>New Zealand</key>
+    </entry>
+    <entry>
+      <key>Senegal</key>
+    </entry>
+    <entry>
+      <key>Ethiopia</key>
+    </entry>
+    <entry>
+      <key>Macedonia (the former Yugoslav Republic of)</key>
+    </entry>
+    <entry>
+      <key>Egypt</key>
+    </entry>
+    <entry>
+      <key>Sierra Leone</key>
+    </entry>
+    <entry>
+      <key>Saudi Arabia</key>
+    </entry>
+    <entry>
+      <key>Pakistan</key>
+    </entry>
+    <entry>
+      <key>Gambia</key>
+    </entry>
+    <entry>
+      <key>Qatar</key>
+    </entry>
+    <entry>
+      <key>Slovakia</key>
+    </entry>
+    <entry>
+      <key>Serbia</key>
+    </entry>
+    <entry>
+      <key>Bosnia and Herzegovina</key>
+    </entry>
+    <entry>
+      <key>Framework contract</key>
+    </entry>
+    <entry>
+      <key>Niger</key>
+    </entry>
+    <entry>
+      <key>Rwanda</key>
+    </entry>
+    <entry>
+      <key>French Southern Territories</key>
+    </entry>
+    <entry>
+      <key>Bangladesh</key>
+    </entry>
+    <entry>
+      <key>Barbados</key>
+    </entry>
+    <entry>
+      <key>Botswana</key>
+    </entry>
+    <entry>
+      <key>Saint Vincent and the Grenadines</key>
+    </entry>
+    <entry>
+      <key>Denmark</key>
+    </entry>
+    <entry>
+      <key>Dominican Republic</key>
+    </entry>
+    <entry>
+      <key>Cover letter</key>
+    </entry>
+    <entry>
+      <key>Create receipt</key>
+    </entry>
+    <entry>
+      <key>New time tracking</key>
+    </entry>
+    <entry>
+      <key>MAL</key>
+    </entry>
+    <entry>
+      <key>SQO</key>
+    </entry>
+    <entry>
+      <key>NQC</key>
+    </entry>
+    <entry>
+      <key>MQL</key>
+    </entry>
+    <entry>
+      <key>SAL</key>
+    </entry>
+    <entry>
+      <key>Checkbox</key>
+    </entry>
+    <entry>
+      <key>Numeric value</key>
+    </entry>
+    <entry>
+      <key>decline</key>
+    </entry>
+    <entry>
+      <key>Text</key>
+    </entry>
+    <entry>
+      <key>Group</key>
+    </entry>
+    <entry>
+      <key>Combobox</key>
+    </entry>
+    <entry>
+      <key>tentative</key>
+    </entry>
+    <entry>
+      <key>${NUMBER}</key>
+      <value>Number</value>
+    </entry>
+    <entry>
+      <key>Name \"%0\" already used for container \"%1\"</key>
+    </entry>
+    <entry>
+      <key>CHAR_VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute</key>
+    </entry>
+    <entry>
+      <key>in</key>
+    </entry>
+    <entry>
+      <key>Keyword Attribute Values</key>
+    </entry>
+    <entry>
+      <key>Boolean value</key>
+    </entry>
+    <entry>
+      <key>accept</key>
+    </entry>
+    <entry>
+      <key>The ZIP code does not match the format of the country.</key>
+    </entry>
+    <entry>
+      <key>String value</key>
+    </entry>
+    <entry>
+      <key>The code number is not a valid number.</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0</key>
+      <value>The DBTYPE is not supported by function %0.</value>
+    </entry>
+    <entry>
+      <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
+      <value>Missing productId in function %0.</value>
+    </entry>
+    <entry>
+      <key>Object type</key>
+    </entry>
+    <entry>
+      <key>Level</key>
+    </entry>
+    <entry>
+      <key>Touchpoint</key>
+    </entry>
+    <entry>
+      <key>Touchpoints</key>
+    </entry>
+    <entry>
+      <key>Days inactive</key>
+    </entry>
+    <entry>
+      <key>Combobox Value</key>
+    </entry>
+    <entry>
+      <key>relations</key>
+    </entry>
+    <entry>
+      <key>Time</key>
+    </entry>
+    <entry>
+      <key>New task</key>
+    </entry>
+    <entry>
+      <key>MyTasks</key>
+    </entry>
+    <entry>
+      <key>Show my tasks</key>
+    </entry>
+    <entry>
+      <key>the specified key has to be unique for that container but does already exist</key>
+    </entry>
+    <entry>
+      <key>Tree Entity</key>
+    </entry>
+    <entry>
+      <key>Relationtype</key>
+    </entry>
+    <entry>
+      <key>Tree</key>
+    </entry>
+    <entry>
+      <key>100%</key>
+    </entry>
+    <entry>
+      <key>Mobil</key>
+    </entry>
+    <entry>
+      <key>25%</key>
+    </entry>
+    <entry>
+      <key>50%</key>
+    </entry>
+    <entry>
+      <key>75%</key>
+    </entry>
+    <entry>
+      <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
+    </entry>
+    <entry>
+      <key>competitor</key>
+    </entry>
+    <entry>
+      <key>0%</key>
+    </entry>
+    <entry>
+      <key>acquainted with</key>
+    </entry>
+    <entry>
+      <key>collaboration with</key>
+    </entry>
+    <entry>
+      <key>parent company</key>
+    </entry>
+    <entry>
+      <key>society</key>
+    </entry>
+    <entry>
+      <key>ankle of</key>
+    </entry>
+    <entry>
+      <key>solicits</key>
+    </entry>
+    <entry>
+      <key>child of</key>
+    </entry>
+    <entry>
+      <key>supervisor of</key>
+    </entry>
+    <entry>
+      <key>reports to</key>
+    </entry>
+    <entry>
+      <key>subsidiary</key>
+    </entry>
+    <entry>
+      <key>supported by</key>
+    </entry>
+    <entry>
+      <key>member</key>
+    </entry>
+    <entry>
+      <key>promotion target of</key>
+    </entry>
+    <entry>
+      <key>supports</key>
+    </entry>
+    <entry>
+      <key>parent of</key>
+    </entry>
+    <entry>
+      <key>grandparents of</key>
+    </entry>
+    <entry>
+      <key>Entrydate (Month)</key>
+    </entry>
+    <entry>
+      <key>Entrydate (Day)</key>
+    </entry>
+    <entry>
+      <key>My Dashboard</key>
+    </entry>
+    <entry>
+      <key>Salesdashboard</key>
+    </entry>
+    <entry>
+      <key>Discount %</key>
+    </entry>
+    <entry>
+      <key>Memo</key>
+    </entry>
+    <entry>
+      <key>Function</key>
+    </entry>
+    <entry>
+      <key>Relational</key>
+    </entry>
+    <entry>
+      <key>Only numbers are allowed.</key>
+    </entry>
+    <entry>
+      <key>Superordinate Attribute</key>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_OFFER}</key>
+      <value>Offer</value>
+    </entry>
+    <entry>
+      <key>${SALESPROJECT_NEGOTIATION}</key>
+      <value>Negotiation</value>
+    </entry>
+    <entry>
+      <key>Filesize</key>
+    </entry>
+    <entry>
+      <key>Filename</key>
+    </entry>
+    <entry>
+      <key>Filetype</key>
+    </entry>
+    <entry>
+      <key>Special price list</key>
+    </entry>
+    <entry>
+      <key>New attribute</key>
+    </entry>
+    <entry>
+      <key>MQC</key>
+    </entry>
+    <entry>
+      <key>History</key>
+    </entry>
+    <entry>
+      <key>Progress</key>
+    </entry>
+    <entry>
+      <key>Module</key>
+    </entry>
+    <entry>
+      <key>7 days net</key>
+    </entry>
+    <entry>
+      <key>carriage free</key>
+    </entry>
+    <entry>
+      <key>8 days 2% discount, 30 days net</key>
+    </entry>
+    <entry>
+      <key>CIF</key>
+    </entry>
+    <entry>
+      <key>ex works</key>
+    </entry>
+    <entry>
+      <key>30 days net</key>
+    </entry>
+    <entry>
+      <key>Relation tree</key>
+    </entry>
+    <entry>
+      <key>Directly responsible:</key>
+    </entry>
+    <entry>
+      <key>Payment term</key>
+    </entry>
+    <entry>
+      <key>Contactrole</key>
+    </entry>
+    <entry>
+      <key>Object tree</key>
+    </entry>
+    <entry>
+      <key>New appointment</key>
+    </entry>
+    <entry>
+      <key>&amp;Aufg / Term (%0/%1)</key>
+    </entry>
+    <entry>
+      <key>Verschieben auf Datum?</key>
+    </entry>
+    <entry>
+      <key>niedrig</key>
+    </entry>
+    <entry>
+      <key>Gebucht</key>
+    </entry>
+    <entry>
+      <key>Other Contactroles</key>
+    </entry>
+    <entry>
+      <key>In Bearbeitung</key>
+    </entry>
+    <entry>
+      <key>OK</key>
+    </entry>
+    <entry>
+      <key>Nicht begonnen</key>
+    </entry>
+    <entry>
+      <key>Bitte Filterbedingungen setzen</key>
+    </entry>
+    <entry>
+      <key>keine</key>
+    </entry>
+    <entry>
+      <key>Eine private Aufgabe kann nicht jemand anderem zugewiesen werden.</key>
+    </entry>
+    <entry>
+      <key>Aufgaben von</key>
+    </entry>
+    <entry>
+      <key>&amp;Aufgaben (%0)</key>
+    </entry>
+    <entry>
+      <key>hoch</key>
+    </entry>
+    <entry>
+      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+    </entry>
+    <entry>
+      <key>Erledigt</key>
+    </entry>
+    <entry>
+      <key>Usages</key>
+    </entry>
+    <entry>
+      <key>Abgesagt</key>
+    </entry>
+    <entry>
+      <key>Abbrechen</key>
+    </entry>
+    <entry>
+      <key>delegiert</key>
+    </entry>
+    <entry>
+      <key>frei</key>
+    </entry>
+    <entry>
+      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+    </entry>
+    <entry>
+      <key>normal</key>
+    </entry>
+    <entry>
+      <key>Termine von</key>
+    </entry>
+    <entry>
+      <key>nur Verschiebung in die Zukunft erlaubt!</key>
+    </entry>
+    <entry>
+      <key>Kategorie</key>
+    </entry>
+    <entry>
+      <key>Product content</key>
+    </entry>
+    <entry>
+      <key>Know How</key>
+    </entry>
+    <entry>
+      <key>Personal appearance</key>
+    </entry>
+    <entry>
+      <key>Market situation</key>
+    </entry>
+    <entry>
+      <key>Liquidity</key>
+    </entry>
+    <entry>
+      <key>Price policy</key>
+    </entry>
+    <entry>
+      <key>Approved</key>
+    </entry>
+    <entry>
+      <key>Completed</key>
+    </entry>
+    <entry>
+      <key>In planning</key>
+    </entry>
+    <entry>
+      <key>Campaign Step</key>
+    </entry>
+    <entry>
+      <key>Campaign Participant</key>
+    </entry>
+    <entry>
+      <key>Campaign Steps</key>
+    </entry>
+    <entry>
+      <key>360 Degree</key>
+    </entry>
+    <entry>
+      <key>Campaigns</key>
+    </entry>
+    <entry>
+      <key>Campaign</key>
+    </entry>
+    <entry>
+      <key>Auswertung</key>
+    </entry>
+    <entry>
+      <key>Reihenfolge</key>
+    </entry>
+    <entry>
+      <key>Zuständiger</key>
+    </entry>
+    <entry>
+      <key>Schritte</key>
+    </entry>
+    <entry>
+      <key>Teilnehmer</key>
+    </entry>
+    <entry>
+      <key>VAT in %</key>
+    </entry>
+    <entry>
+      <key>Kampagnen Schritte</key>
+    </entry>
+    <entry>
+      <key>Kampagnenschritte</key>
+    </entry>
+    <entry>
+      <key>Marketing</key>
+    </entry>
+    <entry>
+      <key>Die maximale Anzahl Teilnehmer ist erreicht!</key>
+    </entry>
+    <entry>
+      <key>Neuer Kampagnenschritt</key>
+    </entry>
+    <entry>
+      <key>Kontakteasdasd</key>
+    </entry>
+    <entry>
+      <key>Ende</key>
+    </entry>
+    <entry>
+      <key>Neue Kampagne</key>
+    </entry>
+    <entry>
+      <key>Beginn</key>
+    </entry>
+    <entry>
+      <key>${QUANTITY_LOWER_THAN_1}</key>
+      <value>Quantity should be greater than 0.</value>
+    </entry>
+    <entry>
+      <key>This combination of person and organisation does already exist and can not be created once more.</key>
+    </entry>
+    <entry>
+      <key>Time in minutes</key>
+    </entry>
+    <entry>
+      <key>Sales manager</key>
+    </entry>
+    <entry>
+      <key>IT</key>
+    </entry>
+    <entry>
+      <key>Administrator</key>
+    </entry>
+    <entry>
+      <key>Managing director</key>
+    </entry>
+    <entry>
+      <key>Production manager</key>
+    </entry>
+    <entry>
+      <key>Production</key>
+    </entry>
+    <entry>
+      <key>CEO</key>
+    </entry>
+    <entry>
+      <key>Purchasing manager</key>
+    </entry>
+    <entry>
+      <key>Marketing manager</key>
+    </entry>
+    <entry>
+      <key>IT manager</key>
+    </entry>
+    <entry>
+      <key>CSO</key>
+    </entry>
+    <entry>
+      <key>Executive board</key>
+    </entry>
+    <entry>
+      <key>Supervisory board</key>
+    </entry>
+    <entry>
+      <key>Management</key>
+    </entry>
+    <entry>
+      <key>New module</key>
+    </entry>
+    <entry>
+      <key>Côte d'Ivoire</key>
+    </entry>
+    <entry>
+      <key>Bitte Datumseingabe prüfen!</key>
+    </entry>
+    <entry>
+      <key>Bestätigt</key>
+    </entry>
+    <entry>
+      <key>Vorläufig</key>
+    </entry>
+    <entry>
+      <key>Saint Barthélemy</key>
+    </entry>
+    <entry>
+      <key>erledigt / zurückgestellt</key>
+    </entry>
+    <entry>
+      <key>Zurückgestellt</key>
+    </entry>
+    <entry>
+      <key>Außer Haus</key>
+    </entry>
+    <entry>
+      <key>Benutzer auswählen</key>
+    </entry>
+    <entry>
+      <key>Ã…land Islands</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+    </entry>
+    <entry>
+      <key>Curaçao</key>
+    </entry>
+    <entry>
+      <key>Schlüsselwort</key>
+    </entry>
+    <entry>
+      <key>Réunion</key>
+    </entry>
+    <entry>
+      <key>date of birth must not be in the future</key>
+    </entry>
+    <entry>
+      <key>Manufacturer</key>
+    </entry>
+    <entry>
+      <key>Prospective customer</key>
+    </entry>
+    <entry>
+      <key>Competitor</key>
+    </entry>
+    <entry>
+      <key>Partner</key>
+    </entry>
+    <entry>
+      <key>Attribute Tree</key>
+    </entry>
+    <entry>
+      <key>True</key>
+    </entry>
+    <entry>
+      <key>False</key>
+    </entry>
+    <entry>
+      <key>false</key>
+    </entry>
+    <entry>
+      <key>true</key>
+    </entry>
+    <entry>
+      <key>Protected</key>
+    </entry>
+    <entry>
+      <key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
+      <value>%0 has to be between %2 and %3.</value>
+    </entry>
+    <entry>
+      <key>The title already exists!</key>
+    </entry>
+    <entry>
+      <key>Password</key>
+    </entry>
+    <entry>
+      <key>Confirm password</key>
+    </entry>
+    <entry>
+      <key>Set password</key>
+    </entry>
+    <entry>
+      <key>Email</key>
+    </entry>
+    <entry>
+      <key>{$OBJECTLINK_TYPE}</key>
+      <value>Type</value>
+    </entry>
+    <entry>
+      <key>{$OBJECTLINK_OBJECT}</key>
+      <value>Object</value>
+    </entry>
+    <entry>
+      <key>Roles</key>
+    </entry>
+    <entry>
+      <key>Password and confirmation must be the same!</key>
+    </entry>
+    <entry>
+      <key>Begin</key>
+    </entry>
+    <entry>
+      <key>Maturity</key>
+    </entry>
+    <entry>
+      <key>Stored selections</key>
+    </entry>
+    <entry>
+      <key>Username</key>
+    </entry>
+    <entry>
+      <key>The person is already associated with another employee!</key>
+    </entry>
+    <entry>
+      <key>Username already exists!</key>
+    </entry>
+    <entry>
+      <key>Salesproject Phases</key>
+    </entry>
+    <entry>
+      <key>Turnover actual year</key>
+    </entry>
+    <entry>
+      <key>Forecast actual year</key>
+    </entry>
+    <entry>
+      <key>This private person doeas already exist and can not be created once more.</key>
+    </entry>
+    <entry>
+      <key>Everyone</key>
+    </entry>
+    <entry>
+      <key>Project</key>
+    </entry>
+    <entry>
+      <key>Human resources</key>
+    </entry>
+    <entry>
+      <key>Project management</key>
+    </entry>
+    <entry>
+      <key>Office staff</key>
+    </entry>
+    <entry>
+      <key>Field staff</key>
+    </entry>
+    <entry>
+      <key>Resource</key>
+    </entry>
+    <entry>
+      <key>Human Resources</key>
+    </entry>
+    <entry>
+      <key>Email must be unique!</key>
+    </entry>
+    <entry>
+      <key>Project Management</key>
+    </entry>
+    <entry>
+      <key>Support</key>
+    </entry>
+    <entry>
+      <key>{$ADDRESS_IDENTIFIER}</key>
+      <value>Identifier</value>
+    </entry>
+    <entry>
+      <key>Salesproject phases</key>
+    </entry>
+    <entry>
+      <key>Add to Campaign</key>
+    </entry>
+    <entry>
+      <key>Choose a campaign and a step to add the contact to a  campaign</key>
+    </entry>
+    <entry>
+      <key>Max participants</key>
+    </entry>
+    <entry>
+      <key>Participants</key>
+    </entry>
+    <entry>
+      <key>Add the selection to a campaign</key>
+    </entry>
+    <entry>
+      <key>protected</key>
+    </entry>
+    <entry>
+      <key>participants will be added to the selected campaign step</key>
+    </entry>
+    <entry>
+      <key>Add participants to Campaign</key>
+    </entry>
+    <entry>
+      <key>Key figures</key>
+    </entry>
+    <entry>
+      <key>Relation</key>
+    </entry>
+    <entry>
+      <key>Object type 1</key>
+    </entry>
+    <entry>
+      <key>Object type 2</key>
+    </entry>
+    <entry>
+      <key>Title 1</key>
+    </entry>
+    <entry>
+      <key>Title 2</key>
+    </entry>
+    <entry>
+      <key>Hierarchy</key>
+    </entry>
+    <entry>
+      <key>Object relation</key>
+    </entry>
+    <entry>
+      <key>Relation type 1</key>
+    </entry>
+    <entry>
+      <key>Relation type 2</key>
+    </entry>
+    <entry>
+      <key>Relation type</key>
+    </entry>
+    <entry>
+      <key>Context 1</key>
+    </entry>
+    <entry>
+      <key>Context 2</key>
+    </entry>
+    <entry>
+      <key>Delete all usage</key>
+    </entry>
+    <entry>
+      <key>Deleted all usages of \"%0\".</key>
+    </entry>
+    <entry>
+      <key>promotion target ofc</key>
+    </entry>
+    <entry>
+      <key>Successful</key>
+    </entry>
+    <entry>
+      <key>Objectrelation type</key>
+    </entry>
+    <entry>
+      <key>Kennzahlen</key>
+    </entry>
+    <entry>
+      <key>Count</key>
+    </entry>
+    <entry>
+      <key>Forecast actual year </key>
+    </entry>
+    <entry>
+      <key>Type 2 enabled</key>
+    </entry>
+    <entry>
+      <key>Picture</key>
+    </entry>
+    <entry>
+      <key>Chart</key>
+    </entry>
+    <entry>
+      <key>Salesproject Charts</key>
+    </entry>
+    <entry>
+      <key>Tochter</key>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+    </entry>
+    <entry>
+      <key>Enable relation type 2</key>
+    </entry>
+    <entry>
+      <key>Salesproject Analyses</key>
+    </entry>
+    <entry>
+      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+    </entry>
+    <entry>
+      <key>ObjectRelationType</key>
+    </entry>
+    <entry>
+      <key>SalesprojectPhase</key>
+    </entry>
+    <entry>
+      <key>SalesprojectState</key>
+    </entry>
+    <entry>
+      <key>Days count</key>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>Would you like to clear the forecast and set the state to \"%0\"?</key>
+    </entry>
+    <entry>
+      <key>Clear forecast and set state to '%0'?</key>
+    </entry>
+    <entry>
+      <key>Would you really like to clear the forecast and set the state to '%0'?</key>
+    </entry>
+    <entry>
+      <key>This cannot be undone!</key>
+    </entry>
+    <entry>
+      <key>Campaign status</key>
+    </entry>
+    <entry>
+      <key>Set campaign step</key>
+    </entry>
+    <entry>
+      <key>Add participant to Campaign</key>
+    </entry>
+    <entry>
+      <key>Steps</key>
+    </entry>
+    <entry>
+      <key>CampaignStep</key>
+    </entry>
+    <entry>
+      <key>Added</key>
+    </entry>
+    <entry>
+      <key>Current participants</key>
+    </entry>
+    <entry>
+      <key>Overdue tasks</key>
+    </entry>
+    <entry>
+      <key>Open tasks</key>
+    </entry>
+    <entry>
+      <key>[%0]the tableName is not a string after interpreting</key>
+    </entry>
+    <entry>
+      <key>[%0]%1 has to be a string or array but it is %2</key>
+    </entry>
+    <entry>
+      <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+    </entry>
+    <entry>
+      <key>[%0]the columnName is not a string after interpreting</key>
+    </entry>
+    <entry>
+      <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+    </entry>
+    <entry>
+      <key>Responsible</key>
+    </entry>
+    <entry>
+      <key>New tasks</key>
+    </entry>
+    <entry>
+      <key>Imminent appointments for today</key>
+    </entry>
+    <entry>
+      <key>Analyses</key>
+    </entry>
+    <entry>
+      <key>Imminent appointments for today </key>
+    </entry>
+    <entry>
+      <key>To-Do</key>
+    </entry>
+    <entry>
+      <key>My Tasks</key>
+    </entry>
+    <entry>
+      <key>Calendar</key>
+    </entry>
+    <entry>
+      <key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
+      <value>The value for the field %0 is undefined.</value>
+    </entry>
+    <entry>
+      <key>My tasks</key>
+    </entry>
+    <entry>
+      <key>${ATTRIBUTE_VOID}</key>
+      <value>Tag</value>
+    </entry>
+    <entry>
+      <key>Kampagnenzeitraum</key>
+    </entry>
+    <entry>
+      <key>Hauptverantw.</key>
+    </entry>
+    <entry>
+      <key>New campaign step</key>
+    </entry>
+    <entry>
+      <key>Cost</key>
+    </entry>
+    <entry>
+      <key>file '%0' cannot be read</key>
+    </entry>
+    <entry>
+      <key>Campaign costs</key>
+    </entry>
+    <entry>
+      <key>Importer</key>
+    </entry>
+    <entry>
+      <key>Participant</key>
+    </entry>
+    <entry>
+      <key>Printing costs</key>
+    </entry>
+    <entry>
+      <key>Shipping costs</key>
+    </entry>
+    <entry>
+      <key>yyyy-MM-dd HH:mm:ss</key>
+    </entry>
+    <entry>
+      <key>file '%0' does not exist or you have got no permission on this file</key>
+    </entry>
+    <entry>
+      <key>Zip</key>
+    </entry>
+    <entry>
+      <key>Add to campaign</key>
+    </entry>
+    <entry>
+      <key>Layout costs</key>
+    </entry>
+    <entry>
+      <key>Costs</key>
+    </entry>
+    <entry>
+      <key>Fix cost</key>
+    </entry>
+    <entry>
+      <key>Step</key>
+    </entry>
+    <entry>
+      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+      <value>Webservice not available. URL: %0 %1</value>
+    </entry>
+    <entry>
+      <key>per</key>
+    </entry>
+    <entry>
+      <key>The minimal count can't be larger than the maximal count!</key>
+    </entry>
+    <entry>
+      <key>The max participants count has to be equal or greater than the count of the current participants!</key>
+    </entry>
+    <entry>
+      <key>Variable costs</key>
+    </entry>
+    <entry>
+      <key>Version number</key>
+    </entry>
+    <entry>
+      <key>Id value</key>
+    </entry>
+    <entry>
+      <key>Order executed</key>
+    </entry>
+    <entry>
+      <key>Liquibase</key>
+    </entry>
+    <entry>
+      <key>Number value</key>
+    </entry>
+    <entry>
+      <key>Author</key>
+    </entry>
+    <entry>
+      <key>Position Id</key>
+    </entry>
+    <entry>
+      <key>ISO3</key>
+    </entry>
+    <entry>
+      <key>ISO2</key>
+    </entry>
+    <entry>
+      <key>Communication Id</key>
+    </entry>
+    <entry>
+      <key>Attribute Id</key>
+    </entry>
+    <entry>
+      <key>Modification user</key>
+    </entry>
+    <entry>
+      <key>Headline</key>
+    </entry>
+    <entry>
+      <key>Salesorder Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject milestone Id</key>
+    </entry>
+    <entry>
+      <key>Appointment Id</key>
+    </entry>
+    <entry>
+      <key>Locked</key>
+    </entry>
+    <entry>
+      <key>Timetracking Id</key>
+    </entry>
+    <entry>
+      <key>Salesorder date</key>
+    </entry>
+    <entry>
+      <key>Exec type</key>
+    </entry>
+    <entry>
+      <key>Date value</key>
+    </entry>
+    <entry>
+      <key>NUMBER VALUE</key>
+    </entry>
+    <entry>
+      <key>Salesproject forecast Id</key>
+    </entry>
+    <entry>
+      <key>ID</key>
+    </entry>
+    <entry>
+      <key>Keyword attribute relation Id</key>
+    </entry>
+    <entry>
+      <key>Minimal count</key>
+    </entry>
+    <entry>
+      <key>Id</key>
+    </entry>
+    <entry>
+      <key>Start date</key>
+    </entry>
+    <entry>
+      <key>Object 1 row Id</key>
+    </entry>
+    <entry>
+      <key>Side</key>
+    </entry>
+    <entry>
+      <key>Salesproject Id</key>
+    </entry>
+    <entry>
+      <key>Product Id</key>
+    </entry>
+    <entry>
+      <key>Sort</key>
+    </entry>
+    <entry>
+      <key>Relation Title</key>
+    </entry>
+    <entry>
+      <key>%0 \"%1\"</key>
+    </entry>
+    <entry>
+      <key>Maximal count</key>
+    </entry>
+    <entry>
+      <key>Data executed</key>
+    </entry>
+    <entry>
+      <key>Indexsearch</key>
+    </entry>
+    <entry>
+      <key>Appointment link Id</key>
+    </entry>
+    <entry>
+      <key>Relation Type</key>
+    </entry>
+    <entry>
+      <key>Salesproject member Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject source Id</key>
+    </entry>
+    <entry>
+      <key>Item sort</key>
+    </entry>
+    <entry>
+      <key>%0 modified.</key>
+    </entry>
+    <entry>
+      <key>Contract Id</key>
+    </entry>
+    <entry>
+      <key>Int value</key>
+    </entry>
+    <entry>
+      <key>Object 2 row Id</key>
+    </entry>
+    <entry>
+      <key>Source tablename Id</key>
+    </entry>
+    <entry>
+      <key>Source tablename</key>
+    </entry>
+    <entry>
+      <key>Contact Id</key>
+    </entry>
+    <entry>
+      <key>Sales area</key>
+    </entry>
+    <entry>
+      <key>Parent Id</key>
+    </entry>
+    <entry>
+      <key>Task link Id</key>
+    </entry>
+    <entry>
+      <key>Protection level</key>
+    </entry>
+    <entry>
+      <key>Salesorder code</key>
+    </entry>
+    <entry>
+      <key>Class</key>
+    </entry>
+    <entry>
+      <key>BOOL VALUE</key>
+    </entry>
+    <entry>
+      <key>Keyword attribute Id</key>
+    </entry>
+    <entry>
+      <key>Log type</key>
+    </entry>
+    <entry>
+      <key>Object row Id</key>
+    </entry>
+    <entry>
+      <key>Labels</key>
+    </entry>
+    <entry>
+      <key>%0 deleted.</key>
+    </entry>
+    <entry>
+      <key>Salesproject competition Id</key>
+    </entry>
+    <entry>
+      <key>Activity Id</key>
+    </entry>
+    <entry>
+      <key>Person Id</key>
+    </entry>
+    <entry>
+      <key>Offer item Id</key>
+    </entry>
+    <entry>
+      <key>Offer Id</key>
+    </entry>
+    <entry>
+      <key>Name native</key>
+    </entry>
+    <entry>
+      <key>Flag</key>
+    </entry>
+    <entry>
+      <key>Address Id</key>
+    </entry>
+    <entry>
+      <key>Name latin</key>
+    </entry>
+    <entry>
+      <key>Destination Id</key>
+    </entry>
+    <entry>
+      <key>Sex</key>
+    </entry>
+    <entry>
+      <key>Product price Id</key>
+    </entry>
+    <entry>
+      <key>%0 added.</key>
+    </entry>
+    <entry>
+      <key>Object Relation Type</key>
+    </entry>
+    <entry>
+      <key>Entry date</key>
+    </entry>
+    <entry>
+      <key>Object relation type 2</key>
+    </entry>
+    <entry>
+      <key>Object relation type 1</key>
+    </entry>
+    <entry>
+      <key>Modification date</key>
+    </entry>
+    <entry>
+      <key>Object Type</key>
+    </entry>
+    <entry>
+      <key>%0 from \"%1\" to \"%2\"</key>
+    </entry>
+    <entry>
+      <key>MD5 Sum</key>
+    </entry>
+    <entry>
+      <key>Letter salutation</key>
+    </entry>
+    <entry>
+      <key>Lock granted</key>
+    </entry>
+    <entry>
+      <key>Required fields</key>
+    </entry>
+    <entry>
+      <key>Address addition</key>
+    </entry>
+    <entry>
+      <key>the \"%0\" table is configured to get logged but this is the logging-stoarge itself and cannot be monitored</key>
+    </entry>
+    <entry>
+      <key>Attribute usage Id</key>
+    </entry>
+    <entry>
+      <key>LogHistory</key>
+    </entry>
+    <entry>
+      <key>Locked by</key>
+    </entry>
+    <entry>
+      <key>Desciption</key>
+    </entry>
+    <entry>
+      <key>Salutation Id</key>
+    </entry>
+    <entry>
+      <key>Comments</key>
+    </entry>
+    <entry>
+      <key>Task Id</key>
+    </entry>
+    <entry>
+      <key>Valid to</key>
+    </entry>
+    <entry>
+      <key>ZIP regex</key>
+    </entry>
+    <entry>
+      <key>Keyword entry Id</key>
+    </entry>
+    <entry>
+      <key>Salesproject classification Id</key>
+    </entry>
+    <entry>
+      <key>Stop costs</key>
+    </entry>
+    <entry>
+      <key>Contexts</key>
+    </entry>
+    <entry>
+      <key>Assigned to</key>
+    </entry>
+    <entry>
+      <key>%0 from \"%1\" to %2 \"%3\"</key>
+    </entry>
+    <entry>
+      <key>Date start</key>
+    </entry>
+    <entry>
+      <key>Cover Letter</key>
+    </entry>
+    <entry>
+      <key>Deployment Id</key>
+    </entry>
+    <entry>
+      <key>Address format</key>
+    </entry>
+    <entry>
+      <key>Activity link Id</key>
+    </entry>
+    <entry>
+      <key>Date end</key>
+    </entry>
+    <entry>
+      <key>Creation user</key>
+    </entry>
+    <entry>
+      <key>Unit Price</key>
+    </entry>
+    <entry>
+      <key>Object Id</key>
+    </entry>
+    <entry>
+      <key>Is active</key>
+    </entry>
+    <entry>
+      <key>Product relationship</key>
+    </entry>
+    <entry>
+      <key>Salesorder item Id</key>
+    </entry>
+    <entry>
+      <key>Char value</key>
+    </entry>
+    <entry>
+      <key>Attribute relation Id</key>
+    </entry>
+    <entry>
+      <key>Tag</key>
+    </entry>
+    <entry>
+      <key>Title suffix</key>
+    </entry>
+    <entry>
+      <key>Step costs</key>
+    </entry>
+    <entry>
+      <key>Min. Stock</key>
+    </entry>
+    <entry>
+      <key>User</key>
+    </entry>
+    <entry>
+      <key>Stock Id</key>
+    </entry>
+    <entry>
+      <key>Tablename</key>
+    </entry>
+    <entry>
+      <key>CHAR VALUE</key>
+    </entry>
+    <entry>
+      <key>Parent context</key>
+    </entry>
+    <entry>
+      <key>Organisation Id</key>
+    </entry>
+    <entry>
+      <key>Tablename Id</key>
+    </entry>
+    <entry>
+      <key>Offer date</key>
+    </entry>
+    <entry>
+      <key>Competitors</key>
+    </entry>
+    <entry>
+      <key>Notifications</key>
+    </entry>
+    <entry>
+      <key>Overview</key>
+    </entry>
+    <entry>
+      <key>Participated</key>
+    </entry>
+    <entry>
+      <key>Remaining Runtime</key>
+    </entry>
+    <entry>
+      <key>Document Template</key>
+    </entry>
+    <entry>
+      <key>Document Templates</key>
+    </entry>
+    <entry>
+      <key>Text Modular</key>
+    </entry>
+    <entry>
+      <key>Serial</key>
+    </entry>
+    <entry>
+      <key>Campaign Period</key>
+    </entry>
+    <entry>
+      <key>Single</key>
+    </entry>
+    <entry>
+      <key>Attachment</key>
+    </entry>
+    <entry>
+      <key>Attachments</key>
+    </entry>
+    <entry>
+      <key>Letter</key>
+    </entry>
+    <entry>
+      <key>Appointment</key>
+    </entry>
+    <entry>
+      <key>ARCHIEVED</key>
+    </entry>
+    <entry>
+      <key>UNSEEN</key>
+    </entry>
+    <entry>
+      <key>CONFIRMED</key>
+    </entry>
+    <entry>
+      <key>SEEN</key>
+    </entry>
+    <entry>
+      <key>rebuild Index</key>
+    </entry>
+    <entry>
+      <key>Charts</key>
+    </entry>
+    <entry>
+      <key>Keywords</key>
+    </entry>
+    <entry>
+      <key>Days running</key>
+    </entry>
+    <entry>
+      <key>Logs</key>
+    </entry>
+    <entry>
+      <key>Mail</key>
+    </entry>
+    <entry>
+      <key>Phonecall</key>
+    </entry>
+    <entry>
+      <key>Chart 2</key>
+    </entry>
+    <entry>
+      <key>Log</key>
+    </entry>
+    <entry>
+      <key>Offer Header Text</key>
+    </entry>
+    <entry>
+      <key>Employees</key>
+    </entry>
+    <entry>
+      <key>Todo</key>
+    </entry>
+    <entry>
+      <key>Days remaining</key>
+    </entry>
+    <entry>
+      <key>Offer Footer Text</key>
+    </entry>
+    <entry>
+      <key>Date new</key>
+    </entry>
+    <entry>
+      <key>Date edit</key>
+    </entry>
+    <entry>
+      <key>Keyword Attributes</key>
+    </entry>
+    <entry>
+      <key>HTML</key>
+    </entry>
+    <entry>
+      <key>Student/Internship</key>
+    </entry>
+    <entry>
+      <key>Food</key>
+    </entry>
+    <entry>
+      <key>200 to 349T</key>
+    </entry>
+    <entry>
+      <key>Within 6 months</key>
+    </entry>
+    <entry>
+      <key>No project planned</key>
+    </entry>
+    <entry>
+      <key>Logistics</key>
+    </entry>
+    <entry>
+      <key>Skilled workers</key>
+    </entry>
+    <entry>
+      <key>Purchasing</key>
+    </entry>
+    <entry>
+      <key>Rate</key>
+    </entry>
+    <entry>
+      <key>Choice</key>
+    </entry>
+    <entry>
+      <key>points</key>
+    </entry>
+    <entry>
+      <key>Education</key>
+    </entry>
+    <entry>
+      <key>Public</key>
+    </entry>
+    <entry>
+      <key>Building and construction suppliers</key>
+    </entry>
+    <entry>
+      <key>0 to 49</key>
+    </entry>
+    <entry>
+      <key>0 to 49T</key>
+    </entry>
+    <entry>
+      <key>CRM Manager</key>
+    </entry>
+    <entry>
+      <key>50 to 99T</key>
+    </entry>
+    <entry>
+      <key>Search</key>
+    </entry>
+    <entry>
+      <key>Counsellor</key>
+    </entry>
+    <entry>
+      <key>50 to 100</key>
+    </entry>
+    <entry>
+      <key>OnPremise</key>
+    </entry>
+    <entry>
+      <key>Head of IT</key>
+    </entry>
+    <entry>
+      <key>Electric</key>
+    </entry>
+    <entry>
+      <key>from 1,000</key>
+    </entry>
+    <entry>
+      <key>Publishing house</key>
+    </entry>
+    <entry>
+      <key>100 to 199T</key>
+    </entry>
+    <entry>
+      <key>101 to 250</key>
+    </entry>
+    <entry>
+      <key>Overarching</key>
+    </entry>
+    <entry>
+      <key>Energy</key>
+    </entry>
+    <entry>
+      <key>Machinery and equipment</key>
+    </entry>
+    <entry>
+      <key>Trade</key>
+    </entry>
+    <entry>
+      <key>Consultation</key>
+    </entry>
+    <entry>
+      <key>Cloud</key>
+    </entry>
+    <entry>
+      <key>No date yet</key>
+    </entry>
+    <entry>
+      <key>Classifications</key>
+    </entry>
+    <entry>
+      <key>Service Manager</key>
+    </entry>
+    <entry>
+      <key>Lifesience</key>
+    </entry>
+    <entry>
+      <key>Automotive</key>
+    </entry>
+    <entry>
+      <key>Lottery</key>
+    </entry>
+    <entry>
+      <key>from 350T</key>
+    </entry>
+    <entry>
+      <key>Management/Sales Manager</key>
+    </entry>
+    <entry>
+      <key>Environment</key>
+    </entry>
+    <entry>
+      <key>Within 12 months</key>
+    </entry>
+    <entry>
+      <key>Finance</key>
+    </entry>
+    <entry>
+      <key>ScoreProjectStart</key>
+      <value>Project start</value>
+    </entry>
+    <entry>
+      <key>ScoreStandard</key>
+      <value>Standard</value>
+    </entry>
+    <entry>
+      <key>ScoreCustomizing</key>
+      <value>Customizing</value>
+    </entry>
+    <entry>
+      <key>ScoreDecisionPhase</key>
+      <value>Desicion phase</value>
+    </entry>
+    <entry>
+      <key>ScoreUsers</key>
+      <value>User count</value>
+    </entry>
+    <entry>
+      <key>ScoreBranch</key>
+      <value>Branche</value>
+    </entry>
+    <entry>
+      <key>ScorePosition</key>
+      <value>Position</value>
+    </entry>
+    <entry>
+      <key>ScoreBudget</key>
+      <value>Project budget</value>
+    </entry>
+    <entry>
+      <key>ScoreDepartment</key>
+      <value>department</value>
+    </entry>
+    <entry>
+      <key>ScoreCloud</key>
+      <value>Operating model</value>
+    </entry>
+    <entry>
+      <key>ScoreBased</key>
+      <value>Headquarters</value>
+    </entry>
+    <entry>
+      <key>dfssdfsdf</key>
+    </entry>
+    <entry>
+      <key>Score</key>
+    </entry>
+    <entry>
+      <key>Scoretype</key>
+    </entry>
+    <entry>
+      <key>${NUMBER_FORMAT_NEEDED}</key>
+      <value>Value has to be a number.</value>
+    </entry>
+    <entry>
+      <key>Classification number</key>
+    </entry>
+    <entry>
+      <key>Possible values</key>
+    </entry>
+    <entry>
+      <key>ARCHIVE</key>
+    </entry>
+    <entry>
+      <key>archieve</key>
+    </entry>
+    <entry>
+      <key>setUnread</key>
+    </entry>
+    <entry>
+      <key>setRead</key>
+    </entry>
+    <entry>
+      <key>${HIGHER_THAN_MAX} max: %0</key>
+      <value>The value is greater than the allowed max-value %0.</value>
+    </entry>
+    <entry>
+      <key>Rating</key>
+    </entry>
+    <entry>
+      <key>sum</key>
+    </entry>
+    <entry>
+      <key>A: 75 &lt; </key>
+    </entry>
+    <entry>
+      <key>Possible Values</key>
+    </entry>
+    <entry>
+      <key>${SCORETYPE_ALREADY_EXISTS}</key>
+      <value>The given Scoretype already exists in any Classification.</value>
+    </entry>
+    <entry>
+      <key>251 to 1,000</key>
+    </entry>
+    <entry>
+      <key>Selection</key>
+    </entry>
+    <entry>
+      <key>Dateien</key>
+    </entry>
+    <entry>
+      <key>Files</key>
+    </entry>
+    <entry>
+      <key>${COUNT_PREPOSITION_SINGLE}</key>
+      <value>time</value>
+    </entry>
+    <entry>
+      <key>Attribute \"%0\" has to be used at least %1.</key>
+    </entry>
+    <entry>
+      <key>${COUNT_PREPOSITION_MULTIPLE}</key>
+      <value>times</value>
+    </entry>
+    <entry>
+      <key>Attribute \"%0\" can't be used more than %1.</key>
+    </entry>
+    <entry>
+      <key>Recipient</key>
+    </entry>
+  </keyValueMap>
+  <font name="Dialog" style="0" size="11" />
+</language>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
new file mode 100644
index 0000000000000000000000000000000000000000..725483becd6b1b7041192bd5ac1cd8670e319644
--- /dev/null
+++ b/neonContext/Classification/Classification.aod
@@ -0,0 +1,30 @@
+<?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>Classification</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainview>ClassificationAdminTree_view</mainview>
+  <editview>ClassificatonAdminEdit_view</editview>
+  <entity>Classification_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>3ab6b4d1-e6db-42be-8262-2499a3d114e9</name>
+      <view>ClassificationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>359f42a2-1014-4d81-aa65-8f6aeba10f2d</name>
+      <view>ClassificatonAdminEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b54f49d0-3577-4221-8fd1-fc1c8239d689</name>
+      <view>ClassificationAdminTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
+      <view>ClassificatonEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>8412dc60-bffd-49bd-a68d-c730404b807b</name>
+      <view>ClassificationFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
new file mode 100644
index 0000000000000000000000000000000000000000..39b6239be4602b6dca174ef368b0b7bd0facd5c1
--- /dev/null
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -0,0 +1,18 @@
+<?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>ClassificationAdmin</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainview>ClassificationAdminMain_view</mainview>
+  <filterview>ClassificationAdminFilter_view</filterview>
+  <entity>ClassificationAdmin_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>e29a0221-6ac6-47d3-bee0-950def1847a8</name>
+      <view>ClassificationAdminFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4a240156-6c62-46d8-890e-b5c239ef8128</name>
+      <view>ClassificationAdminMain_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ClassificationScore/ClassificationScore.aod b/neonContext/ClassificationScore/ClassificationScore.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b93085f7299a80219111e4660ec78108ef2d0ccf
--- /dev/null
+++ b/neonContext/ClassificationScore/ClassificationScore.aod
@@ -0,0 +1,12 @@
+<?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>ClassificationScore</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ClassificationScore_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>ccaf4443-07e0-4e29-a73d-2073d132fbe6</name>
+      <view>ClassificationScoreMultipleEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Email/Email.aod b/neonContext/Email/Email.aod
new file mode 100644
index 0000000000000000000000000000000000000000..502cb77e4a78d090f6549ac3bc98a7b202ec8568
--- /dev/null
+++ b/neonContext/Email/Email.aod
@@ -0,0 +1,12 @@
+<?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>Email</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>Email_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>32d974db-e56a-49e7-b421-3abf02757580</name>
+      <view>EmailEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/SalesprojectClassification/SalesprojectClassification.aod b/neonContext/SalesprojectClassification/SalesprojectClassification.aod
deleted file mode 100644
index 76e29d04b86f10591bb48ff255822d4685510324..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectClassification/SalesprojectClassification.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>SalesprojectClassification</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>SalesprojectClassificationFilter_view</filterview>
-  <preview>SalesprojectClassificationPreview_view</preview>
-  <entity>SalesprojectClassification_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>c0720a84-98a8-459d-bdf5-b3daf56ee059</name>
-      <view>SalesprojectClassificationFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>e5f1c9a7-19a8-433e-b25e-83001d4f7bf8</name>
-      <view>SalesprojectClassificationPreview_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod b/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
deleted file mode 100644
index 80ff2cc86e9f990b1f5f596528eb5d2acf8ebf39..0000000000000000000000000000000000000000
--- a/neonContext/SalesprojectClassificationEntry/SalesprojectClassificationEntry.aod
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>SalesprojectClassificationEntry</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainview>SalesprojectClassificationEntryPreview_view</mainview>
-  <filterview>SalesprojectClassificationEntryPreview_view</filterview>
-  <editview>SalesprojectClassificationEntryEdit_view</editview>
-  <preview>SalesprojectClassificationEntryPreview_view</preview>
-  <entity>SalesprojectClassificationEntry_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>7cddda68-3dcb-4daf-84a4-1546298cabb6</name>
-      <view>SalesprojectClassificationEntryPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>80205380-7785-43a3-af7b-73ef8112ca38</name>
-      <view>SalesprojectClassificationEntryEdit_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonDashboard/Home/Home.aod b/neonDashboard/Home/Home.aod
index dea5eed6fa4c3d2da13523f069f87c6adb7d8f1b..82a843b819c93a5c5ffbde865c5fefbebd84cf78 100644
--- a/neonDashboard/Home/Home.aod
+++ b/neonDashboard/Home/Home.aod
@@ -33,8 +33,20 @@
     </neonDashlet>
     <neonDashlet>
       <name>Dashlet</name>
-      <viewName>ActivityFilter_view</viewName>
-      <configName>InnateActivitiesDashlet</configName>
+      <viewName>TaskFilter_view</viewName>
+      <configName>mytasks</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="0" />
+        <yPos v="6" />
+        <colspan v="1" />
+        <rowspan v="4" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet4</name>
+      <viewName>MyDashboardScoreCard_view</viewName>
+      <configName>Information</configName>
       <uiConfiguration>
         <name>uiConfiguration</name>
         <xPos v="1" />
@@ -43,5 +55,17 @@
         <rowspan v="6" />
       </uiConfiguration>
     </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet5</name>
+      <viewName>ActivityFilter_view</viewName>
+      <configName>InnateActivitiesDashlet</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="1" />
+        <yPos v="6" />
+        <colspan v="1" />
+        <rowspan v="4" />
+      </uiConfiguration>
+    </neonDashlet>
   </defaultDashlets>
 </neonDashboard>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 2e027644e08a04b7a05155a76d492e8bdb77755a..42dd805060a6f14fb40fa837a5572c072331847f 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -1,123 +1,123 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>ActivityFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <dashletConfigurations>
-    <neonDashletConfiguration>
-      <name>AllActivitiesDashlet</name>
-      <title>Activities</title>
-      <description>Show all activities</description>
-      <fragment>Activity/filter</fragment>
-      <singleton v="true" />
-      <requiresConfiguration v="false" />
-      <icon>neon:history</icon>
-      <categories>
-        <neonDashletCategory>
-          <name>contactmanagement</name>
-          <title>Contactmanagement</title>
-        </neonDashletCategory>
-        <neonDashletCategory>
-          <name>activity</name>
-          <title>Activity</title>
-        </neonDashletCategory>
-      </categories>
-    </neonDashletConfiguration>
-    <neonDashletConfiguration>
-      <name>InnateActivitiesDashlet</name>
-      <title>My Activities</title>
-      <description>Show my activities</description>
-      <fragment>Activity/filter</fragment>
-      <singleton v="true" />
-      <requiresConfiguration v="false" />
-      <icon>neon:history</icon>
-      <categories>
-        <neonDashletCategory>
-          <name>contactmanagement</name>
-          <title>Contactmanagement</title>
-        </neonDashletCategory>
-        <neonDashletCategory>
-          <name>activity</name>
-          <title>Activity</title>
-        </neonDashletCategory>
-      </categories>
-      <parameters>
-        <neonDashletParameter>
-          <name>OnlyInnate_param</name>
-          <value>true</value>
-        </neonDashletParameter>
-      </parameters>
-    </neonDashletConfiguration>
-  </dashletConfigurations>
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <timelineViewTemplate>
-      <name>ActivitiesTimeline</name>
-      <dateField>ENTRYDATE</dateField>
-      <titleField>SUBJECT_DETAILS</titleField>
-      <descriptionField>INFO</descriptionField>
-      <iconIdField>DIRECTION_ICON</iconIdField>
-      <hideTime v="true" />
-      <entityField>#ENTITY</entityField>
-      <maxDBRow v="400" />
-    </timelineViewTemplate>
-    <tableViewTemplate>
-      <name>ActivitiesTable</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>c1ff85eb-dde9-4362-82bc-8be6e3346b1c</name>
-          <entityField>#IMAGE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>c8fc85eb-dde9-4362-82bc-8be6e3346b1c</name>
-          <entityField>SUBJECT</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>56f0d70a-04de-4acf-b7f6-08414ab5e7ce</name>
-          <entityField>ENTRYDATE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>692a655b-18f5-4323-8d87-ee42726bed38</name>
-          <entityField>DIRECTION</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>37a279c7-be95-4d40-a355-ea2595e36bf2</name>
-          <entityField>CATEGORY</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>ActivitiesTreeTable</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
-          <entityField>ICON</entityField>
-          <width v="75" />
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
-          <entityField>SUBJECT</entityField>
-          <width v="75" />
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
-          <entityField>ENTRYDATE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
-          <entityField>DIRECTION</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
-          <entityField>CATEGORY</entityField>
-        </neonTableColumn>
-      </columns>
-    </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ActivityFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>AllActivitiesDashlet</name>
+      <title>Activities</title>
+      <description>Show all activities</description>
+      <fragment>Activity/filter</fragment>
+      <singleton v="true" />
+      <requiresConfiguration v="false" />
+      <icon>VAADIN:HOURGLASS_END</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>contactmanagement</name>
+          <title>Contactmanagement</title>
+        </neonDashletCategory>
+        <neonDashletCategory>
+          <name>activity</name>
+          <title>Activity</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+    <neonDashletConfiguration>
+      <name>InnateActivitiesDashlet</name>
+      <title>My Activities</title>
+      <description>Show my activities</description>
+      <fragment>Activity/filter</fragment>
+      <singleton v="true" />
+      <requiresConfiguration v="false" />
+      <icon>VAADIN:HOURGLASS_END</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>contactmanagement</name>
+          <title>Contactmanagement</title>
+        </neonDashletCategory>
+        <neonDashletCategory>
+          <name>activity</name>
+          <title>Activity</title>
+        </neonDashletCategory>
+      </categories>
+      <parameters>
+        <neonDashletParameter>
+          <name>OnlyInnate_param</name>
+          <value>true</value>
+        </neonDashletParameter>
+      </parameters>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <timelineViewTemplate>
+      <name>ActivitiesTimeline</name>
+      <dateField>ENTRYDATE</dateField>
+      <titleField>SUBJECT_DETAILS</titleField>
+      <descriptionField>INFO</descriptionField>
+      <iconIdField>DIRECTION_ICON</iconIdField>
+      <hideTime v="true" />
+      <entityField>#ENTITY</entityField>
+      <maxDBRow v="400" />
+    </timelineViewTemplate>
+    <tableViewTemplate>
+      <name>ActivitiesTable</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>c1ff85eb-dde9-4362-82bc-8be6e3346b1c</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c8fc85eb-dde9-4362-82bc-8be6e3346b1c</name>
+          <entityField>SUBJECT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>56f0d70a-04de-4acf-b7f6-08414ab5e7ce</name>
+          <entityField>ENTRYDATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>692a655b-18f5-4323-8d87-ee42726bed38</name>
+          <entityField>DIRECTION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>37a279c7-be95-4d40-a355-ea2595e36bf2</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>ActivitiesTreeTable</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
+          <entityField>ICON</entityField>
+          <width v="75" />
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
+          <entityField>SUBJECT</entityField>
+          <width v="75" />
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
+          <entityField>ENTRYDATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
+          <entityField>DIRECTION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 6b251715f5595b1c829e8c56319f487820724338..6f2ad8f29b5333eea83036c3519889f401bc3643 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -1,56 +1,60 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>AddressList_view</name>
-  <description>Org addresses</description>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <titledListViewTemplate>
-      <name>Addresses</name>
-      <highlightingField>IS_STANDARD</highlightingField>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
-          <entityField>ADDR_TYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
-          <entityField>COUNTRY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
-          <entityField>ADDRESS</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
-          <entityField>BUILDINGNO</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>0336ea99-c4a1-4f39-b5aa-a520a7dcbaab</name>
-          <entityField>ZIP</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
-          <entityField>CITY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
-          <entityField>STATE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
-          <entityField>REGION</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>6af52273-25bf-4286-83cc-217aea94ad09</name>
-          <entityField>ADDRIDENTIFIER</entityField>
-        </neonTableColumn>
-      </columns>
-    </titledListViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>AddressList_view</name>
+  <description>Org addresses</description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>Addresses</name>
+      <highlightingField>IS_STANDARD</highlightingField>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
+          <entityField>ADDR_TYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>dd514a8b-68b1-4fba-b84e-bc8d8ed708bc</name>
+          <entityField>AddressSearch</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
+          <entityField>COUNTRY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
+          <entityField>ADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
+          <entityField>BUILDINGNO</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0336ea99-c4a1-4f39-b5aa-a520a7dcbaab</name>
+          <entityField>ZIP</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
+          <entityField>CITY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
+          <entityField>REGION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>6af52273-25bf-4286-83cc-217aea94ad09</name>
+          <entityField>ADDRIDENTIFIER</entityField>
+        </neonTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
index f3f45a050154e04ec1ffd2338ff7cf9265fca167..ca5b096ab51c184eef02ea9f2d32a948b075b48b 100644
--- a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
+++ b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
@@ -1,38 +1,50 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>AddressValidationLookup_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>DataTable</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>a8787cc8-57a2-4cd5-903e-da14924a9052</name>
-          <entityField>ZIP</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>fb715731-9162-405e-b2e2-6c20921f026f</name>
-          <entityField>CITY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
-          <entityField>COUNTRY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>05bb9d3b-0e90-4a1a-bfe8-03b7dab6ed01</name>
-          <entityField>REGION</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>22779be5-4111-49c2-8821-0ec02cca40bb</name>
-          <entityField>STATE</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>AddressValidationLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>DataTable</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>a8787cc8-57a2-4cd5-903e-da14924a9052</name>
+          <entityField>ZIP</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>fb715731-9162-405e-b2e2-6c20921f026f</name>
+          <entityField>CITY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>05bb9d3b-0e90-4a1a-bfe8-03b7dab6ed01</name>
+          <entityField>REGION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>22779be5-4111-49c2-8821-0ec02cca40bb</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>a272c3cb-7bbf-41a4-9490-884c2f449b40</name>
+          <entityField>STREET</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>e842bb68-96c6-4d1f-bf44-70a29c7c7d72</name>
+          <entityField>FROM_BN</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>59162b47-ec96-4076-8e57-929fccbf133d</name>
+          <entityField>TO_BN</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
+          <entityField>COUNTRY</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 79db5d303641c21d18d1394378a0990e6426bec1..e3a6e2272a5a6583fc0a1e72863b29b7e84519bb 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -1,54 +1,58 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>AdressMultiEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <genericMultipleViewTemplate>
-      <name>MultipleEdit</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>2aebe24e-875a-4c57-8461-16da46d6f080</name>
-          <entityField>ADDR_TYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>ac71d5eb-7ce7-41a0-91aa-5594f2238788</name>
-          <entityField>ADDRESS</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
-          <entityField>BUILDINGNO</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>c1372a93-cf83-4c55-90e6-3b6b352abebf</name>
-          <entityField>ZIP</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>2e7ba632-36ad-4852-bcca-d75bcf3f7de1</name>
-          <entityField>CITY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>435f10b8-b6ef-4187-bffc-fc6104a6130c</name>
-          <entityField>COUNTRY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
-          <entityField>STATE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
-          <entityField>REGION</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
-          <entityField>ADDRIDENTIFIER</entityField>
-        </neonTableColumn>
-      </columns>
-    </genericMultipleViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>AdressMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>MultipleEdit</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>00300f6f-ac45-4daa-9693-6452da972403</name>
+          <entityField>AddressSearch</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>2aebe24e-875a-4c57-8461-16da46d6f080</name>
+          <entityField>ADDR_TYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ac71d5eb-7ce7-41a0-91aa-5594f2238788</name>
+          <entityField>ADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
+          <entityField>BUILDINGNO</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c1372a93-cf83-4c55-90e6-3b6b352abebf</name>
+          <entityField>ZIP</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>2e7ba632-36ad-4852-bcca-d75bcf3f7de1</name>
+          <entityField>CITY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>435f10b8-b6ef-4187-bffc-fc6104a6130c</name>
+          <entityField>COUNTRY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
+          <entityField>REGION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
+          <entityField>ADDRIDENTIFIER</entityField>
+        </neonTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index b9bbdefe5ab84b84da698ffebc9b124b9fd3bc45..01763de1cc5695761550790c001988d6e80ea4fd 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -1,26 +1,26 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>AttributeRelationPreviewList</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <titledListViewTemplate>
-      <name>Relations</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>18c6e169-bd6e-448a-b028-c43f2a6a2973</name>
-          <entityField>AB_ATTRIBUTE_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>ec5ceac7-a2d4-4912-b04b-adc83d3e9589</name>
-          <entityField>VALUE</entityField>
-        </neonTableColumn>
-      </columns>
-    </titledListViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>AttributeRelationPreviewList</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>Relations</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>18c6e169-bd6e-448a-b028-c43f2a6a2973</name>
+          <entityField>AB_ATTRIBUTE_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ec5ceac7-a2d4-4912-b04b-adc83d3e9589</name>
+          <entityField>VALUE</entityField>
+        </neonTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0e582bf507e298476874175d085d1b7988c4dc0a
--- /dev/null
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -0,0 +1,23 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificationAdminFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Classificationtypes</name>
+      <hideActions v="true" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>44e91668-7947-49e2-8aa4-b9a03bc87842</name>
+          <entityField>UID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod b/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..01e5e5579f7c7f5061697a45810d4983ecd20347
--- /dev/null
+++ b/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod
@@ -0,0 +1,17 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificationAdminMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>ce2fe9f5-b504-45fb-9cf0-be394f7aa901</name>
+      <entityField>ClassificationsAdmin</entityField>
+      <view>ClassificationAdminTree_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..957032ec621a5d865bf3c024180ee28c7aa9d529
--- /dev/null
+++ b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
@@ -0,0 +1,22 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificationAdminTree_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treeViewTemplate>
+      <name>classificationTree</name>
+      <titleField>SCORETYPE</titleField>
+      <defaultGroupFields>
+        <element>CLASSIFICATIONNUMBER</element>
+      </defaultGroupFields>
+      <showChildrenCount v="false" />
+      <entryAction>edit</entryAction>
+      <entityField>#ENTITY</entityField>
+    </treeViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod b/neonView/ClassificationFilter_view/ClassificationFilter_view.aod
similarity index 64%
rename from neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
rename to neonView/ClassificationFilter_view/ClassificationFilter_view.aod
index 87da3752309443372ef83944905b3c79e605857f..fa541ebaeb8626db1a1a3cbea7b4d8fdba3b3a68 100644
--- a/neonView/SalesprojectClassificationFilter_view/SalesprojectClassificationFilter_view.aod
+++ b/neonView/ClassificationFilter_view/ClassificationFilter_view.aod
@@ -1,26 +1,22 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectClassificationFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>Classifications</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>4139f5bd-0273-4b43-99a7-9122f0322170</name>
-          <entityField>CLASSNAME</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>9d31832d-86e4-49a8-99a5-2129cd6a1994</name>
-          <entityField>POINTS</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificationFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Classifications</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>f87e6f40-74ad-4f27-b9b0-32e1c6b294f4</name>
+          <entityField>CLASSIFICATIONTYPE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..dbd9a0c67b155461cc80ca809ccef6ff1b6b4608
--- /dev/null
+++ b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
@@ -0,0 +1,32 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificationScoreMultipleEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>scores</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>4c9b65c7-96a8-4524-a465-2e928b51242f</name>
+          <entityField>TITLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9321f0c5-321e-4962-843b-f274d33916be</name>
+          <entityField>SCORE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1170097d-0206-445e-8f2d-5768300f0262</name>
+          <entityField>SORT</entityField>
+        </neonTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1e510bc616b76aa70a6f77c03c5b59fdfbdd81ea
--- /dev/null
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -0,0 +1,32 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificationTree_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>ClassificationTreeTable</name>
+      <defaultGroupFields>
+        <element>CLASSIFICATIONNUMBER</element>
+      </defaultGroupFields>
+      <hideActions v="true" />
+      <showChildrenCount v="false" />
+      <entryAction>edit</entryAction>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>246c0212-dadb-4d71-9567-ceab37e9ef10</name>
+          <entityField>SCORETYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9a62baa4-71cf-4b9d-8cd6-883b233a9b84</name>
+          <entityField>CLASSIFICATIONSCORE_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
similarity index 52%
rename from neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
rename to neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
index 93d3137486787d482825a37edc12f0b58e5a0080..aca103e5266fe84cb7ca8c65e1fa5e77c694d168 100644
--- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
+++ b/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
@@ -1,31 +1,34 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectClassificationPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Info</name>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
-          <entityField>CLASSNAME</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
-          <entityField>POINTS</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
-      <entityField>SalesprojectClassificationEntries</entityField>
-      <view>SalesprojectClassificationEntryPreview_view</view>
-    </neonViewReference>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificatonAdminEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>classification</name>
+      <editMode v="true" />
+      <drawerCaption>Classification</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>7fddc4d4-6bdc-4c7a-9d69-bba4a9506707</name>
+          <entityField>CLASSIFICATIONNUMBER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>cb6e8f64-b2a4-4cc4-88b7-2f64f56b83dc</name>
+          <entityField>SCORETYPE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>214fbe22-378d-404e-99f8-f175e037f196</name>
+      <entityField>ClassificationScores</entityField>
+      <view>ClassificationScoreMultipleEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod b/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3a9b326512df01c24892286444db3d620e38e578
--- /dev/null
+++ b/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
@@ -0,0 +1,37 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>ClassificatonEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>VERTICAL</direction>
+      <maxDirectionElements v="1" />
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>classification</name>
+      <editMode v="true" />
+      <drawerCaption>Classification</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
+          <entityField>CLASSIFICATIONSCORE_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>info</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
+          <entityField>Info</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index 3c36cb4a9115cf3b0f95d0b8008346013e907ac6..e87e4b80f8ce90e5f85919f98cf0e3961a220810 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -1,36 +1,37 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>DocumentTemplatePreview_view</name>
-  <title>Document Template</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Card</name>
-      <titleField>NAME</titleField>
-      <subtitleField>TYPE</subtitleField>
-      <descriptionField>CLASSIFICATION</descriptionField>
-      <entityField>#ENTITY</entityField>
-      <title>Document Template</title>
-    </cardViewTemplate>
-    <neonViewReference>
-      <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
-      <entityField>Documents</entityField>
-      <view>DocumentList_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>632c3a73-41f9-4d95-b394-2699a7200cf1</name>
-      <entityField>Links</entityField>
-      <view>DocumentTemplateLinkList_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5a2db686-85a9-4a21-acde-7a6ee826eeaa</name>
-      <entityField>Attributes</entityField>
-      <view>AttributeRelationPreviewList</view>
-    </neonViewReference>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>DocumentTemplatePreview_view</name>
+  <title>Document Template</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Card</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <titleField>NAME</titleField>
+      <subtitleField>TYPE</subtitleField>
+      <descriptionField>CLASSIFICATION</descriptionField>
+      <entityField>#ENTITY</entityField>
+      <title>Document Template</title>
+    </cardViewTemplate>
+    <neonViewReference>
+      <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
+      <entityField>Documents</entityField>
+      <view>DocumentList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>632c3a73-41f9-4d95-b394-2699a7200cf1</name>
+      <entityField>Links</entityField>
+      <view>DocumentTemplateLinkList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>5a2db686-85a9-4a21-acde-7a6ee826eeaa</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationPreviewList</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod b/neonView/EmailEdit_view/EmailEdit_view.aod
similarity index 66%
rename from neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
rename to neonView/EmailEdit_view/EmailEdit_view.aod
index 80dae257c9923647d887cebc7a44320ce1bff51d..d2e4d3b22bb1fd976c706f0842a46e28a3801701 100644
--- a/neonView/SalesprojectClassificationEntryEdit_view/SalesprojectClassificationEntryEdit_view.aod
+++ b/neonView/EmailEdit_view/EmailEdit_view.aod
@@ -1,26 +1,28 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectClassificationEntryEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Edit</name>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>003f3304-b8fb-4009-ba55-b56d005191e3</name>
-          <entityField>NAME</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>90630f8e-8e32-4743-9b79-a1faa6e26414</name>
-          <entityField>VALUE</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>EmailEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>bfcf8766-7e6d-4240-9cbd-54abfc5a1883</name>
+          <entityField>RECIPIENT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>72441756-f00d-42a7-bd3f-a6f7964891bc</name>
+          <entityField>DOCUMENT_TEMPLATE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod b/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
deleted file mode 100644
index f3aac2c0b1e5630b2794daf0a4d35efd8162829d..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectClassificationEntryPreview_view/SalesprojectClassificationEntryPreview_view.aod
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectClassificationEntryPreview_view</name>
-  <title>asdf</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <titledListViewTemplate>
-      <name>Info</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>91aa4685-98f7-40e9-87be-877583a91143</name>
-          <entityField>NAME</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>88105c9a-fdf8-4d2b-ac96-d57ef4f41aa4</name>
-          <entityField>TYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>b862235e-6595-4ae0-8bd0-5f942d975c67</name>
-          <entityField>VALUE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>ff2b615b-5c98-4a21-bb71-34027711d5e7</name>
-          <entityField>POINTS</entityField>
-        </neonTableColumn>
-      </columns>
-    </titledListViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index f21b4feb95d207a2fcdc2d7f9af4ab76c1742a61..ced09a2fdf656d3926da820d3d10d0acccde3034 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -1,78 +1,83 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>04b5a305-b2a6-481a-83a5-1d94bee08143</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>04b5a305-b2a6-481a-83a5-1d94bee08143</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>e0bc8b4b-7def-4fc7-9c07-132e4fb25c29</name>
-      <entityField>Activities</entityField>
-      <view>ActivityFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>10252b5c-3620-4200-9827-f53ba35b5c2f</name>
-      <entityField>Tasks</entityField>
-      <view>TaskFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>9dbe03b3-e5d3-4db8-b542-506b13322d4f</name>
-      <entityField>SalesprojectForecasts</entityField>
-      <view>SalesprojectForecastFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>8986df12-88fc-49a8-9e48-f4c1f371532f</name>
-      <entityField>#ENTITY</entityField>
-      <view>SalesprojectMilestone_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
-      <entityField>SalesprojectCompetitions</entityField>
-      <view>SalesprojectCompetitionFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>4e126e3b-6a11-4229-becf-62268ce2df64</name>
-      <entityField>SalesprojectSources</entityField>
-      <view>SalesprojectSourceFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>b1deae1b-c39a-48bd-9221-ed4153ee8ec9</name>
-      <entityField>SalesprojectOffers</entityField>
-      <view>OfferFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>dafb2a9c-c192-46e2-a233-0799b694ed7d</name>
-      <entityField>SalesprojectMembers</entityField>
-      <view>SalesprojectMemberFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>c0027b4d-c014-4053-a595-daad9a73ad5c</name>
-      <entityField>Timetrackings</entityField>
-      <view>TimetrackingFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>9c98cef0-f9dd-40a7-a9c9-eb4e741286d2</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTree_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>0a3f2444-8d91-41e3-8f4d-19a6013c29c5</name>
-      <entityField>Documents</entityField>
-      <view>DocumentFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
-      <entityField>LogHistoryConsumer</entityField>
-      <view>LogHistoryFilter_view</view>
-    </neonViewReference>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>SalesprojectMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>04b5a305-b2a6-481a-83a5-1d94bee08143</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>04b5a305-b2a6-481a-83a5-1d94bee08143</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e0bc8b4b-7def-4fc7-9c07-132e4fb25c29</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>10252b5c-3620-4200-9827-f53ba35b5c2f</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2a26811c-de47-442a-97d2-adc90a6c99ae</name>
+      <entityField>Classifications</entityField>
+      <view>ClassificationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>9dbe03b3-e5d3-4db8-b542-506b13322d4f</name>
+      <entityField>SalesprojectForecasts</entityField>
+      <view>SalesprojectForecastFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>8986df12-88fc-49a8-9e48-f4c1f371532f</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectMilestone_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
+      <entityField>SalesprojectCompetitions</entityField>
+      <view>SalesprojectCompetitionFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4e126e3b-6a11-4229-becf-62268ce2df64</name>
+      <entityField>SalesprojectSources</entityField>
+      <view>SalesprojectSourceFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b1deae1b-c39a-48bd-9221-ed4153ee8ec9</name>
+      <entityField>SalesprojectOffers</entityField>
+      <view>OfferFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>dafb2a9c-c192-46e2-a233-0799b694ed7d</name>
+      <entityField>SalesprojectMembers</entityField>
+      <view>SalesprojectMemberFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c0027b4d-c014-4053-a595-daad9a73ad5c</name>
+      <entityField>Timetrackings</entityField>
+      <view>TimetrackingFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>9c98cef0-f9dd-40a7-a9c9-eb4e741286d2</name>
+      <entityField>AttributeTree</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>0a3f2444-8d91-41e3-8f4d-19a6013c29c5</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
+      <entityField>LogHistoryConsumer</entityField>
+      <view>LogHistoryFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index c9858b914ae1457e77ddf5b1f16c265255d7c3a6..06b276782207951313dac6c6287ca7ca4e258409 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,102 +1,106 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-      <header>Head</header>
-      <footer>AdditionalInfo</footer>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Head</name>
-      <iconField>IMAGE</iconField>
-      <titleField>PROJECTTITLE</titleField>
-      <subtitleField>CONTACT_ID</subtitleField>
-      <descriptionField>PROJECTCODE</descriptionField>
-      <favoriteAction1>newActivity</favoriteAction1>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-    <genericViewTemplate>
-      <name>Details</name>
-      <showDrawer v="true" />
-      <drawerCaption>Details</drawerCaption>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
-          <entityField>RELATION_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
-          <entityField>STATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
-          <entityField>REASONS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
-          <entityField>PHASE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
-          <entityField>STARTDATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
-          <entityField>ENDDATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
-          <entityField>PROBABILITY</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
-          <entityField>VOLUME</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
-          <entityField>TIMETRACKINGSUM</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <genericViewTemplate>
-      <name>Info</name>
-      <showDrawer v="true" />
-      <drawerCaption>Further informations</drawerCaption>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
-          <entityField>INFO</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
-      <entityField>MainDocuments</entityField>
-      <view>DocumentList_view</view>
-    </neonViewReference>
-    <scoreCardViewTemplate>
-      <name>AdditionalInfo</name>
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>79490331-6be4-422f-9450-da0db56f0654</name>
-          <entityField>InactiveTime</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
-          <entityField>RemainingTime</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>884d9900-7e75-42d1-a669-53f6aae5c420</name>
-          <entityField>RunTime</entityField>
-        </entityFieldLink>
-      </fields>
-    </scoreCardViewTemplate>
-  </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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>SalesprojectPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Head</header>
+      <footer>AdditionalInfo</footer>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Head</name>
+      <iconField>IMAGE</iconField>
+      <titleField>PROJECTTITLE</titleField>
+      <subtitleField>CONTACT_ID</subtitleField>
+      <descriptionField>PROJECTCODE</descriptionField>
+      <favoriteAction1>newActivity</favoriteAction1>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Details</name>
+      <showDrawer v="true" />
+      <drawerCaption>Details</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
+          <entityField>RELATION_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
+          <entityField>REASONS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
+          <entityField>PHASE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
+          <entityField>STARTDATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
+          <entityField>ENDDATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+          <entityField>PROBABILITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+          <entityField>VOLUME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
+          <entityField>TIMETRACKINGSUM</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>Info</name>
+      <showDrawer v="true" />
+      <drawerCaption>Further informations</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>7fb4fd2e-6076-461b-8d56-9ce4a939d281</name>
+          <entityField>ClassificationResult</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
+          <entityField>INFO</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
+      <entityField>MainDocuments</entityField>
+      <view>DocumentList_view</view>
+    </neonViewReference>
+    <scoreCardViewTemplate>
+      <name>AdditionalInfo</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>79490331-6be4-422f-9450-da0db56f0654</name>
+          <entityField>InactiveTime</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
+          <entityField>RemainingTime</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>884d9900-7e75-42d1-a669-53f6aae5c420</name>
+          <entityField>RunTime</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 6579b81b8e443d7712279718dc0dc5559b440250..38c660583524e33a6a1ef768509ef7c4590cf56e 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>basicPerm</projectName>
+  <projectName>xRM-Basic2019</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>
@@ -54,6 +54,26 @@
       <name>addressValidation.countryParamName</name>
       <property>country</property>
     </customStringProperty>
+    <customBooleanProperty>
+      <name>zipCityValidation.enable</name>
+      <property v="false" />
+    </customBooleanProperty>
+    <customStringProperty>
+      <name>zipCityValidation.url</name>
+      <property>https://services.aditosoftware.local/services/rest/ws_checkZipCity</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>zipCityValidation.user</name>
+      <property>Admin</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>zipCityValidation.pw</name>
+      <property>a</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>zipCityValidation.countryParamName</name>
+      <property>country</property>
+    </customStringProperty>
     <customBooleanProperty>
       <name>phoneValidation.enable</name>
       <description></description>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index d7f876a8923b11f265672b0d4e8ba4471b6d2105..26a4efc1d49cfdef8c81de0730eb1c9097a79e69 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -1,201 +1,201 @@
-import("system.vars");
-import("system.util");
-import("system.datetime");
-import("system.text");
-import("system.neon");
-import("system.db");
-import("system.translate");
-import("system.eMath");
-import("Util_lib");
-import("Sql_lib");
-import("Keyword_lib");
-import("Product_lib");
-import("Report_lib");
-import("Context_lib");
-
-/**
- * Methods used by for activities (former history).
- * Do not create an instance of this!
- * 
- * @class
- */
-function ActivityUtils() {}
-
-/**
- * Create a new activity
- */
-ActivityUtils.createNewActivity = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
-{
-    _ActivityTaskUtils._createNew("Activity", pRowId, pAdditionalLinks, pParentContext, pParentId)
-}
-
-/*
- * Gets the date of the last activity
- * 
- * @param {String} pRowId the rowid of the dataset
- * 
- * @return {number|null} the date of the last actvity as long
- */
-ActivityUtils.getLastActivityDate = function(pRowId)
-{
-    var context = ContextUtils.getCurrentContextId();
-    var sqlUtil = new SqlMaskingUtils();
-    var activitySql = "select " + sqlUtil.max("ENTRYDATE") + " from ACTIVITY "
-        + " join ACTIVITYLINK on ACTIVITY.ACTIVITYID = ACTIVITYLINK.ACTIVITY_ID";
-    activitySql = SqlCondition.begin()
-        .andPrepare("ACTIVITYLINK.OBJECT_TYPE", context)
-        .andPrepare("ACTIVITYLINK.OBJECT_ROWID", pRowId)
-        .buildSql(activitySql);
-    
-    var entryDate = db.cell(activitySql);
-    if (entryDate != "")
-        return parseInt(entryDate);
-    return null;
-}
-
-/**
- * add the links to the link-table in new mode
- * 
- * @return {String} pObjectIdField jdito Field for the objectId
- * @return {String} pRowIdField jdito Field for the rowId
- * @return {String} pAdditionalLinksField jdito Field for additional links
- */
-ActivityUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
-{
-    _ActivityTaskUtils._addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
-}
-
-/**
- * Methods used by for tasks.
- * Do not create an instance of this!
- * 
- * @class
- */
-function TaskUtils () {}
-   
-
-/**
- * Create a new task
- */
-TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
-{
-    _ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId)
-}
-
-/**
- * Create a new task
- */
-TaskUtils.hasTasks = function(pRowId, pObjectType)
-{
-    if (pRowId != "" && pObjectType != "")
-    {
-        var cond = SqlCondition.begin().andPrepare("TASKLINK.OBJECT_TYPE", pObjectType)
-                                       .andPrepare("TASKLINK.OBJECT_ROWID", pRowId);
-        var taskCount = db.cell(cond.buildSql("select count(*) from TASKLINK"));
-        if (taskCount != "0")
-            return true;
-        else 
-            return false;
-    }
-    else
-        return true;
-}
-
-/**
- * add the links to the link-table in new mode
- * 
- * @return {String} pObjectIdField jdito Field for the objectId
- * @return {String} pRowIdField jdito Field for the rowId
- * @return {String} pAdditionalLinksField jdito Field for additional links
- */
-TaskUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
-{
-    _ActivityTaskUtils._addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
-}
-
-/**
- * Methods used by for tasks.
- * Do not create an instance of this!
- * 
- * @ignore
- * @class
- */
-function _ActivityTaskUtils() {}
-   
-
-/**
- * Create a new task
- * @ignore
- */
-_ActivityTaskUtils._createNew = function(pContext, pRowId, pAdditionalLinks, pParentContext, pParentId)
-{
-    if (pAdditionalLinks == undefined)
-        pAdditionalLinks = [];
-    
-    var params = {};
-    if (pRowId)
-    {
-        params["ObjectId_param"] = ContextUtils.getCurrentContextId();
-        params["RowId_param"] = pRowId;
-    }
-        
-    params["PresetLinks_param"] = JSON.stringify(pAdditionalLinks);
-    
-    if (pParentContext && pParentId)
-    {
-        
-        
-        params["ParentContext_param"] = pParentContext;
-        params["ParentId_param"] = pParentId;
-    }
-
-    neon.openContext(pContext, null, null, neon.OPERATINGSTATE_NEW, params);
-}
-
-/**
- * add the links to the link-table in new mode
- * 
- * @return {String} pObjectIdField jdito Field for the objectId
- * @return {String} pRowIdField jdito Field for the rowId
- * @return {String} pAdditionalLinksField jdito Field for additional links
- * 
- * @ignore
- */
-_ActivityTaskUtils._addLinkRecords = function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, pConsumerName)
-{
-    if (vars.exists(pAdditionalLinksField))
-        presetLinks = JSON.parse(vars.get(pAdditionalLinksField));
-
-    if (!presetLinks)
-        presetLinks = [];
-    
-    if (vars.exists(pRowIdField) && vars.get(pRowIdField)
-        && vars.exists(pObjectIdField) && vars.get(pObjectIdField))
-        presetLinks.push([vars.get(pObjectIdField), vars.get(pRowIdField)]);
-
-    if (vars.exists(pParentContextField) && vars.exists(pParentIdField))
-    {
-        switch (vars.get(pParentContextField))
-        {
-            case "Activity":
-                presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
-                             .andPrepare("ACTIVITYLINK.ACTIVITY_ID", vars.get(pParentIdField))
-                             .buildSql("select OBJECT_TYPE, OBJECT_ROWID from ACTIVITYLINK", "1=2")));
-                break;
-            case "Task":
-                presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
-                             .andPrepare("TASKLINK.TASK_ID", vars.get(pParentIdField))
-                             .buildSql("select OBJECT_TYPE, OBJECT_ROWID from TASKLINK", "1=2")));
-                break;
-        }
-        
-    }
-
-    presetLinks.forEach(function(link) {
-        neon.addRecord(pConsumerName, {
-            "OBJECT_TYPE" : link[0], 
-            "OBJECT_ROWID" : link[1]
-        });
-    });
-}
-
+import("system.vars");
+import("system.util");
+import("system.datetime");
+import("system.text");
+import("system.neon");
+import("system.db");
+import("system.translate");
+import("system.eMath");
+import("Util_lib");
+import("Sql_lib");
+import("Keyword_lib");
+import("Product_lib");
+import("Report_lib");
+import("Context_lib");
+
+/**
+ * Methods used by for activities (former history).
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function ActivityUtils() {}
+
+/**
+ * Create a new activity
+ */
+ActivityUtils.createNewActivity = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
+{
+    _ActivityTaskUtils._createNew("Activity", pRowId, pAdditionalLinks, pParentContext, pParentId)
+}
+
+/*
+ * Gets the date of the last activity
+ * 
+ * @param {String} pRowId the rowid of the dataset
+ * 
+ * @return {number|null} the date of the last actvity as long
+ */
+ActivityUtils.getLastActivityDate = function(pRowId)
+{
+    var context = ContextUtils.getCurrentContextId();
+    var sqlUtil = new SqlMaskingUtils();
+    var activitySql = "select " + sqlUtil.max("ENTRYDATE") + " from ACTIVITY "
+        + " join ACTIVITYLINK on ACTIVITY.ACTIVITYID = ACTIVITYLINK.ACTIVITY_ID";
+    activitySql = SqlCondition.begin()
+        .andPrepare("ACTIVITYLINK.OBJECT_TYPE", context)
+        .andPrepare("ACTIVITYLINK.OBJECT_ROWID", pRowId)
+        .buildSql(activitySql);
+    
+    var entryDate = db.cell(activitySql);
+    if (entryDate != "")
+        return parseInt(entryDate);
+    return null;
+}
+
+/**
+ * add the links to the link-table in new mode
+ * 
+ * @return {String} pObjectIdField jdito Field for the objectId
+ * @return {String} pRowIdField jdito Field for the rowId
+ * @return {String} pAdditionalLinksField jdito Field for additional links
+ */
+ActivityUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
+{
+    _ActivityTaskUtils._addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
+}
+
+/**
+ * Methods used by for tasks.
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function TaskUtils () {}
+   
+
+/**
+ * Create a new task
+ */
+TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
+{
+    _ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId)
+}
+
+/**
+ * Create a new task
+ */
+TaskUtils.hasTasks = function(pRowId, pObjectType)
+{
+    if (pRowId != "" && pObjectType != "")
+    {
+        var cond = SqlCondition.begin().andPrepare("TASKLINK.OBJECT_TYPE", pObjectType)
+                                       .andPrepare("TASKLINK.OBJECT_ROWID", pRowId);
+        var taskCount = db.cell(cond.buildSql("select count(*) from TASKLINK"));
+        if (taskCount != "0")
+            return true;
+        else 
+            return false;
+    }
+    else
+        return true;
+}
+
+/**
+ * add the links to the link-table in new mode
+ * 
+ * @return {String} pObjectIdField jdito Field for the objectId
+ * @return {String} pRowIdField jdito Field for the rowId
+ * @return {String} pAdditionalLinksField jdito Field for additional links
+ */
+TaskUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
+{
+    _ActivityTaskUtils._addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
+}
+
+/**
+ * Methods used by for tasks.
+ * Do not create an instance of this!
+ * 
+ * @ignore
+ * @class
+ */
+function _ActivityTaskUtils() {}
+   
+
+/**
+ * Create a new task
+ * @ignore
+ */
+_ActivityTaskUtils._createNew = function(pContext, pRowId, pAdditionalLinks, pParentContext, pParentId)
+{
+    if (pAdditionalLinks == undefined)
+        pAdditionalLinks = [];
+    
+    var params = {};
+    if (pRowId)
+    {
+        params["ObjectId_param"] = ContextUtils.getCurrentContextId();
+        params["RowId_param"] = pRowId;
+    }
+        
+    params["PresetLinks_param"] = JSON.stringify(pAdditionalLinks);
+    
+    if (pParentContext && pParentId)
+    {
+        
+        
+        params["ParentContext_param"] = pParentContext;
+        params["ParentId_param"] = pParentId;
+    }
+
+    neon.openContext(pContext, null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/**
+ * add the links to the link-table in new mode
+ * 
+ * @return {String} pObjectIdField jdito Field for the objectId
+ * @return {String} pRowIdField jdito Field for the rowId
+ * @return {String} pAdditionalLinksField jdito Field for additional links
+ * 
+ * @ignore
+ */
+_ActivityTaskUtils._addLinkRecords = function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, pConsumerName)
+{
+    if (vars.exists(pAdditionalLinksField))
+        presetLinks = JSON.parse(vars.getString(pAdditionalLinksField));
+
+    if (!presetLinks)
+        presetLinks = [];
+    
+    if (vars.exists(pRowIdField) && vars.get(pRowIdField)
+        && vars.exists(pObjectIdField) && vars.get(pObjectIdField))
+        presetLinks.push([vars.get(pObjectIdField), vars.get(pRowIdField)]);
+
+    if (vars.exists(pParentContextField) && vars.exists(pParentIdField))
+    {
+        switch (vars.get(pParentContextField))
+        {
+            case "Activity":
+                presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
+                             .andPrepare("ACTIVITYLINK.ACTIVITY_ID", vars.get(pParentIdField))
+                             .buildSql("select OBJECT_TYPE, OBJECT_ROWID from ACTIVITYLINK", "1=2")));
+                break;
+            case "Task":
+                presetLinks = presetLinks.concat(db.table(SqlCondition.begin()
+                             .andPrepare("TASKLINK.TASK_ID", vars.get(pParentIdField))
+                             .buildSql("select OBJECT_TYPE, OBJECT_ROWID from TASKLINK", "1=2")));
+                break;
+        }
+        
+    }
+
+    presetLinks.forEach(function(link) {
+        neon.addRecord(pConsumerName, {
+            "OBJECT_TYPE" : link[0], 
+            "OBJECT_ROWID" : link[1]
+        });
+    });
+}
+
diff --git a/process/AttributeRegistry_basic/AttributeRegistry_basic.aod b/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d4917ea14ea0bb20d46d5ca2680e75daa034ce5c
--- /dev/null
+++ b/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
@@ -0,0 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>AttributeRegistry_basic</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/AttributeRegistry_basic/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/AttributeRegistry_basic/process.js b/process/AttributeRegistry_basic/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..a132602bb79bc6490fc19480b8680a7036bc4dff
--- /dev/null
+++ b/process/AttributeRegistry_basic/process.js
@@ -0,0 +1,15 @@
+/**
+ * provides static functionality for a registry of attribute ids
+ * The reason for this is a convenient usage within jdito-code (autocomplete)
+ * and better readability
+ * 
+ * @class
+ * 
+ * @example
+ * $AttributeRegistry.pricelist()
+ */
+function $AttributeRegistry(){}
+
+$AttributeRegistry.pricelist = function(){return "97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec";};
+$AttributeRegistry.paymentTerm = function(){return "292fae38-6557-466d-8843-3b1b4a1f6599";};
+$AttributeRegistry.deliveryTerm = function(){return "3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb";};
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 550620fb58059907dcf2be7e1b043cca629b986d..82369b852c871725445e0a15c7783076580628f7 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,709 +1,784 @@
-import("system.util");
-import("system.datetime");
-import("system.translate");
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("Sql_lib");
-import("Keyword_lib");
-
-/**
- * Provides functions for the work with attributes, like
- * listing the available attributes for a context.
- * Don't instanciate this!
- * 
- * @class
- */
-function AttributeUtil () {}
-
-/**
- * Gives an array of all available attributes for a context. This is used in the possibleItems
- * process for the attribute id in AttributeRelation
- * 
- * @param {String} pObjectType the object type (= context)
- * @param {boolean} [pIncludeGroups=false]
- * @param {String[]} [pFilteredAttributeIds=[]] Whitleist of attribute ids
- * @param {Object} [pAttributeCount=null] Object with attribute ids and their count
- * 
- * @return {String[]} array of attributeIds
- */
-AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFilteredAttributeIds, pAttributeCount)
-{
-    if (pObjectType == null)
-        return [];
-    
-    var attrSql = "select AB_ATTRIBUTEID from AB_ATTRIBUTE"
-        + " join AB_ATTRIBUTEUSAGE  on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
-    attrCond = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
-        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
-        .and("ATTRIBUTE_ACTIVE = 1");
-    
-    if (pAttributeCount)
-    {
-        for (let attributeId in pAttributeCount)
-        {
-            attrCond.andSqlCondition(
-                SqlCondition.begin()
-                    .orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId, "# != ?")
-                    .orPrepare("AB_ATTRIBUTEUSAGE.MAX_COUNT", pAttributeCount[attributeId], "# > ?")
-                    .or("AB_ATTRIBUTEUSAGE.MAX_COUNT is null")
-            );
-        }
-    }
-        
-    if (pFilteredAttributeIds != undefined && pFilteredAttributeIds.length > 0)
-    {
-        var filteredIdsCondition = new SqlCondition();
-
-        pFilteredAttributeIds.forEach(function(id) 
-        {
-            this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
-        }, filteredIdsCondition);
-
-        attrCond.andSqlCondition(filteredIdsCondition);
-    }
-
-    if (!pIncludeGroups)
-        attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
-    
-    var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
-    
-    return attributes;
-}
-
-/**
- * returns the name of an attribute with all parent attribute names
- * 
- * @param {String} pAttributeId the id of the attribute
- * @param {Boolean} [pSimpleName=false] Use only the name of the attribute and not the names of the parents.
- * 
- * @return {String} the name of the attribute
- */
-AttributeUtil.getFullAttributeName = function (pAttributeId, pSimpleName) 
-{
-    if (pSimpleName == undefined)
-        pSimpleName = false;
-    
-    if (!pAttributeId)
-        return "";
-    var attributeNames = [];
-    var attribute;
-    do {
-        attribute = db.array(db.ROW, SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
-            .buildSql("select ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID from AB_ATTRIBUTE")
-        );
-        if (attribute.length > 0)
-        {
-            attributeNames.push(attribute[0]);
-                pAttributeId = attribute[1];
-        }
-        else
-            pAttributeId = "";
-    } while (pAttributeId && !pSimpleName);
-    
-    return attributeNames.reverse().join(" / ");
-}
-
-/**
- * returns the name of an attribute
- * 
- * @param {String} pAttributeId the id of the attribute
- * 
- * @return {String} the name of the attribute
- */
-AttributeUtil.getSimpleAttributeName = function (pAttributeId) 
-{
-    var attributeName = db.cell(SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
-        .buildSql("select ATTRIBUTE_NAME from AB_ATTRIBUTE")
-    );
-
-    return attributeName;
-}
-
-/**
- * returns the ids of all subordinated attributes of an attribute
- * 
- * @param {String} pAttributeId the id of the attribute
- * 
- * @result {String[]} array with the ids of every subordinated attribute
- */
-AttributeUtil.getAllChildren = function (pAttributeId)
-{
-    var childIds = [];
-    var attributes= [pAttributeId];
-    while (attributes.length > 0)
-    {
-        attributes = db.array(db.COLUMN, SqlCondition.begin()
-            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
-            .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
-        );
-        if (attributes.length > 0)
-            childIds = childIds.concat(attributes);
-    }
-    return childIds;
-}
-
-/**
- * checks if an attribute has attribute relations
- * 
- * @param {String} pAttributeId the id of the attribute
- * 
- * @result {boolean} true if it has relations
- */
-AttributeUtil.hasRelations = function (pAttributeId)
-{
-    if (!pAttributeId)
-        return false;
-    return db.cell(SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
-        .buildSql(
-            "select exists ("
-            +    "select AB_ATTRIBUTERELATIONID from AB_ATTRIBUTERELATION "
-            +    "where AB_ATTRIBUTE_ID = AB_ATTRIBUTEID"
-            + ") from AB_ATTRIBUTE", "1=2"
-        )
-    ) == "true";
-}
-
-/**
- * returns the type of an attribute
- * 
- * @param {String} pAttributeId the id of the attribute
- * 
- * @result {String} attribute type
- */
-AttributeUtil.getAttributeType = function (pAttributeId)
-{
-    var attrTypeSelect = "select ATTRIBUTE_TYPE from AB_ATTRIBUTE";
-    attrTypeSelect = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
-        .buildSql(attrTypeSelect);
-    return db.cell(attrTypeSelect).trim();
-}
-
-/*********************************************************************************************************************/
-
-/**
- * Provides functions for the work with attributeRelations, getting the value of an attributeRelation for an object.
- * Don't instanciate this!
- * 
- * @class
- */
-function AttributeRelationUtils () {}
-
-/**
- * gets the value of an attributeRelation for one dataset (e. g. a person)
- * 
- * @param {String} pAttributeId attribute-id
- * @param {String} pObjectRowId row-id of the dataset
- * @param {String} [pObjectType=null] object-type
- * @param {String} [pGetViewValue=false] if true the values are resolved and formatted
- * 
- * @return {String|null} the value of the attribute
- */
-AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObjectType, pGetViewValue)
-{
-    var attrCond = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId)
-        .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttributeId);
-    if (pObjectType != null)
-        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
-    
-    var defaultFields = [
-        "AB_ATTRIBUTE.ATTRIBUTE_TYPE", 
-        "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
-        "COMBOVAL.ATTRIBUTE_NAME"
-    ];
-    var valueFields = AttributeTypeUtil.getAllDatabaseFields();
-    var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
-        + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
-        + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
-    
-    var attributeValues = db.array(db.ROW, attributeSql);
-    if (!attributeValues.length)
-        return null;
-    
-    let value = attributeValues[AttributeTypeUtil.getTypeColumnIndex(attributeValues[0]) + defaultFields.length];
-    if (pGetViewValue && attributeValues[1].trim() == $AttributeTypes.COMBO)
-        value = attributeValues[2];
-    else if (pGetViewValue)
-        value = AttributeTypeUtil.getAttributeViewValue(attributeValues[0].trim(), value, attributeValues[1]);
-    
-    return value;
-}
-
-/**
- * gets all attributes for a dataset
- * 
- * @param {String} pObjectRowId object rowid
- * @param {String} [pObjectType=null] object-type
- * @param {String} [pUseAttributeIds=false] if true the ids are used instead of the full attribute names
- * @param {String} [pUseIdValues=false] if true the values are not resolved or formatted
- * 
- * @return {String[][]} two-dimensional array a row is [attributeId|attributeName, value]
- */
-AttributeRelationUtils.getAllAttributes = function (pObjectRowId, pObjectType, pUseAttributeIds, pUseIdValues)
-{
-    var attrCond = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId);
-    if (pObjectType != null)
-        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
-    
-    var defaultFields = [
-        "AB_ATTRIBUTE_ID", 
-        "AB_ATTRIBUTE.ATTRIBUTE_TYPE", 
-        "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
-        "COMBOVAL.ATTRIBUTE_NAME"
-    ];
-    var valueFields = AttributeTypeUtil.getAllDatabaseFields();
-    var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
-        + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
-        + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
-    
-    var attributeNameMap = {};
-    var attributeValues = db.table(attributeSql).map(function (row) 
-    {
-        let attribute = row[0];
-        if (!pUseAttributeIds)
-        {
-            if (!(attribute in attributeNameMap))
-                attributeNameMap[attribute] = AttributeUtil.getFullAttributeName(attribute);
-            attribute = attributeNameMap[attribute];
-        }
-        let value = row[AttributeTypeUtil.getTypeColumnIndex(row[1]) + defaultFields.length];
-        if (!pUseIdValues && row[1].trim() == $AttributeTypes.COMBO)
-            value = row[3];
-        else if (!pUseIdValues)
-            value = AttributeTypeUtil.getAttributeViewValue(row[1].trim(), value, row[2]);
-        
-        return [attribute, value];
-    });
-    
-    return attributeValues;
-}
-
-/**
- * gets the correct attribute value from a map with values depending on the attribute id
- * 
- * @param {String} pAttributeId the attribute id
- * @param {Object} pValueMap a map with the attribute values and the db fields as keys
- * @param {Boolean} [pGetViewValue=false] if true, get the view value
- * 
- * @return {String|null} the value of the attribute or null if the attribute doesn't exist
- */
-AttributeRelationUtils.selectAttributeValue = function (pAttributeId, pValueMap, pGetViewValue)
-{
-    var sqlSelect = "select ATTRIBUTE_TYPE, KEYWORD_CONTAINER from AB_ATTRIBUTE";
-    var type = db.array(db.ROW, SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
-        .buildSql(sqlSelect)
-    );
-    if (!type.length)
-        return null;
-    
-    type[0] = type[0].trim();
-    var field = AttributeTypeUtil.getDatabaseField(type[0]);
-    var value = pValueMap[field];
-    if (pGetViewValue && type[0] == $AttributeTypes.COMBO)
-    {
-        value = db.cell(SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", value)
-            .buildSql("select ATTRIBUTE_NAME from AB_ATTRIBUTE")
-        );
-    }
-    else if (pGetViewValue)
-        value = AttributeTypeUtil.getAttributeViewValue(type[0], value, type[1]);
-    
-    return value;
-}
-
-AttributeRelationUtils.getAttributes = function ()
-{
-    //TODO: implement maybe
-}
-
-/**
- * sets the value of an attribute for one dataset (e. g. a person)
- */
-AttributeRelationUtils.setAttribute = function ()
-{
-    //TODO: implement
-}
-
-/**
- * adds rows for attributes with min_count > 0
- * 
- * @param {String} pObjectType the object type
- * @param {String} pConsumer the name of the attribute relation consumer
- */
-AttributeRelationUtils.presetMandatoryAttributes = function (pObjectType, pConsumer)
-{
-    var mandatoryAttributes = db.table(
-        SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, "# <> ?")
-            .and("ATTRIBUTE_ACTIVE = 1")
-            .and("MIN_COUNT > 0")
-            .buildSql("select AB_ATTRIBUTE_ID, MIN_COUNT from AB_ATTRIBUTEUSAGE "
-                + "join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTEID")
-    );
-    mandatoryAttributes.forEach(function (usage)
-    {
-        //adding an attribute more than 20 times would be too much (having a min_count > 20 is very unlikely)
-        for (let i = 0; i < usage[1] && i < 20; i++)
-            neon.addRecord(pConsumer, {
-                "AB_ATTRIBUTE_ID" : usage[0]
-            });
-    });
-}
-
-/*********************************************************************************************************************/
-
-
-/**
- * Object for the enumeration and management of all attribute types.
- * This Object is only for the general definition of attribute types and for getting
- * data about every type, anything that has to do with a specific attribute (= the function requires an attribute id)
- * should be done in AttributeUtils.
- * The values for each type are:
- * 
- * keyword = the key of the corresponding keyword
- * contentType = the value that is returned in the contentType process for the attribute
- * databaseField = the database field that holds values of attributes with the type
- * 
- * The display name is controlled by the keyword 'AttributeType'
- */
-function $AttributeTypes () {}
-
-$AttributeTypes.TEXT = { 
-    toString : function () {return this.keyword},
-    keyword : "TEXT",
-    contentType : "TEXT", 
-    databaseField : "CHAR_VALUE"
-};
-$AttributeTypes.DATE = {
-    toString : function () {return this.keyword},
-    keyword : "DATE",
-    contentType : "DATE", 
-    databaseField : "DATE_VALUE",
-    getViewValue : function (pValue)
-        {
-            return datetime.toDate(pValue, translate.text("dd.MM.yyyy"));
-        }
-};
-$AttributeTypes.NUMBER = {
-    toString : function () {return this.keyword},
-    keyword : "NUMBER",
-    contentType : "NUMBER", 
-    databaseField : "NUMBER_VALUE"
-};
-$AttributeTypes.BOOLEAN = {
-    toString : function () {return this.keyword},
-    keyword : "BOOLEAN",
-    contentType : "BOOLEAN", 
-    databaseField : "INT_VALUE",
-    getViewValue : function (pValue)
-        {
-            return pValue == "1" ? translate.text("Yes") : translate.text("No");
-        }
-};
-$AttributeTypes.COMBO = {
-    toString : function () {return this.keyword},
-    keyword : "COMBO",
-    contentType : "UNKNOWN",
-    databaseField : "ID_VALUE",
-    isGroup : true
-};
-$AttributeTypes.COMBOVALUE = {
-    toString : function () {return this.keyword},
-    keyword : "COMBOVALUE",
-    contentType : null, 
-    databaseField : null
-};
-$AttributeTypes.GROUP = {
-    toString : function () {return this.keyword},
-    keyword : "GROUP",
-    contentType : null, 
-    databaseField : null,
-    isGroup : true
-};
-$AttributeTypes.KEYWORD = {
-    toString : function () {return this.keyword},
-    keyword : "KEYWORD",
-    contentType : "UNKNOWN", 
-    databaseField : "ID_VALUE", 
-    getViewValue : function (pValue, pKeyword)
-        {
-            return KeywordUtils.getViewValue(pKeyword, pValue);
-        }
-};
-$AttributeTypes.VOID = {
-    toString : function () {return this.keyword},
-    keyword : "VOID",
-    contentType : null,
-    databaseField : null,
-    isGroup : true
-};
-$AttributeTypes.MEMO = { 
-    toString : function () {return this.keyword},
-    keyword : "MEMO",
-    contentType : "LONG_TEXT", 
-    databaseField : "CHAR_VALUE"
-};
-
-function AttributeTypeUtil () {}
-
-/**
- * returns the required contentType for the given attribute type
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {String} the contentType for the attribute
- */
-AttributeTypeUtil.getContentType = function (pAttributeType)
-{
-    if (pAttributeType in $AttributeTypes)
-        return $AttributeTypes[pAttributeType].contentType;
-    return null;
-}
-
-/**
- * returns if the type is a group type
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {Boolean} if the type is a group type
- */
-AttributeTypeUtil.isGroupType = function (pAttributeType)
-{
-    if (pAttributeType in $AttributeTypes)
-        return $AttributeTypes[pAttributeType].isGroup || false;
-    return null;
-}
-
-/**
- * returns the database field for the given attribute type that holds the value of the attribute
- * 
- * @param {String} pAttributeType the attribute type 
- *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
- * @return {String} the database field for the attribute
- */
-AttributeTypeUtil.getDatabaseField = function (pAttributeType)
-{
-    if (pAttributeType in $AttributeTypes)
-        return $AttributeTypes[pAttributeType].databaseField;
-    return null;
-}
-
-AttributeTypeUtil.getAttributeViewValue = function (pAttributeType, pValue, pKeyword)
-{
-    if (pAttributeType in $AttributeTypes && "getViewValue" in $AttributeTypes[pAttributeType])
-        return $AttributeTypes[pAttributeType].getViewValue(pValue, pKeyword);
-    return pValue;
-}
-
-AttributeTypeUtil._initTypeColumnData = function ()
-{
-    var columns = [];
-    var typeColumnMap = {};
-    for (let type in $AttributeTypes)
-    {
-        type = $AttributeTypes[type];
-        if (type.databaseField)
-        {
-            var typeKey = type.toString();
-            var colIndex = columns.indexOf(type.databaseField);
-            if (colIndex == -1)
-            {
-                colIndex = columns.length;
-                columns.push(type.databaseField);
-            }
-            typeColumnMap[typeKey] = colIndex;
-        }
-    }
-    this._allDBColumns = columns;
-    this._typeColumnMap = typeColumnMap;
-}
-
-AttributeTypeUtil.getAllDatabaseFields = function ()
-{
-    if (this._allDBColumns == undefined)
-        AttributeTypeUtil._initTypeColumnData();
-    return this._allDBColumns;
-}
-
-AttributeTypeUtil.getTypeColumnIndex = function (pAttributeType)
-{
-    if (this._typeColumnMap == undefined)
-        AttributeTypeUtil._initTypeColumnData();
-    return this._typeColumnMap[pAttributeType.trim()];
-}
-
-/*********************************************************************************************************************/
-
-/**
- * Functions for AttributeUsages.
- * Do not instanciate this!
- * 
- * @class
- */
-function AttributeUsageUtil () {}
-
-/**
- * Creates AttributeUsages for all subordinate attributes of an attribute.
- * This is required when an usage is added to a superordinate attribute.
- * 
- * @param {String} pAttributeId the id of the superordinate attribute
- * @param {String} pObjectType the context
- */
-AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
-{
-    var table = "AB_ATTRIBUTEUSAGE";
-    var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE"];
-    var types = db.getColumnTypes(table, columns);
-    
-    var sqlSelect = "select AB_ATTRIBUTEID, "
-            + " exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '" 
-            + pObjectType + "') from AB_ATTRIBUTE";
-    
-    var inserts = [];
-    _addInserts(pAttributeId, pObjectType);
-    db.inserts(inserts);
-    
-    function _addInserts (pAttributeId, pObjectType)
-    {
-        var condition = SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
-        var attributes = db.table(condition.buildSql(sqlSelect));
-        
-        attributes.forEach(function (row)
-        {
-            if (row[1] != "true")
-            {
-                let values = [util.getNewUUID(), row[0], pObjectType];
-                inserts.push([table, columns, types, values]);
-            }
-            _addInserts(row[0], pObjectType);
-        });
-    }
-}
-
-/**
- * Updates AttributeUsages for all subordinate attributes of an attribute.
- * This is required when an usage of a superordinate attribute is changed.
- * 
- * @param {String} pAttributeId the id of the superordinate attribute
- * @param {String} pOldObjectType ye olde context
- * @param {String} pNewObjectType the new context
- */
-AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType, pNewObjectType)
-{
-    if (!pNewObjectType)
-        return;
-    
-    var table = "AB_ATTRIBUTEUSAGE";
-    
-    var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID, "
-        + " exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '" 
-        + pNewObjectType + "')"
-        + " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pOldObjectType + "'";
-    
-    var updateCond = SqlCondition.begin();
-    
-    //it is possible that the new objectType is already in a subordinate attribute 
-    //and an update could cause a duplicate entry so one has to be deleted
-    var deleteCond = SqlCondition.begin();
-    
-    _addUpdateIds(pAttributeId, pOldObjectType);
-        
-    if (updateCond.isSet())
-        db.updateData(table, ["OBJECT_TYPE"], null, [pNewObjectType], updateCond.build("1=2"));
-    if (deleteCond.isSet())
-        db.deleteData(table, deleteCond.build("1=2"));
-    
-    function _addUpdateIds (pAttributeId)
-    {
-        var condition = SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
-        var attributes = db.table(condition.buildSql(sqlSelect));
-        
-        attributes.forEach(function (row)
-        {
-            if (row[1] && row[2] == "true")
-                deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1]);
-            else if (row[1])
-                updateCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1]);
-            _addUpdateIds(row[0]);
-        });
-    }
-}
-
-/**
- * Deletes AttributeUsages for all subordinate attributes of an attribute.
- * This is required when an usage is removed from a superordinate attribute.
- * 
- * @param {String} pAttributeId the id of the superordinate attribute
- * @param {String} pObjectType the context
- */
-AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
-{
-    var table = "AB_ATTRIBUTEUSAGE";
-    
-    var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID "
-        + " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pObjectType + "'";
-    
-    var deleteCond = SqlCondition.begin();
-    _addDeleteIds(pAttributeId, pObjectType);
-    if (deleteCond.isSet())
-        db.deleteData(table, deleteCond.build("1=2"));
-    
-    function _addDeleteIds (pAttributeId)
-    {
-        var condition = SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
-            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
-        var attributes = db.table(condition.buildSql(sqlSelect));
-        
-        attributes.forEach(function (row)
-        {
-            if (row[1])
-                deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1])
-            _addDeleteIds(row[0]);
-        });
-    }
-}
-
-/**
- * Deletes duplicate attribute usages.
- * 
- * @param {String} [pAttributeId=null] attribute id, if omitted, all duplicates will be deleted 
- */
-AttributeUsageUtil.removeDuplicates = function (pAttributeId)
-{
-    var condition = SqlCondition.begin()
-        .and("exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE AU where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AU.AB_ATTRIBUTE_ID "
-            + "and AB_ATTRIBUTEUSAGE.OBJECT_TYPE = AU.OBJECT_TYPE and AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID != AU.AB_ATTRIBUTEUSAGEID)");
-    if (pAttributeId)
-        condition.andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", pAttributeId);
-    
-    var duplicates = db.table(condition.buildSql("select AB_ATTRIBUTEUSAGEID, AB_ATTRIBUTE_ID, OBJECT_TYPE from AB_ATTRIBUTEUSAGE"));
-    var usageObj = {};
-    var deleteCond = SqlCondition.begin();
-    
-    duplicates.forEach(function (row)
-    {
-        if (!(row[1] in this))
-            this[row[1]] = {};
-        if (row[2] in this[row[1]])
-            deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[0]);
-        this[row[1]][row[2]] = true;
-    }, usageObj);
-    if (deleteCond.isSet())
-        db.deleteData("AB_ATTRIBUTEUSAGE", deleteCond.build("1=2"));
+import("system.util");
+import("system.datetime");
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+import("Keyword_lib");
+
+/**
+ * Provides functions for the work with attributes, like
+ * listing the available attributes for a context.
+ * Don't instanciate this!
+ * 
+ * @class
+ */
+function AttributeUtil () {}
+
+/**
+ * Gives an array of all available attributes for a context. This is used in the possibleItems
+ * process for the attribute id in AttributeRelation
+ * 
+ * @param {String} pObjectType the object type (= context)
+ * @param {boolean} [pIncludeGroups=false]
+ * @param {String[]} [pFilteredAttributeIds=[]] Whitleist of attribute ids
+ * @param {Object} [pAttributeCount=null] Object with attribute ids and their count
+ * 
+ * @return {String[]} array of attributeIds
+ */
+AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFilteredAttributeIds, pAttributeCount)
+{
+    if (pObjectType == null)
+        return [];
+    
+    var attrSql = "select AB_ATTRIBUTEID from AB_ATTRIBUTE"
+        + " join AB_ATTRIBUTEUSAGE  on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
+    attrCond = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
+        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
+        .and("ATTRIBUTE_ACTIVE = 1");
+    
+    if (pAttributeCount)
+    {
+        for (let attributeId in pAttributeCount)
+        {
+            attrCond.andSqlCondition(
+                SqlCondition.begin()
+                    .orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId, "# != ?")
+                    .orPrepare("AB_ATTRIBUTEUSAGE.MAX_COUNT", pAttributeCount[attributeId], "# > ?")
+                    .or("AB_ATTRIBUTEUSAGE.MAX_COUNT is null")
+            );
+        }
+    }
+        
+    if (pFilteredAttributeIds != undefined && pFilteredAttributeIds.length > 0)
+    {
+        var filteredIdsCondition = new SqlCondition();
+
+        pFilteredAttributeIds.forEach(function(id) 
+        {
+            this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+        }, filteredIdsCondition);
+
+        attrCond.andSqlCondition(filteredIdsCondition);
+    }
+
+    if (!pIncludeGroups)
+        attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
+    
+    var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
+    
+    return attributes;
+}
+
+/**
+ * returns the name of an attribute with all parent attribute names
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * @param {Boolean} [pSimpleName=false] Use only the name of the attribute and not the names of the parents.
+ * 
+ * @return {String} the name of the attribute
+ */
+AttributeUtil.getFullAttributeName = function (pAttributeId, pSimpleName) 
+{
+    if (pSimpleName == undefined)
+        pSimpleName = false;
+    
+    if (!pAttributeId)
+        return "";
+    var attributeNames = [];
+    var attribute;
+    do {
+        attribute = db.array(db.ROW, SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+            .buildSql("select ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID from AB_ATTRIBUTE")
+        );
+        if (attribute.length > 0)
+        {
+            attributeNames.push(attribute[0]);
+                pAttributeId = attribute[1];
+        }
+        else
+            pAttributeId = "";
+    } while (pAttributeId && !pSimpleName);
+    
+    return attributeNames.reverse().join(" / ");
+}
+
+/**
+ * returns the name of an attribute
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * 
+ * @return {String} the name of the attribute
+ */
+AttributeUtil.getSimpleAttributeName = function (pAttributeId) 
+{
+    var attributeName = db.cell(SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+        .buildSql("select ATTRIBUTE_NAME from AB_ATTRIBUTE")
+    );
+
+    return attributeName;
+}
+
+/**
+ * returns the ids of all subordinated attributes of an attribute
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * 
+ * @result {String[]} array with the ids of every subordinated attribute
+ */
+AttributeUtil.getAllChildren = function (pAttributeId)
+{
+    var childIds = [];
+    var attributes= [pAttributeId];
+    while (attributes.length > 0)
+    {
+        attributes = db.array(db.COLUMN, SqlCondition.begin()
+            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+            .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
+        );
+        if (attributes.length > 0)
+            childIds = childIds.concat(attributes);
+    }
+    return childIds;
+}
+
+/**
+ * checks if an attribute has attribute relations
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * 
+ * @result {boolean} true if it has relations
+ */
+AttributeUtil.hasRelations = function (pAttributeId)
+{
+    if (!pAttributeId)
+        return false;
+    return db.cell(SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+        .buildSql(
+            "select exists ("
+            +    "select AB_ATTRIBUTERELATIONID from AB_ATTRIBUTERELATION "
+            +    "where AB_ATTRIBUTE_ID = AB_ATTRIBUTEID"
+            + ") from AB_ATTRIBUTE", "1=2"
+        )
+    ) == "true";
+}
+
+/**
+ * returns the type of an attribute
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * 
+ * @result {String} attribute type
+ */
+AttributeUtil.getAttributeType = function (pAttributeId)
+{
+    var attrTypeSelect = "select ATTRIBUTE_TYPE from AB_ATTRIBUTE";
+    attrTypeSelect = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+        .buildSql(attrTypeSelect);
+    return db.cell(attrTypeSelect).trim();
+}
+
+/*********************************************************************************************************************/
+
+/**
+ * Provides functions for the work with attributeRelations, getting the value of an attributeRelation for an object.
+ * Don't instanciate this!
+ * 
+ * @class
+ */
+function AttributeRelationUtils () {}
+
+/**
+ * gets the value of an attributeRelation for one dataset (e. g. a person)
+ * 
+ * @param {String} pAttributeId attribute-id
+ * @param {String} pObjectRowId row-id of the dataset
+ * @param {String} [pObjectType=null] object-type
+ * @param {String} [pGetViewValue=false] if true the values are resolved and formatted
+ * 
+ * @return {String|null} the value of the attribute
+ */
+AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObjectType, pGetViewValue)
+{
+    var attrCond = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId)
+        .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttributeId);
+    if (pObjectType != null)
+        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
+    
+    var defaultFields = [
+        "AB_ATTRIBUTE.ATTRIBUTE_TYPE", 
+        "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
+        "COMBOVAL.ATTRIBUTE_NAME"
+    ];
+    var valueFields = AttributeTypeUtil.getAllDatabaseFields();
+    var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+        + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
+        + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
+    
+    var attributeValues = db.array(db.ROW, attributeSql);
+    if (!attributeValues.length)
+        return null;
+    
+    let value = attributeValues[AttributeTypeUtil.getTypeColumnIndex(attributeValues[0]) + defaultFields.length];
+    if (pGetViewValue && attributeValues[1].trim() == $AttributeTypes.COMBO)
+        value = attributeValues[2];
+    else if (pGetViewValue)
+        value = AttributeTypeUtil.getAttributeViewValue(attributeValues[0].trim(), value, attributeValues[1]);
+    
+    return value;
+}
+
+/**
+ * gets all attributes for a dataset
+ * 
+ * @param {String} pObjectRowId object rowid
+ * @param {String} [pObjectType=null] object-type
+ * @param {String} [pUseAttributeIds=false] if true the ids are used instead of the full attribute names
+ * @param {String} [pUseIdValues=false] if true the values are not resolved or formatted
+ * 
+ * @return {String[][]} two-dimensional array a row is [attributeId|attributeName, value]
+ */
+AttributeRelationUtils.getAllAttributes = function (pObjectRowId, pObjectType, pUseAttributeIds, pUseIdValues)
+{
+    var attrCond = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId);
+    if (pObjectType != null)
+        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
+    
+    var defaultFields = [
+        "AB_ATTRIBUTE_ID", 
+        "AB_ATTRIBUTE.ATTRIBUTE_TYPE", 
+        "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
+        "COMBOVAL.ATTRIBUTE_NAME"
+    ];
+    var valueFields = AttributeTypeUtil.getAllDatabaseFields();
+    var attributeSql = attrCond.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+        + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID"
+        + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID");
+    
+    var attributeNameMap = {};
+    var attributeValues = db.table(attributeSql).map(function (row) 
+    {
+        let attribute = row[0];
+        if (!pUseAttributeIds)
+        {
+            if (!(attribute in attributeNameMap))
+                attributeNameMap[attribute] = AttributeUtil.getFullAttributeName(attribute);
+            attribute = attributeNameMap[attribute];
+        }
+        let value = row[AttributeTypeUtil.getTypeColumnIndex(row[1]) + defaultFields.length];
+        if (!pUseIdValues && row[1].trim() == $AttributeTypes.COMBO)
+            value = row[3];
+        else if (!pUseIdValues)
+            value = AttributeTypeUtil.getAttributeViewValue(row[1].trim(), value, row[2]);
+        
+        return [attribute, value];
+    });
+    
+    return attributeValues;
+}
+
+/**
+ * gets the correct attribute value from a map with values depending on the attribute id
+ * 
+ * @param {String} pAttributeId the attribute id
+ * @param {Object} pValueMap a map with the attribute values and the db fields as keys
+ * @param {Boolean} [pGetViewValue=false] if true, get the view value
+ * 
+ * @return {String|null} the value of the attribute or null if the attribute doesn't exist
+ */
+AttributeRelationUtils.selectAttributeValue = function (pAttributeId, pValueMap, pGetViewValue)
+{
+    var sqlSelect = "select ATTRIBUTE_TYPE, KEYWORD_CONTAINER from AB_ATTRIBUTE";
+    var type = db.array(db.ROW, SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+        .buildSql(sqlSelect)
+    );
+    if (!type.length)
+        return null;
+    
+    type[0] = type[0].trim();
+    var field = AttributeTypeUtil.getDatabaseField(type[0]);
+    var value = pValueMap[field];
+    if (pGetViewValue && type[0] == $AttributeTypes.COMBO)
+    {
+        value = db.cell(SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", value)
+            .buildSql("select ATTRIBUTE_NAME from AB_ATTRIBUTE")
+        );
+    }
+    else if (pGetViewValue)
+        value = AttributeTypeUtil.getAttributeViewValue(type[0], value, type[1]);
+    
+    return value;
+}
+
+AttributeRelationUtils.getAttributes = function ()
+{
+    //TODO: implement maybe
+}
+
+/**
+ * sets the value of an attribute for one dataset (e. g. a person)
+ */
+AttributeRelationUtils.setAttribute = function ()
+{
+    //TODO: implement
+}
+
+/**
+ * adds rows for attributes with min_count > 0
+ * 
+ * @param {String} pObjectType the object type
+ * @param {String} pConsumer the name of the attribute relation consumer
+ */
+AttributeRelationUtils.presetMandatoryAttributes = function (pObjectType, pConsumer)
+{
+    var mandatoryAttributes = db.table(
+        SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, "# <> ?")
+            .and("ATTRIBUTE_ACTIVE = 1")
+            .and("MIN_COUNT > 0")
+            .buildSql("select AB_ATTRIBUTE_ID, MIN_COUNT from AB_ATTRIBUTEUSAGE "
+                + "join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTEID")
+    );
+    mandatoryAttributes.forEach(function (usage)
+    {
+        //adding an attribute more than 20 times would be too much (having a min_count > 20 is very unlikely)
+        for (let i = 0; i < usage[1] && i < 20; i++)
+            neon.addRecord(pConsumer, {
+                "AB_ATTRIBUTE_ID" : usage[0]
+            });
+    });
+}
+
+/**
+ * adds rows for attributes with min_count > 0
+ * 
+ * @param {String} pObjectType the object type
+ * @param {String} pConsumer the name of the attribute relation consumer
+ */
+AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, pInsertedRows)
+{
+    var countObj = AttributeRelationUtils.countAttributeRelations(pRowId, pObjectType);
+    if (pInsertedRows)
+    {
+        pInsertedRows.forEach(function (row)
+        {
+            this[row.AB_ATTRIBUTE_ID] = (this[row.AB_ATTRIBUTE_ID] || 0) + 1;
+        }, countObj);
+    }
+    var attributeCondition = SqlCondition.begin();
+    AttributeUtil.getPossibleAttributes(pObjectType).forEach(function (attributeId)
+    {
+        this.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId);
+    }, attributeCondition);
+    
+    var usageCondition = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
+        .andSqlCondition(attributeCondition, "1=2");
+    
+    var minMaxCounts = db.table(usageCondition.buildSql(
+          "select AB_ATTRIBUTEID, ATTRIBUTE_NAME, MIN_COUNT, MAX_COUNT from AB_ATTRIBUTEUSAGE "
+        + "join AB_ATTRIBUTE on AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID", "1=2"
+    ));
+    var validationMessage = [];
+    minMaxCounts.forEach(function ([attributeId, name, minCount, maxCount])
+    {
+        let count = this[attributeId] || 0;
+        if (count < minCount)
+            validationMessage.push(translate.withArguments("Attribute \"%0\" has to be used at least %1.", [name, _getTranslatedCount(minCount)]));
+        if (maxCount && count > maxCount)
+            validationMessage.push(translate.withArguments("Attribute \"%0\" can't be used more than %1.", [name, _getTranslatedCount(maxCount)]));
+    }, countObj);
+    return validationMessage.join("\n");
+    
+    function _getTranslatedCount (pCount)
+    {
+        if (pCount == 1)
+            return pCount + " " + translate.text("${COUNT_PREPOSITION_SINGLE}");
+        return pCount + " " + translate.text("${COUNT_PREPOSITION_MULTIPLE}");
+    }
+}
+
+/**
+ * adds rows for attributes with min_count > 0
+ * 
+ * @param {String} pObjectType the object type
+ * @param {String} pConsumer the name of the attribute relation consumer
+ */
+AttributeRelationUtils.countAttributeRelations = function (pRowId, pObjectType)
+{
+    var condition = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pRowId);
+    if (pObjectType)
+        condition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
+    var relationCounts = db.table(condition.buildSql(
+        "select AB_ATTRIBUTE_ID, count(AB_ATTRIBUTE_ID) from AB_ATTRIBUTERELATION",
+        "1=2",
+        "group by AB_ATTRIBUTE_ID"
+    ));
+    var countObj = {};
+    relationCounts.forEach(function ([attributeId, count])
+    {
+        this[attributeId] = parseInt(count);
+    }, countObj);
+    
+    return countObj;
+}
+
+/*********************************************************************************************************************/
+
+
+/**
+ * Object for the enumeration and management of all attribute types.
+ * This Object is only for the general definition of attribute types and for getting
+ * data about every type, anything that has to do with a specific attribute (= the function requires an attribute id)
+ * should be done in AttributeUtils.
+ * The values for each type are:
+ * 
+ * keyword = the key of the corresponding keyword
+ * contentType = the value that is returned in the contentType process for the attribute
+ * databaseField = the database field that holds values of attributes with the type
+ * 
+ * The display name is controlled by the keyword 'AttributeType'
+ */
+function $AttributeTypes () {}
+
+$AttributeTypes.TEXT = { 
+    toString : function () {return this.keyword},
+    keyword : "TEXT",
+    contentType : "TEXT", 
+    databaseField : "CHAR_VALUE"
+};
+$AttributeTypes.DATE = {
+    toString : function () {return this.keyword},
+    keyword : "DATE",
+    contentType : "DATE", 
+    databaseField : "DATE_VALUE",
+    getViewValue : function (pValue)
+        {
+            return datetime.toDate(pValue, translate.text("dd.MM.yyyy"));
+        }
+};
+$AttributeTypes.NUMBER = {
+    toString : function () {return this.keyword},
+    keyword : "NUMBER",
+    contentType : "NUMBER", 
+    databaseField : "NUMBER_VALUE"
+};
+$AttributeTypes.BOOLEAN = {
+    toString : function () {return this.keyword},
+    keyword : "BOOLEAN",
+    contentType : "BOOLEAN", 
+    databaseField : "INT_VALUE",
+    getViewValue : function (pValue)
+        {
+            return pValue == "1" ? translate.text("Yes") : translate.text("No");
+        }
+};
+$AttributeTypes.COMBO = {
+    toString : function () {return this.keyword},
+    keyword : "COMBO",
+    contentType : "UNKNOWN",
+    databaseField : "ID_VALUE",
+    isGroup : true
+};
+$AttributeTypes.COMBOVALUE = {
+    toString : function () {return this.keyword},
+    keyword : "COMBOVALUE",
+    contentType : null, 
+    databaseField : null
+};
+$AttributeTypes.GROUP = {
+    toString : function () {return this.keyword},
+    keyword : "GROUP",
+    contentType : null, 
+    databaseField : null,
+    isGroup : true
+};
+$AttributeTypes.KEYWORD = {
+    toString : function () {return this.keyword},
+    keyword : "KEYWORD",
+    contentType : "UNKNOWN", 
+    databaseField : "ID_VALUE", 
+    getViewValue : function (pValue, pKeyword)
+        {
+            return KeywordUtils.getViewValue(pKeyword, pValue);
+        }
+};
+$AttributeTypes.VOID = {
+    toString : function () {return this.keyword},
+    keyword : "VOID",
+    contentType : null,
+    databaseField : null,
+    isGroup : true
+};
+$AttributeTypes.MEMO = { 
+    toString : function () {return this.keyword},
+    keyword : "MEMO",
+    contentType : "LONG_TEXT", 
+    databaseField : "CHAR_VALUE"
+};
+
+function AttributeTypeUtil () {}
+
+/**
+ * returns the required contentType for the given attribute type
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {String} the contentType for the attribute
+ */
+AttributeTypeUtil.getContentType = function (pAttributeType)
+{
+    if (pAttributeType in $AttributeTypes)
+        return $AttributeTypes[pAttributeType].contentType;
+    return null;
+}
+
+/**
+ * returns if the type is a group type
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {Boolean} if the type is a group type
+ */
+AttributeTypeUtil.isGroupType = function (pAttributeType)
+{
+    if (pAttributeType in $AttributeTypes)
+        return $AttributeTypes[pAttributeType].isGroup || false;
+    return null;
+}
+
+/**
+ * returns the database field for the given attribute type that holds the value of the attribute
+ * 
+ * @param {String} pAttributeType the attribute type 
+ *                  (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
+ * @return {String} the database field for the attribute
+ */
+AttributeTypeUtil.getDatabaseField = function (pAttributeType)
+{
+    if (pAttributeType in $AttributeTypes)
+        return $AttributeTypes[pAttributeType].databaseField;
+    return null;
+}
+
+AttributeTypeUtil.getAttributeViewValue = function (pAttributeType, pValue, pKeyword)
+{
+    if (pAttributeType in $AttributeTypes && "getViewValue" in $AttributeTypes[pAttributeType])
+        return $AttributeTypes[pAttributeType].getViewValue(pValue, pKeyword);
+    return pValue;
+}
+
+AttributeTypeUtil._initTypeColumnData = function ()
+{
+    var columns = [];
+    var typeColumnMap = {};
+    for (let type in $AttributeTypes)
+    {
+        type = $AttributeTypes[type];
+        if (type.databaseField)
+        {
+            var typeKey = type.toString();
+            var colIndex = columns.indexOf(type.databaseField);
+            if (colIndex == -1)
+            {
+                colIndex = columns.length;
+                columns.push(type.databaseField);
+            }
+            typeColumnMap[typeKey] = colIndex;
+        }
+    }
+    this._allDBColumns = columns;
+    this._typeColumnMap = typeColumnMap;
+}
+
+AttributeTypeUtil.getAllDatabaseFields = function ()
+{
+    if (this._allDBColumns == undefined)
+        AttributeTypeUtil._initTypeColumnData();
+    return this._allDBColumns;
+}
+
+AttributeTypeUtil.getTypeColumnIndex = function (pAttributeType)
+{
+    if (this._typeColumnMap == undefined)
+        AttributeTypeUtil._initTypeColumnData();
+    return this._typeColumnMap[pAttributeType.trim()];
+}
+
+/*********************************************************************************************************************/
+
+/**
+ * Functions for AttributeUsages.
+ * Do not instanciate this!
+ * 
+ * @class
+ */
+function AttributeUsageUtil () {}
+
+/**
+ * Creates AttributeUsages for all subordinate attributes of an attribute.
+ * This is required when an usage is added to a superordinate attribute.
+ * 
+ * @param {String} pAttributeId the id of the superordinate attribute
+ * @param {String} pObjectType the context
+ */
+AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
+{
+    var table = "AB_ATTRIBUTEUSAGE";
+    var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE"];
+    var types = db.getColumnTypes(table, columns);
+    
+    var sqlSelect = "select AB_ATTRIBUTEID, "
+            + " exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '" 
+            + pObjectType + "') from AB_ATTRIBUTE";
+    
+    var inserts = [];
+    _addInserts(pAttributeId, pObjectType);
+    db.inserts(inserts);
+    
+    function _addInserts (pAttributeId, pObjectType)
+    {
+        var condition = SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
+        var attributes = db.table(condition.buildSql(sqlSelect));
+        
+        attributes.forEach(function (row)
+        {
+            if (row[1] != "true")
+            {
+                let values = [util.getNewUUID(), row[0], pObjectType];
+                inserts.push([table, columns, types, values]);
+            }
+            _addInserts(row[0], pObjectType);
+        });
+    }
+}
+
+/**
+ * Updates AttributeUsages for all subordinate attributes of an attribute.
+ * This is required when an usage of a superordinate attribute is changed.
+ * 
+ * @param {String} pAttributeId the id of the superordinate attribute
+ * @param {String} pOldObjectType ye olde context
+ * @param {String} pNewObjectType the new context
+ */
+AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType, pNewObjectType)
+{
+    if (!pNewObjectType)
+        return;
+    
+    var table = "AB_ATTRIBUTEUSAGE";
+    
+    var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID, "
+        + " exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '" 
+        + pNewObjectType + "')"
+        + " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pOldObjectType + "'";
+    
+    var updateCond = SqlCondition.begin();
+    
+    //it is possible that the new objectType is already in a subordinate attribute 
+    //and an update could cause a duplicate entry so one has to be deleted
+    var deleteCond = SqlCondition.begin();
+    
+    _addUpdateIds(pAttributeId, pOldObjectType);
+        
+    if (updateCond.isSet())
+        db.updateData(table, ["OBJECT_TYPE"], null, [pNewObjectType], updateCond.build("1=2"));
+    if (deleteCond.isSet())
+        db.deleteData(table, deleteCond.build("1=2"));
+    
+    function _addUpdateIds (pAttributeId)
+    {
+        var condition = SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
+        var attributes = db.table(condition.buildSql(sqlSelect));
+        
+        attributes.forEach(function (row)
+        {
+            if (row[1] && row[2] == "true")
+                deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1]);
+            else if (row[1])
+                updateCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1]);
+            _addUpdateIds(row[0]);
+        });
+    }
+}
+
+/**
+ * Deletes AttributeUsages for all subordinate attributes of an attribute.
+ * This is required when an usage is removed from a superordinate attribute.
+ * 
+ * @param {String} pAttributeId the id of the superordinate attribute
+ * @param {String} pObjectType the context
+ */
+AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
+{
+    var table = "AB_ATTRIBUTEUSAGE";
+    
+    var sqlSelect = "select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID "
+        + " from AB_ATTRIBUTE left join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID and OBJECT_TYPE = '" + pObjectType + "'";
+    
+    var deleteCond = SqlCondition.begin();
+    _addDeleteIds(pAttributeId, pObjectType);
+    if (deleteCond.isSet())
+        db.deleteData(table, deleteCond.build("1=2"));
+    
+    function _addDeleteIds (pAttributeId)
+    {
+        var condition = SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
+            .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
+        var attributes = db.table(condition.buildSql(sqlSelect));
+        
+        attributes.forEach(function (row)
+        {
+            if (row[1])
+                deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[1])
+            _addDeleteIds(row[0]);
+        });
+    }
+}
+
+/**
+ * Deletes duplicate attribute usages.
+ * 
+ * @param {String} [pAttributeId=null] attribute id, if omitted, all duplicates will be deleted 
+ */
+AttributeUsageUtil.removeDuplicates = function (pAttributeId)
+{
+    var condition = SqlCondition.begin()
+        .and("exists (select AB_ATTRIBUTEUSAGEID from AB_ATTRIBUTEUSAGE AU where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AU.AB_ATTRIBUTE_ID "
+            + "and AB_ATTRIBUTEUSAGE.OBJECT_TYPE = AU.OBJECT_TYPE and AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID != AU.AB_ATTRIBUTEUSAGEID)");
+    if (pAttributeId)
+        condition.andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", pAttributeId);
+    
+    var duplicates = db.table(condition.buildSql("select AB_ATTRIBUTEUSAGEID, AB_ATTRIBUTE_ID, OBJECT_TYPE from AB_ATTRIBUTEUSAGE"));
+    var usageObj = {};
+    var deleteCond = SqlCondition.begin();
+    
+    duplicates.forEach(function (row)
+    {
+        if (!(row[1] in this))
+            this[row[1]] = {};
+        if (row[2] in this[row[1]])
+            deleteCond.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID", row[0]);
+        this[row[1]][row[2]] = true;
+    }, usageObj);
+    if (deleteCond.isSet())
+        db.deleteData("AB_ATTRIBUTEUSAGE", deleteCond.build("1=2"));
 }
\ No newline at end of file
diff --git a/process/Classification_lib/Classification_lib.aod b/process/Classification_lib/Classification_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..818373690075bf9196eb6e10c19f9c13ae3bd1fe
--- /dev/null
+++ b/process/Classification_lib/Classification_lib.aod
@@ -0,0 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>Classification_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/Classification_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..f73c136606584a3fea4e54c595d2ec6b6f9d4379
--- /dev/null
+++ b/process/Classification_lib/process.js
@@ -0,0 +1,66 @@
+import("system.logging");
+import("system.db");
+import("Sql_lib");
+
+/**
+ * Methods to manage classifications.
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ClassificationUtils() {}
+
+/**
+ * Get the id of the current context
+ * TODO: use a UUID of the current context which doesn't change
+ *
+ * @return {String} Id of the current context
+ */
+ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationNumber)
+{
+    var score = db.table(SqlCondition.begin()
+            .andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER", pClassificationNumber)
+            .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
+            .andSqlCondition(SqlCondition.begin().orPrepare("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+                                                     .or("CLASSIFICATION.OBJECT_TYPE is null"))
+            .andSqlCondition(SqlCondition.begin().orPrepare("CLASSIFICATION.OBJECT_ROWID", pObjectRowid)
+                                                     .or("CLASSIFICATION.OBJECT_ROWID is null"))
+            .buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER, case when sum(score) is not null then sum(score) else 0 end from CLASSIFICATIONTYPE \n\
+                        left join Classification on CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID \n\
+                        left join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID",
+            "1=2",
+            "group by CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER order by CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER asc"));
+                
+    if (score.length == 1)
+        return score[0][1];
+    
+    var scores = {};
+    score.forEach(function(pRow)
+    {
+        scores[pRow[0]] = pRow[1];
+    });
+    return scores;
+}
+
+ClassificationUtils.getClass = function(pClassificationType, pObjectType, pObjectRowid)
+{
+    var score = ClassificationUtils.getScore(pClassificationType, pObjectType, pObjectRowid);
+    return Object.keys(score).map(function(classNum)
+        {
+            return ClassificationUtils.mapToClass(score[classNum]);
+        }).join("");
+}
+
+ClassificationUtils.mapToClass = function(pScore) 
+{
+    if(pScore >= 0 && pScore <= 50) 
+        return "D";
+    if(pScore > 25 && pScore <= 50) 
+        return "C";
+    if(pScore > 50 && pScore <= 75) 
+        return "B";
+    if(pScore > 75 && pScore <= 100) 
+        return "A";
+    
+    return "_";
+}
\ No newline at end of file
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index b5b4799da1f558a508bca8c43b57f6c09e3c93bb..6ca87445428065c65c1cd1f95ccbba05b15e731e 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -117,9 +117,9 @@ CommUtil.getStandardSubSqlForCategory = function(pCategory, pContactField)
     var cond = SqlCondition.begin();
     if (pContactField == undefined)
         cond.and("COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID");
-    else if (typeof(pRelationField) == "string")
+    else if (typeof(pContactField) == "string")
         cond.andPrepare("COMMUNICATION.CONTACT_ID", pContactField);
-    else if (typeof(pRelationField) == "object")
+    else if (typeof(pContactField) == "object")
     {
         //you may want to sepcify a concrete value
         cond.andSqlCondition(pContactField, "1=2");
@@ -159,11 +159,26 @@ CommUtil.getStandardSubSqlPhone = function(pContactField)
  * @param {String|SqlCondition} [pContactField=CONTACT.CONTACTID] SQL-fieldname that shall be used for filtering the CONTACT_ID, this can be a string(fieldname) or an SqlCondition object
  * @return {String} sub-sql
  */
-CommUtil.getStandardSubSqlMail= function(pContactField)
+CommUtil.getStandardSubSqlMail = function(pContactField)
 {
     return CommUtil.getStandardSubSqlForCategory("EMAIL", pContactField);
 };
 
+/**
+ * returns a the standard address of a EMAIL-COMMUNICATION
+ * 
+ * @param {String} pContactId the contactId
+ * 
+ * @return {String} email address
+ */
+CommUtil.getStandardMail = function (pContactId)
+{
+    var query = CommUtil.getStandardSubSqlMail(SqlCondition.begin()
+        .andPrepare("COMMUNICATION.CONTACT_ID", pContactId)
+    );
+    return db.cell(query);
+}
+
 /**
  * provides static methods for validation of communication data
  * do not create an instance of this
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index dd333da0d5fc67053e717f576dd8e5e37a557e1d..959bffccf44603462d46438732a9c62fbd09f2d0 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,488 +1,485 @@
-import("system.logging");
-import("system.translate");
-import("system.project");
-import("system.vars");
-import("system.SQLTYPES");
-import("Keyword_lib");
-import("Sql_lib");
-import("Proto_lib");
-import("Contact_lib");
-
-/**
- * Methods to manage contexts.
- * Do not create an instance of this!
- *
- * @class
- */
-function ContextUtils() {}
-
-/**
- * Get the id of the current context
- * TODO: use a UUID of the current context which doesn't change
- *
- * @return {String} Id of the current context
- */
-ContextUtils.getCurrentContextId = function()
-{
-    return vars.getString("$sys.currentcontextname");
-}
-
-/**
- * TODO: use System function. Currently the Name is also the id.
- * Returns the Name of a context by the Id
- *
- * @param {String} pContextId the id of a context
- * @return {String} Name of the current context
- */
-ContextUtils.getContextName = function(pContextId)
-{
-    // TODO: currently the Id is the context name. This will be changed maybe
-    return pContextId;
-}
-
-/**
- * Returns the Name of the correct Consumer or null
- *
- * @param {String} pContextId the id of a context
- * @return {String|null} Name of the correct Consumer
- */
-ContextUtils.getContextConsumer = function(pContextId)
-{
-    // TODO: is there a better solution without a swiutch case? maybe metadata of context / entity
-    switch(pContextId)
-    {
-        case ContextUtils.getContextName("Organisation"):
-            return "Organisations";
-        case ContextUtils.getContextName("Person"):
-            return "Persons";
-        case ContextUtils.getContextName("Offer"):
-            return "Offers";
-        case ContextUtils.getContextName("Order"):
-            return "Orders";
-        case ContextUtils.getContextName("Product"):
-            return "Products";
-        case ContextUtils.getContextName("Contract"):
-            return "Contracts";
-        case ContextUtils.getContextName("Salesproject"):
-            return "Salesprojects";
-        case ContextUtils.getContextName("Campaign"):
-            return "Campaigns";
-        case ContextUtils.getContextName("CampaignStep"):
-            return "CampaignSteps";
-    }
-}
-
-/**
- *
- * @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils.getSelectMap 
- * @param {String[]} [pExclusiveContexts] contextIds that shall not be included (so this is a additional filter to the pFilter param)
- * @param {Boolean} [pUseExclusives=false] decides whether the items in pExclusiveContexts are excluded (false) or
- *                      everything that is not in pExclusiveContexts is excluded (true)
- *
- * @return {String[][]} the contexts [[contextId, contextName, contextTitle], [... ], ...]
- */
-ContextUtils.getContexts = function(pFilter, pExclusiveContexts, pUseExclusives)
-{
-    if (pFilter == undefined)
-        pFilter = false;
-    if (pUseExclusives == undefined)
-        pUseExclusives = false;
-
-    var contexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
-
-    if (pFilter)
-    {
-        contexts = contexts.filter(function(pContext) {
-            if (pExclusiveContexts && pExclusiveContexts.indexOf(pContext[0]) > -1 != pUseExclusives)
-                return false;
-            // filter only contexts which have defined mappings in Context_lib
-            return ContextUtils.getSelectMap ()[pContext[0]] != undefined;
-        });
-    }
-    else if (pExclusiveContexts)
-    {
-        contexts = contexts.filter(function(pContext) {
-            if (pExclusiveContexts && pExclusiveContexts.indexOf(pContext[0]) > -1 != pUseExclusives)
-                return false;
-            return true;
-        });
-    }
-
-    return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
-        {
-            // sort after ContextTitle
-            if (pContext1[2] > pContext2[2])
-                return 1;
-
-            if (pContext1[2] < pContext2[2])
-                return -1;
-
-            return 0;
-        });
-}
-
-/**
- * get the data of a context
- *
- * @param {String} pContextId the id of the context
- *
- * @return {String[]} the contextdata [contextId, contextName, contextTitle]
- */
-ContextUtils.getContext = function(pContextId)
-{
-    return ContextUtils._contextDataMapping(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId));
-}
-
-/**
- * map the contextData from the system.project-lib to [contextId, contextName, contextTitle]
- *
- * @param {String[]} pContext the data of a context (e.g. from project.getDataModel())
- *
- * @return {String[]} the contextdata [contextId, contextName, contextTitle]
- * @ignore
- */
-ContextUtils._contextDataMapping = function(pContext)
-{
-    var contextName = ContextUtils.getContextName(pContext[0]);
-
-    return [pContext[0], contextName, (pContext[1] ? pContext[1] : contextName)];
-}
-
-/**
- * represents a single context selection for one context
- * this is usefull for objectlinks and 360° definition
- * most properties are read only and can only be written with a setter
- * 
- * @param {String} [pTableName] presets the matching property of the object
- * @param {String} [pIdField] presets the matching property of the object
- * @param {String} [pTitleExpression] presets the matching property of the object
- * 
- * TODO: mostly temporary function until you can get fields from another Entity
- *
- * @class
- */
-function ContextSelector(pTableName, pIdField, pTitleExpression)
-{
-    //the >>this.propertyX = null;<< is for autocomplete in the designer
-    
-    /**
-     * title-definition; db-column or another sql-expression (like concating fields) as long as it returns one field
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.titleExpression = null; ProtoPropertyUtils.makeSemiReadOnly(this, "titleExpression");
-    this.setTitleExpression(pTitleExpression);
-
-    /**
-     * name of the database-table
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.tableName = null; ProtoPropertyUtils.makeSemiReadOnly(this, "tableName");
-    this.setTableName(pTableName);
-    
-    /**
-     * db-field for the ID of one record (UID of matching context)
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.idField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "idField");
-    this.setIdField(pIdField);
-    
-    /**
-     * expression for additional joins to be made (addotopmaö pt table-name)
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.joinExpression = null; ProtoPropertyUtils.makeSemiReadOnly(this, "joinExpression");
-    /**
-     * db-field for the ID of the relation to a CONTACT-record
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.contactIdField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "contactIdField");
-    /**
-     * db-field that represents the date of creation
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.creationDateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "creationDateField");
-    /**
-     * db-field where the STATE-information (active/inactive) is stored (see the activeStates-property)
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.stateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "stateField");
-    /**
-     * array that contains IDs of states that represent an "active"-state
-     * read-only property; set it with a matching setter
-     * @property
-     */
-    this.activeStates = null; ProtoPropertyUtils.makeSemiReadOnly(this, "activeStates");
-    this.condition = null; ProtoPropertyUtils.makeSemiReadOnly(this, "condition");
-}
-/**
- * creates a new instance of a ContextSelector and returns it 
- * if given it also sets some properties (property names with matching function-parameters)
- * @static
- */
-ContextSelector.create = function(pTableName, pIdField, pTitleExpression)
-{
-    return new ContextSelector(pTableName, pIdField, pTitleExpression);
-};
-/**
- * @param {String} pField the fieldname that shall be returned as full string
- * @return {String} full field containing tablename and the column; if the column itself is already a full qualified field that field is returned
- */
-ContextSelector.prototype.getFullField = function(pField)
-{
-    if (SqlUtils.isFullFieldQualifier(pField))
-        return pField;
-    else
-        return this.tableName + "." + pField;
-};
-/**
- * @return {String} full id field containing tablename and column; if the column itself is already a full qualified field that field is returned
- */
-ContextSelector.prototype.getFullIdField = function()
-{
-    return this.getFullField(this.idField);
-};
-/**
- * @return {String} full from-expression with tablename and join-part
- */
-ContextSelector.prototype.getFullFromClause = function()
-{
-    if (this.joinExpression)
-        return " " + this.tableName + " " + this.joinExpression + " ";
-    else
-        return this.tableName;
-        
-};
-//setters which to nothing special; no need to document them
-ContextSelector.prototype.setTitleExpression = function(pValue)
-{
-    this._titleExpression = pValue;
-    return this;
-};
-ContextSelector.prototype.setTableName = function(pValue)
-{
-    this._tableName = pValue;
-    return this;
-};
-ContextSelector.prototype.setIdField = function(pValue)
-{
-    this._idField = pValue;
-    return this;
-};
-ContextSelector.prototype.setJoinExpression = function(pValue)
-{
-    this._joinExpression = pValue;
-    return this;
-};
-ContextSelector.prototype.setContactIdField = function(pValue)
-{
-    this._contactIdField = pValue;
-    return this;
-};
-ContextSelector.prototype.setCreationDateField = function(pValue)
-{
-    this._creationDateField = pValue;
-    return this;
-};
-ContextSelector.prototype.setStateField = function(pValue)
-{
-    this._stateField = pValue;
-    return this;
-};
-ContextSelector.prototype.setActiveStates = function(pValue)
-{
-    this._activeStates = pValue;
-    return this;
-};
-/**
- * sets the condition property of a ContextSelector-object
- * @param {Object} pSqlCondition condition as SqlCondition-object
- */
-ContextSelector.prototype.setCondition = function(pSqlCondition)
-{
-    this._condition = pSqlCondition;
-    return this;
-};
-
-/**
- * TODO: !!!temporary function until you can get fields from another Entity!!!
- */
-ContextUtils.getSelectMap  = function()
-{
-    var maskingUtils = new SqlMaskingUtils();
-    return {
-        "Organisation": ContextSelector.create("ORGANISATION", "ORGANISATIONID", "NAME")
-                                       .setCondition(SqlCondition.begin().and("ORGANISATION.ORGANISATIONID != '0'"))
-            ,"Person": ContextSelector.create("CONTACT", "CONTACTID")
-                                      .setTitleExpression(maskingUtils.concat([
-                                                new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()
-                                                ,"' - '"//looks pretty bad; TODO: workaround till Lookups can be loaded over a link-entity; then use displayProc
-                                                ,"defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"
-                                                ,"' - '"
-                                                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"
-                                               ]," "))
-                                      .setJoinExpression("join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID \n\
-                                                          join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID\n\
-                                                          left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID")
-            ,"Activity": ContextSelector.create("ACTIVITY", "ACTIVITYID", "SUBJECT")
-            ,"Salesproject": ContextSelector.create("SALESPROJECT", "SALESPROJECTID")
-                                            .setTitleExpression(maskingUtils.concat([
-                                                                "'" + translate.text("Salesproject") + "'",
-                                                                "' '",
-                                                                maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10),
-                                                                "' | '",
-                                                                "PROJECTTITLE"
-                                                                ], "", false))
-                                            .setContactIdField("CONTACT_ID")
-                                            .setCreationDateField("STARTDATE")
-                                            .setStateField("STATE")
-                                            .setActiveStates(["25b0ac77-ef92-4809-802e-bb9d8782f865", "23d38486-4cce-41ce-a8df-164ad44df706"])
-            ,"Contract": ContextSelector.create("CONTRACT", "CONTRACTID")
-                                        .setTitleExpression(maskingUtils.concat([
-                                                                KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
-                                                                maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
-                                                                ], " "))
-                                        .setContactIdField("CONTACT_ID")
-                                        .setCreationDateField("CONTRACTSTART")
-                                        .setStateField("CONTRACTSTATUS")
-                                        .setActiveStates(["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"])
-            ,"Offer": ContextSelector.create("OFFER", "OFFERID")
-                                     .setTitleExpression(maskingUtils.concat([
-                                                "'" + translate.text("Offer") + "'",
-                                                "' '",
-                                                maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10),
-                                                "'-'",
-                                                maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
-                                                ], "", false))
-                                     .setContactIdField("CONTACT_ID")
-                                     .setCreationDateField("OFFERDATE")
-                                     .setStateField("STATUS")
-                                     .setActiveStates(["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"])
-            ,"Order": ContextSelector.create("SALESORDER", "SALESORDERID")
-                                     .setTitleExpression(maskingUtils.concat([
-                                                        "'" + translate.text("Order") + "'",
-                                                        "' '",
-                                                        maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10),
-                                                        "'-'",
-                                                        maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
-                                                        ], "", false))
-                                     .setContactIdField("CONTACT_ID")
-                                     .setCreationDateField("ORDERDATE")
-            ,"Product": ContextSelector.create("PRODUCT", "PRODUCTID")
-                                       .setTitleExpression(maskingUtils.concat([
-                                            "PRODUCTCODE",
-                                            "' | '",
-                                            "PRODUCTNAME"
-                                            ], "", false))
-            ,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
-            ,"Campaign": ContextSelector.create("CAMPAIGN", "CAMPAIGNID")
-                         .setTitleExpression(maskingUtils.concat([
-                                                maskingUtils.cast("CAMPAIGN.NAME", SQLTYPES.VARCHAR, 10),
-                                                maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10)
-                                            ], " - ", false))
-                         .setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
-                         .setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
-                                            "left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
-                        .setCreationDateField("CAMPAIGNSTEP.DATE_START")
-                        .setStateField("CAMPAIGN.STATE")
-                        .setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"])
-            ,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME")
-
-    }
-}
-
-/**
- * TODO: !!!temporary function until you can get fields from another Entity!!!
- */
-ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
-{
-    var select = "(case " + pContextIdDbField + " ";
-
-    var selectMap = ContextUtils.getSelectMap ()
-    for (let contextId in selectMap)
-    {
-        select += "when '" + contextId + "' then (select " + selectMap[contextId].titleExpression + " from " + selectMap[contextId].getFullFromClause() + (pRowIdDbField ? " where " + selectMap[contextId].getFullIdField() + " = " + pRowIdDbField : " ") + ") ";
-    }
-
-    select += "else 'Not defined in ContextUtils.getNameSql()!'";
-    select += "end)";
-
-    return select;
-}
-
-/**
- * TODO: !!!temporary function until you can get fields from another Entity!!!
- */
-ContextUtils.getNameSql = function(pContextId, pRowId)
-{
-    var selectMap = ContextUtils.getSelectMap ()
-    if (selectMap[pContextId] != undefined)
-    {
-        return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId)
-                                   .buildSql("select " + selectMap[pContextId].titleExpression 
-                                            + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
-    }
-    else
-        return "select 1 from person where 1=2";
-}
-
-/**
- * TODO: !!!temporary function until you can get fields from another Entity!!!
- */
-ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pExcludedObjectIds)
-{
-    var selectMap = ContextUtils.getSelectMap();
-    var ownContextSelector = selectMap[pContextId];
-    var cond = SqlCondition.begin();
-    if (pContactId)
-    {
-        cond.andPrepare(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId)
-    }
-    
-    if (pActive != undefined)
-    {
-        var activeStates = ownContextSelector.activeStates;
-        if(activeStates != null && activeStates.length > 0)
-        {
-            var condSub = SqlCondition.begin();
-            activeStates.forEach(function (state) 
-            {   
-                if(pActive)
-                    condSub.orPrepare(ownContextSelector.tableName + "." + ownContextSelector.stateField, state)
-                else
-                    condSub.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.stateField, state, "# != ?")
-            });
-            cond.andSqlCondition(condSub);   
-        }
-    }
-    
-    if (pExcludedObjectIds)
-    {
-        var exludedIdsCond = new SqlCondition()
-        
-        pExcludedObjectIds.forEach(function(id)
-        {
-            this.andPrepare(ownContextSelector.getFullIdField(), id, "# <> ?");
-        }, exludedIdsCond)
-        
-        cond.andSqlCondition(exludedIdsCond);
-    }
-    
-    var dateColumn = "";
-    if (pWithDate === true)
-        dateColumn = ", " + (ownContextSelector.creationDateField || "''");
-    var stateColumn = "";
-    if (pWithState === true)
-        stateColumn = ", " + (ownContextSelector.stateField || "''");
-    if (ownContextSelector.condition)
-        cond.andSqlCondition(ownContextSelector.condition);
-    var res = cond.buildSql("select " + ownContextSelector.getFullIdField() + ", " + ownContextSelector.titleExpression + dateColumn + stateColumn 
-            +  " from " + ownContextSelector.getFullFromClause(), "1=1");
-    return res;
-}
+import("system.logging");
+import("system.translate");
+import("system.project");
+import("system.vars");
+import("system.SQLTYPES");
+import("Keyword_lib");
+import("Sql_lib");
+import("Proto_lib");
+import("Contact_lib");
+
+/**
+ * Methods to manage contexts.
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ContextUtils() {}
+
+/**
+ * Get the id of the current context
+ * TODO: use a UUID of the current context which doesn't change
+ *
+ * @return {String} Id of the current context
+ */
+ContextUtils.getCurrentContextId = function()
+{
+    return vars.getString("$sys.currentcontextname");
+}
+
+/**
+ * TODO: use System function. Currently the Name is also the id.
+ * Returns the Name of a context by the Id
+ *
+ * @param {String} pContextId the id of a context
+ * @return {String} Name of the current context
+ */
+ContextUtils.getContextName = function(pContextId)
+{
+    // TODO: currently the Id is the context name. This will be changed maybe
+    return pContextId;
+}
+
+/**
+ * Returns the Name of the correct Consumer or null
+ *
+ * @param {String} pContextId the id of a context
+ * @return {String|null} Name of the correct Consumer
+ */
+ContextUtils.getContextConsumer = function(pContextId)
+{
+    // TODO: is there a better solution without a swiutch case? maybe metadata of context / entity
+    switch(pContextId)
+    {
+        case ContextUtils.getContextName("Organisation"):
+            return "Organisations";
+        case ContextUtils.getContextName("Person"):
+            return "Persons";
+        case ContextUtils.getContextName("Offer"):
+            return "Offers";
+        case ContextUtils.getContextName("Order"):
+            return "Orders";
+        case ContextUtils.getContextName("Product"):
+            return "Products";
+        case ContextUtils.getContextName("Contract"):
+            return "Contracts";
+        case ContextUtils.getContextName("Salesproject"):
+            return "Salesprojects";
+        case ContextUtils.getContextName("Campaign"):
+            return "Campaigns";
+        case ContextUtils.getContextName("CampaignStep"):
+            return "CampaignSteps";
+    }
+}
+
+/**
+ *
+ * @param {Boolean} [pFilter=false] filter only for contexts which have a mapping in ContextUtils.getSelectMap 
+ * @param {String[]} [pExclusiveContexts] contextIds that shall not be included (so this is a additional filter to the pFilter param)
+ * @param {Boolean} [pUseExclusives=false] decides whether the items in pExclusiveContexts are excluded (false) or
+ *                      everything that is not in pExclusiveContexts is excluded (true)
+ *
+ * @return {String[][]} the contexts [[contextId, contextName, contextTitle], [... ], ...]
+ */
+ContextUtils.getContexts = function(pFilter, pExclusiveContexts, pUseExclusives)
+{
+    if (pFilter == undefined)
+        pFilter = false;
+    if (pUseExclusives == undefined)
+        pUseExclusives = false;
+
+    var contexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+
+    if (pFilter)
+    {
+        contexts = contexts.filter(function(pContext) {
+            if (pExclusiveContexts && pExclusiveContexts.indexOf(pContext[0]) > -1 != pUseExclusives)
+                return false;
+            // filter only contexts which have defined mappings in Context_lib
+            return ContextUtils.getSelectMap ()[pContext[0]] != undefined;
+        });
+    }
+    else if (pExclusiveContexts)
+    {
+        contexts = contexts.filter(function(pContext) {
+            if (pExclusiveContexts && pExclusiveContexts.indexOf(pContext[0]) > -1 != pUseExclusives)
+                return false;
+            return true;
+        });
+    }
+
+    return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
+        {
+            // sort after ContextTitle
+            if (pContext1[2] > pContext2[2])
+                return 1;
+
+            if (pContext1[2] < pContext2[2])
+                return -1;
+
+            return 0;
+        });
+}
+
+/**
+ * get the data of a context
+ *
+ * @param {String} pContextId the id of the context
+ *
+ * @return {String[]} the contextdata [contextId, contextName, contextTitle]
+ */
+ContextUtils.getContext = function(pContextId)
+{
+    return ContextUtils._contextDataMapping(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId));
+}
+
+/**
+ * map the contextData from the system.project-lib to [contextId, contextName, contextTitle]
+ *
+ * @param {String[]} pContext the data of a context (e.g. from project.getDataModel())
+ *
+ * @return {String[]} the contextdata [contextId, contextName, contextTitle]
+ * @ignore
+ */
+ContextUtils._contextDataMapping = function(pContext)
+{
+    var contextName = ContextUtils.getContextName(pContext[0]);
+
+    return [pContext[0], contextName, (pContext[1] ? pContext[1] : contextName)];
+}
+
+/**
+ * represents a single context selection for one context
+ * this is usefull for objectlinks and 360° definition
+ * most properties are read only and can only be written with a setter
+ * 
+ * @param {String} [pTableName] presets the matching property of the object
+ * @param {String} [pIdField] presets the matching property of the object
+ * @param {String} [pTitleExpression] presets the matching property of the object
+ * 
+ * TODO: mostly temporary function until you can get fields from another Entity
+ *
+ * @class
+ */
+function ContextSelector(pTableName, pIdField, pTitleExpression)
+{
+    //the >>this.propertyX = null;<< is for autocomplete in the designer
+    
+    /**
+     * title-definition; db-column or another sql-expression (like concating fields) as long as it returns one field
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.titleExpression = null; ProtoPropertyUtils.makeSemiReadOnly(this, "titleExpression");
+    this.setTitleExpression(pTitleExpression);
+
+    /**
+     * name of the database-table
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.tableName = null; ProtoPropertyUtils.makeSemiReadOnly(this, "tableName");
+    this.setTableName(pTableName);
+    
+    /**
+     * db-field for the ID of one record (UID of matching context)
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.idField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "idField");
+    this.setIdField(pIdField);
+    
+    /**
+     * expression for additional joins to be made (addotopmaö pt table-name)
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.joinExpression = null; ProtoPropertyUtils.makeSemiReadOnly(this, "joinExpression");
+    /**
+     * db-field for the ID of the relation to a CONTACT-record
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.contactIdField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "contactIdField");
+    /**
+     * db-field that represents the date of creation
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.creationDateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "creationDateField");
+    /**
+     * db-field where the STATE-information (active/inactive) is stored (see the activeStates-property)
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.stateField = null; ProtoPropertyUtils.makeSemiReadOnly(this, "stateField");
+    /**
+     * array that contains IDs of states that represent an "active"-state
+     * read-only property; set it with a matching setter
+     * @property
+     */
+    this.activeStates = null; ProtoPropertyUtils.makeSemiReadOnly(this, "activeStates");
+    this.condition = null; ProtoPropertyUtils.makeSemiReadOnly(this, "condition");
+}
+/**
+ * creates a new instance of a ContextSelector and returns it 
+ * if given it also sets some properties (property names with matching function-parameters)
+ * @static
+ */
+ContextSelector.create = function(pTableName, pIdField, pTitleExpression)
+{
+    return new ContextSelector(pTableName, pIdField, pTitleExpression);
+};
+/**
+ * @param {String} pField the fieldname that shall be returned as full string
+ * @return {String} full field containing tablename and the column; if the column itself is already a full qualified field that field is returned
+ */
+ContextSelector.prototype.getFullField = function(pField)
+{
+    if (SqlUtils.isFullFieldQualifier(pField))
+        return pField;
+    else
+        return this.tableName + "." + pField;
+};
+/**
+ * @return {String} full id field containing tablename and column; if the column itself is already a full qualified field that field is returned
+ */
+ContextSelector.prototype.getFullIdField = function()
+{
+    return this.getFullField(this.idField);
+};
+/**
+ * @return {String} full from-expression with tablename and join-part
+ */
+ContextSelector.prototype.getFullFromClause = function()
+{
+    if (this.joinExpression)
+        return " " + this.tableName + " " + this.joinExpression + " ";
+    else
+        return this.tableName;
+        
+};
+//setters which to nothing special; no need to document them
+ContextSelector.prototype.setTitleExpression = function(pValue)
+{
+    this._titleExpression = pValue;
+    return this;
+};
+ContextSelector.prototype.setTableName = function(pValue)
+{
+    this._tableName = pValue;
+    return this;
+};
+ContextSelector.prototype.setIdField = function(pValue)
+{
+    this._idField = pValue;
+    return this;
+};
+ContextSelector.prototype.setJoinExpression = function(pValue)
+{
+    this._joinExpression = pValue;
+    return this;
+};
+ContextSelector.prototype.setContactIdField = function(pValue)
+{
+    this._contactIdField = pValue;
+    return this;
+};
+ContextSelector.prototype.setCreationDateField = function(pValue)
+{
+    this._creationDateField = pValue;
+    return this;
+};
+ContextSelector.prototype.setStateField = function(pValue)
+{
+    this._stateField = pValue;
+    return this;
+};
+ContextSelector.prototype.setActiveStates = function(pValue)
+{
+    this._activeStates = pValue;
+    return this;
+};
+/**
+ * sets the condition property of a ContextSelector-object
+ * @param {Object} pSqlCondition condition as SqlCondition-object
+ */
+ContextSelector.prototype.setCondition = function(pSqlCondition)
+{
+    this._condition = pSqlCondition;
+    return this;
+};
+
+/**
+ * TODO: !!!temporary function until you can get fields from another Entity!!!
+ */
+ContextUtils.getSelectMap  = function()
+{
+    var maskingUtils = new SqlMaskingUtils();
+    return {
+        "Organisation": ContextSelector.create("ORGANISATION", "ORGANISATIONID", "NAME")
+                                       .setCondition(SqlCondition.begin().and("ORGANISATION.ORGANISATIONID != '0'"))
+            ,"Person": ContextSelector.create("CONTACT", "CONTACTID")
+                                      .setTitleExpression(maskingUtils.concat([
+                                                new ContactTitleRenderer(Contact.createWithColumnPreset()).asSql()
+                                                ,"' - '"//looks pretty bad; TODO: workaround till Lookups can be loaded over a link-entity; then use displayProc
+                                                ,"defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"
+                                                ,"' - '"
+                                                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"
+                                               ]," "))
+                                      .setJoinExpression("join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID \n\
+                                                          join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID\n\
+                                                          left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID")
+            ,"Activity": ContextSelector.create("ACTIVITY", "ACTIVITYID", "SUBJECT")
+            ,"Salesproject": ContextSelector.create("SALESPROJECT", "SALESPROJECTID")
+                                            .setTitleExpression(maskingUtils.concat([
+                                                                "'" + translate.text("Salesproject") + "'",
+                                                                "' '",
+                                                                maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10),
+                                                                "' | '",
+                                                                "PROJECTTITLE"
+                                                                ], "", false))
+                                            .setContactIdField("CONTACT_ID")
+                                            .setCreationDateField("STARTDATE")
+                                            .setStateField("STATE")
+                                            .setActiveStates(["25b0ac77-ef92-4809-802e-bb9d8782f865", "23d38486-4cce-41ce-a8df-164ad44df706"])
+            ,"Contract": ContextSelector.create("CONTRACT", "CONTRACTID")
+                                        .setTitleExpression(maskingUtils.concat([
+                                                                KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
+                                                                maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10)
+                                                                ], " "))
+                                        .setContactIdField("CONTACT_ID")
+                                        .setCreationDateField("CONTRACTSTART")
+                                        .setStateField("CONTRACTSTATUS")
+                                        .setActiveStates(["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"])
+            ,"Offer": ContextSelector.create("OFFER", "OFFERID")
+                                     .setTitleExpression(maskingUtils.concat([
+                                                "'" + translate.text("Offer") + "'",
+                                                "' '",
+                                                maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10),
+                                                "'-'",
+                                                maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
+                                                ], "", false))
+                                     .setContactIdField("CONTACT_ID")
+                                     .setCreationDateField("OFFERDATE")
+                                     .setStateField("STATUS")
+                                     .setActiveStates(["5134153d-2e18-452f-ab35-7a52f1aee7d1", "e5d6b5a4-7576-440f-8332-bc40147c0335"])
+            ,"Order": ContextSelector.create("SALESORDER", "SALESORDERID")
+                                     .setTitleExpression(maskingUtils.concat([
+                                                        "'" + translate.text("Order") + "'",
+                                                        "' '",
+                                                        maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10),
+                                                        "'-'",
+                                                        maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
+                                                        ], "", false))
+                                     .setContactIdField("CONTACT_ID")
+                                     .setCreationDateField("ORDERDATE")
+            ,"Product": ContextSelector.create("PRODUCT", "PRODUCTID")
+                                       .setTitleExpression(maskingUtils.concat([
+                                            "PRODUCTCODE",
+                                            "' | '",
+                                            "PRODUCTNAME"
+                                            ], "", false))
+            ,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
+            ,"Campaign": ContextSelector.create("CAMPAIGN", "CAMPAIGNID")
+                         .setTitleExpression(maskingUtils.concat(["CAMPAIGN.NAME", "CAMPAIGNSTEP.NAME"], " - ", false))
+                         .setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
+                         .setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
+                                            "left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
+                        .setCreationDateField("CAMPAIGNSTEP.DATE_START")
+                        .setStateField("CAMPAIGN.STATE")
+                        .setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"])
+            ,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME")
+
+    }
+}
+
+/**
+ * TODO: !!!temporary function until you can get fields from another Entity!!!
+ */
+ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
+{
+    var select = "(case " + pContextIdDbField + " ";
+
+    var selectMap = ContextUtils.getSelectMap ()
+    for (let contextId in selectMap)
+    {
+        select += "when '" + contextId + "' then (select " + selectMap[contextId].titleExpression + " from " + selectMap[contextId].getFullFromClause() + (pRowIdDbField ? " where " + selectMap[contextId].getFullIdField() + " = " + pRowIdDbField : " ") + ") ";
+    }
+
+    select += "else 'Not defined in ContextUtils.getNameSql()!'";
+    select += "end)";
+
+    return select;
+}
+
+/**
+ * TODO: !!!temporary function until you can get fields from another Entity!!!
+ */
+ContextUtils.getNameSql = function(pContextId, pRowId)
+{
+    var selectMap = ContextUtils.getSelectMap ()
+    if (selectMap[pContextId] != undefined)
+    {
+        return SqlCondition.begin().andPrepare(selectMap[pContextId].getFullIdField(), pRowId)
+                                   .buildSql("select " + selectMap[pContextId].titleExpression 
+                                            + " from " + selectMap[pContextId].getFullFromClause(), "1 = 2");
+    }
+    else
+        return "select 1 from person where 1=2";
+}
+
+/**
+ * TODO: !!!temporary function until you can get fields from another Entity!!!
+ */
+ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pExcludedObjectIds)
+{
+    var selectMap = ContextUtils.getSelectMap();
+    var ownContextSelector = selectMap[pContextId];
+    var cond = SqlCondition.begin();
+    if (pContactId)
+    {
+        cond.andPrepare(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId)
+    }
+    
+    if (pActive != undefined)
+    {
+        var activeStates = ownContextSelector.activeStates;
+        if(activeStates != null && activeStates.length > 0)
+        {
+            var condSub = SqlCondition.begin();
+            activeStates.forEach(function (state) 
+            {   
+                if(pActive)
+                    condSub.orPrepare(ownContextSelector.getFullField(ownContextSelector.stateField), state)
+                else
+                    condSub.andPrepare(ownContextSelector.getFullField(ownContextSelector.stateField), state, "# != ?")
+            });
+            cond.andSqlCondition(condSub);   
+        }
+    }
+    
+    if (pExcludedObjectIds)
+    {
+        var exludedIdsCond = new SqlCondition()
+        
+        pExcludedObjectIds.forEach(function(id)
+        {
+            this.andPrepare(ownContextSelector.getFullIdField(), id, "# <> ?");
+        }, exludedIdsCond)
+        
+        cond.andSqlCondition(exludedIdsCond);
+    }
+    
+    var dateColumn = "";
+    if (pWithDate === true)
+        dateColumn = ", " + (ownContextSelector.getFullField(ownContextSelector.creationDateField) || "''");
+    var stateColumn = "";
+    if (pWithState === true)
+        stateColumn = ", " + (ownContextSelector.getFullField(ownContextSelector.stateField) || "''");
+    if (ownContextSelector.condition)
+        cond.andSqlCondition(ownContextSelector.condition);
+    var res = cond.buildSql("select " + ownContextSelector.getFullIdField() + ", " + ownContextSelector.titleExpression + dateColumn + stateColumn 
+            +  " from " + ownContextSelector.getFullFromClause(), "1=1");
+    return res;
+}
diff --git a/process/Document_lib/process.js b/process/Document_lib/process.js
index cb2ce51a52c4fa98506d2c79bd34b987ba9651e7..11766b67485c48e60f1056721516e73be8fdd4f3 100644
--- a/process/Document_lib/process.js
+++ b/process/Document_lib/process.js
@@ -1,93 +1,102 @@
-import("system.result");
-import("system.db");
-import("system.vars");
-import("system.neon");
-import("Sql_lib");
-
-/**
- * Provides static methods for managing documents.
- * Do not create an instance of this
- * 
- * @class
- */
-function DocumentUtil(){    
-}
-
-/**
- * Utility function to download all selected documents. 
- * Selected documents will be checked with $sys.selectionRows
- * Documents will be downloaded with neon.download
- */
-DocumentUtil.downloadSelectedDocuments = function() {
-    var alias = SqlUtils.getSystemAlias();
-    
-    if(vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows")) {
-        var rows;
-        try {
-            rows = JSON.parse(vars.get("$sys.selectionRows"));
-        } catch (e) {
-            rows = JSON.parse(JSON.stringify(vars.get("$sys.selectionRows")));
-        }
-    
-        var uids;
-        try {
-            uids = JSON.parse(vars.get("$sys.selection"));
-        } catch (e) {
-            uids = JSON.parse(JSON.stringify(vars.get("$sys.selection")));
-        }
-        
-        var binaryContents = db.getBinaryContents(uids, alias);     
-
-        // check if multiplie Files are selected.
-        // files get packed into a zip archive before downloading
-        if(binaryContents.length > 1) {
-            var fileNames = rows.map(function(value) { return value["NAME"]; });
-            neon.downloadToZip("Dateien.zip", binaryContents, fileNames);
-        } else {
-            neon.download(binaryContents[0], rows[0]["NAME"]);       
-        }
-    }
-}
-
-/**
- * Utility function to delete the current/opened Document.
- */
-DocumentUtil.deleteCurrentDocument = function() {
-    if(vars.exists("$local.uid")) {
-        var uid = vars.get("$local.uid");   
-        var alias = db.getCurrentAlias();
-        db.deleteBinary(uid, alias);
-    }
-}
-
-/**
- * Utility function to retrieve the filename from an uploadcomponent value.
- * The value of an uploadcomponent contains filename + filedata separated by
- * a semicolon e.g. "file1.jpg;base64data"
- * 
- * @param {String} pUploadValue the value of the uploadcomponent (filename + filedata)
- * @return {String} the filename or empty String
- */
-DocumentUtil.getFilenameFromUpload = function(pUploadValue) {
-    var res = pUploadValue.split(";");
-    if(res.length > 0)
-        return res[0];
-    else
-        return '';
-}
-
-/**
- * Utility function to retrieve the filedata from an uploadcomponent value.
- * The value of an uploadcomponent contains filename + filedata separated by
- * a semicolon e.g. "file1.jpg;base64data"
- * 
- * @param {String} pUploadValue the value of the uploadcomponent (filename + filedata)
- * @return {String} the filedata or empty String
- */
-DocumentUtil.getBindataFromUpload = function(pUploadValue) {
-    var res = pUploadValue.split(";");
-    if(res.length > 1)
-        return res[1];
-    else
-        return '';
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+/**
+ * Provides static methods for managing documents.
+ * Do not create an instance of this
+ * 
+ * @class
+ */
+function DocumentUtil(){    
+}
+
+/**
+ * Utility function to download all selected documents. 
+ * Selected documents will be checked with $sys.selectionRows
+ * Documents will be downloaded with neon.download
+ */
+DocumentUtil.downloadSelectedDocuments = function() {
+    var alias = SqlUtils.getSystemAlias();
+    
+    if(vars.exists("$sys.selectionRows") && vars.getString("$sys.selectionRows")) {
+        var rows = vars.get("$sys.selectionRows");
+        var uids = vars.get("$sys.selection");
+        var binaryContents = db.getBinaryContents(uids, alias);     
+
+        // check if multiplie Files are selected.
+        // files get packed into a zip archive before downloading
+        if(binaryContents.length > 1) {
+            var fileNames = rows.map(function(value) { return value["NAME"]; });
+            neon.downloadToZip(translate.text("Files") + ".zip", binaryContents, fileNames);
+        } else {
+            neon.download(binaryContents[0], rows[0]["NAME"]);       
+        }
+    }
+}
+
+/**
+ * Utility function to delete the current/opened Document.
+ */
+DocumentUtil.deleteCurrentDocument = function() {
+    if(vars.exists("$local.uid")) {
+        var uid = vars.get("$local.uid");   
+        var alias = db.getCurrentAlias();
+        db.deleteBinary(uid, alias);
+    }
+}
+
+/**
+ * Utility function to retrieve the filename from an uploadcomponent value.
+ * The value of an uploadcomponent contains filename + filedata separated by
+ * a semicolon e.g. "file1.jpg;base64data"
+ * 
+ * @param {String} pUploadValue the value of the uploadcomponent (filename + filedata)
+ * @return {String} the filename or empty String
+ */
+DocumentUtil.getFilenameFromUpload = function(pUploadValue) {
+    var res = pUploadValue.split(";");
+    if(res.length > 0)
+        return res[0];
+    else
+        return '';
+}
+
+/**
+ * Utility function to retrieve the filedata from an uploadcomponent value.
+ * The value of an uploadcomponent contains filename + filedata separated by
+ * a semicolon e.g. "file1.jpg;base64data"
+ * 
+ * @param {String} pUploadValue the value of the uploadcomponent (filename + filedata)
+ * @return {String} the filedata or empty String
+ */
+DocumentUtil.getBindataFromUpload = function(pUploadValue) {
+    var res = pUploadValue.split(";");
+    if(res.length > 1)
+        return res[1];
+    else
+        return '';
+}
+
+/**
+ * Utility function to retrieve the fileextension from an filename value.
+ * 
+ * @param {String} pFileName the value of the filename (filename)
+ * @return {String} the fileextension or empty String
+ */
+DocumentUtil.getFileExtensionFromUpload = function(pFileName) {    
+    if(pFileName != null && pFileName != "")
+    {
+        var res = pFileName.split('.');
+
+        if(res.length > 1)
+            return res[res.length - 1];
+        else
+            return '';
+    }
+    else
+        return '';
 }
\ No newline at end of file
diff --git a/process/Email_lib/Email_lib.aod b/process/Email_lib/Email_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6022256dea0248db39f796a2a79b0e55178d4044
--- /dev/null
+++ b/process/Email_lib/Email_lib.aod
@@ -0,0 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>Email_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/Email_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..a917c8b44961e2aaca14a3f5807b6e31cfb3918b
--- /dev/null
+++ b/process/Email_lib/process.js
@@ -0,0 +1,112 @@
+import("system.text");
+import("system.db");
+import("system.util");
+import("Communication_lib");
+import("system.neon");
+
+
+
+function EmailUtils () {}
+
+EmailUtils.openMailTemplate = function (pToRecipients, pContactId, pTemplateId)
+{
+    var email = new Email(pToRecipients);
+    email.setSender(pContactId);
+    if (pTemplateId)
+        email.setTemplate(pTemplateId);
+    email.openMail();
+}
+
+EmailUtils.openNewMail = function (pToContactId)
+{
+    var params = {
+        "ContactId_param" : pToContactId
+    };
+    neon.openContext("Email", "EmailEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/**
+ * object for handling emails
+ * 
+ * @param {String|Array} [pToRecipients=[]] recipient email address or array of recipient email addresses
+ * @param {String} [pSender=null] email address of the sender
+ * @param {String} [pSubject=null] subject
+ * @param {String} [pBody=null] mail body
+ * @param {Array} [pCcRecipients=[]] array of recipient cc addresses
+ * @param {Array} [pBccRecipients=[]] array of recipient bcc addresses
+ * 
+ * @class
+ */
+function Email (pToRecipients, pSender, pSubject, pBody, pCcRecipients, pBccRecipients)
+{
+    if (pToRecipients && typeof(pToRecipients) == "string")
+        pToRecipients = [pToRecipients];
+    
+    this.sender = pSender;
+    this.subject = pSubject;
+    this.body = pBody;
+    this.toRecipients = pToRecipients || [];
+    this.ccRecipients = pCcRecipients || [];
+    this.bccRecipients = pBccRecipients || [];
+}
+
+/**
+ * loads a document template into the mail body
+ * 
+ * @param {String} pTemplateId the id of the template
+ */
+Email.prototype.setTemplate = function (pTemplateId)
+{
+    var alias = "_____SYSTEMALIAS";
+    var binaryId = db.cell(SqlCondition.begin(alias)
+        .andPrepare("ASYS_BINARIES.ROW_ID", pTemplateId)
+        .buildSql("select ID from ASYS_BINARIES", "1=2"), alias
+    );
+    if (binaryId)
+        this.body = text.html2text(util.decodeBase64String(db.getBinaryContent(binaryId, alias)));
+}
+
+/**
+ * sets the sender of the mail
+ * 
+ * @param {String} pContactId the contactId of the sender
+ */
+Email.prototype.setSender = function (pContactId)
+{
+    this.sender = CommUtil.getStandardMail(pContactId);
+}
+
+/**
+ * generates a 'mailto:' URL from the email object
+ */
+Email.prototype.getMailtoUrl = function ()
+{
+    var url = [];
+    
+    if (this.toRecipients.length)
+        url.push("to=" + this.toRecipients.join());
+    
+    if (this.ccRecipients.length)
+        url.push("cc=" + this.ccRecipients.join());
+    
+    if (this.bccRecipients.length)
+        url.push("bcc=" + this.bccRecipients.join());
+    
+    if (this.subject)
+        url.push("subject=" + this.subject);
+    
+    if (this.body)
+        url.push("body=" + this.body);
+    
+    url = "mailto:?" + url.join("&");
+    
+    return encodeURI(url);
+}
+
+/**
+ * opens the email
+ */
+Email.prototype.openMail = function ()
+{
+    neon.openUrl(this.getMailtoUrl(), false);
+}
\ No newline at end of file
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index 4e66f06ad662b15c46594b78b8611c37e7c92faa..b0d87290367674e1b07707e977875f954d5165f2 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -1,221 +1,221 @@
-import("Sql_lib");
-
-/**
- * object for filtering records
- * 
- * @param {Array} pColumns the column names
- * @param {String|Object} pFilter the filter object
- */
-function JditoFilterHelper (pColumns, pFilter) 
-{
-    var columnMap = {};
-    pColumns.forEach(function (row, i)
-    {
-        if (row)
-            columnMap[row] = i;
-    });
-    this._columnMap = columnMap;
-    
-    if (pFilter.length) //check if pFilter is a string
-        pFilter = JSON.parse(pFilter);
-    
-    this._operator = pFilter.operator;
-    this._filters = pFilter.childs;
-}
-
-/**
- * tests the given row if it matches the filter
- * 
- * @param {Array} pRow one record
- * 
- * @return {boolean} true, if it matches the condition
- */
-JditoFilterHelper.prototype.checkRecord = function (pRow)
-{
-    if (this._filters.length == 0)
-        return true;
-    
-    if (this._operator == "AND")
-        return this._filters.every(_testFn, this);
-    
-    return this._filters.some(_testFn, this);
-    
-    function _testFn (pFilter)
-    {
-        let value = pRow[this._columnMap[pFilter.name]];
-        return this._testValue(value, (pFilter.key || pFilter.value), pFilter.operator);
-    }
-}
-
-/**
- * compares two values with the given operator
- */
-JditoFilterHelper.prototype._testValue = function (pRowValue, pFilterValue, pOperator)
-{
-    switch (pOperator)
-    {
-        case "CONTAINS":
-            return (new RegExp(pFilterValue)).test(pRowValue);
-        case "CONTAINSNOT":
-            return !(new RegExp(pFilterValue)).test(pRowValue);
-        case "STARTSWITH":
-            return (new RegExp("^" + pFilterValue)).test(pRowValue);
-        case "ENDSWITH":
-            return (new RegExp(pFilterValue + "$")).test(pRowValue);
-        case "EQUAL":
-            return (new RegExp("^" + pFilterValue + "$")).test(pRowValue);
-        case "NOT_EQUAL":
-            return !(new RegExp("^" + pFilterValue + "$")).test(pRowValue);
-        case "LESS":
-            return pRowValue < pFilterValue;
-        case "LESS_OR_EQUAL":
-            return pRowValue <= pFilterValue;
-        case "GREATER":
-            return pRowValue > pFilterValue;
-        case "GREATER_OR_EQUAL":
-            return pRowValue >= pFilterValue;
-        case "ISNULL":
-            return pRowValue == "";
-        case "ISNOTNULL":
-            return pRowValue != "";
-    }
-}
-
-/**
- * Provides functions for using the filter with jdito recordcontainers
- * 
- * Do not instanciate this!
- * 
- * @class
- */
-function JditoFilterUtils () {}
-
-/**
- * Filters the given records manually. If you get the records using a sql query, you might consider using
- * JditoFilterUtils.getSqlCondition instead for better performance.
- * 
- * @param {Array} pColumns one dimensional array with all column names (only the columns with the idValue, displayValue columns should be null or ""), 
- *                          the order has to match the columns of the recordFields property in the recordcontainer
- * @param {Array} pRecords two dimensional array with all records
- * @param {String|Object} pFilter the value of $local.filter
- * 
- * @return {Array} the filtered records
- */
-JditoFilterUtils.filterRecords = function (pColumns, pRecords, pFilter)
-{
-    if (!pFilter)
-        return pRecords;
-    
-    var filter = new JditoFilterHelper(pColumns, pFilter);
-    
-    return pRecords.filter(function (row)
-        {
-            return this.checkRecord(row);
-        }, filter);
-}
-
-/**
- * builds an sql condition from the given filter
- * 
- * @param {String|Object} pFilter the filter as JSON
- * @param {String} pTable the database table
- * @param {String} [pTableAlias=null] the database table alias
- * @param {Object} [pColumnMap=null] custom mapping for the fields to the DB columns, this is necessary
- *      if the fields are from different tables
- *      
- * @example
- * if (vars.exists("$local.filter") && vars.get("$local.filter"))
- * {
- *     var filter = vars.get("$local.filter");
- *     condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE")));
- * }
- *      
- * @return {SqlCondition} the SqlCondition object
- */
-JditoFilterUtils.getSqlCondition = function (pFilter, pTable, pTableAlias, pColumnMap)
-{
-    var condition = new SqlCondition();
-    
-    if (!pFilter)
-        return condition;
-    if (pFilter.length) //check if pFilter is a string
-        pFilter = JSON.parse(pFilter);
-    if (!pColumnMap)
-        pColumnMap = {};
-    
-    _addCondition.call(condition, pFilter, pFilter.operator);
-    
-    return condition;
-    
-    //recursive function (for compatibility with a condition tree) that
-    //builds the SqlCondition
-    function _addCondition (pCondition, pOperator)
-    {
-        if (pCondition.type == "row")
-        {
-            if (pCondition.name in pColumnMap)
-                pCondition.name = pColumnMap[pCondition.name];
-            else if (pTable && pTableAlias)
-                pCondition.name = [pTable, pCondition.name, pTableAlias];
-            else if (pTable)
-                pCondition.name = pTable + "." + pCondition.name;
-            
-            pCondition.value = (pCondition.key || pCondition.value);
-            var condition = _getCondition.call(pCondition);
-            if (pOperator == "AND")
-                this.andPrepare(pCondition.name, pCondition.value, condition);
-            else if (pOperator == "OR")
-                this.orPrepare(pCondition.name, pCondition.value, condition);
-        }
-        else if (pCondition.type == "group")
-        {
-            let subCondition = new SqlCondition();
-            let operator = pCondition.operator;
-            pCondition.childs.forEach(function (cond)
-            {
-                _addCondition.call(subCondition, cond, operator);
-            });
-            if (pOperator == "AND")
-                this.andSqlCondition(subCondition);
-            else if (pOperator == "OR")
-                this.orSqlCondition(subCondition);
-        }
-    }
-    
-    //returns the condition depending on the operator and 
-    //adds wildcards to the value if necessary
-    function _getCondition ()
-    {
-        switch (this.operator)
-        {
-            case "CONTAINS":
-                this.value = "%" + this.value + "%";
-                return "# like ?";
-            case "CONTAINSNOT":
-                this.value = "%" + this.value + "%";
-                return "# not like ?";
-            case "STARTSWITH":
-                this.value = this.value + "%";
-                return "# like ?";
-            case "ENDSWITH":
-                this.value = "%" + this.value;
-                return "# like ?";
-            case "EQUAL":
-                return "# = ?";
-            case "NOT_EQUAL":
-                return "# != ?";
-            case "LESS":
-                return "# < ?";
-            case "LESS_OR_EQUAL":
-                return "# <= ?";
-            case "GREATER":
-                return "# > ?";
-            case "GREATER_OR_EQUAL":
-                return "# >= ?";
-            case "ISNULL":
-                return "# is null";
-            case "ISNOTNULL":
-                return "# is not null";
-        }
-    }
+import("Sql_lib");
+
+/**
+ * object for filtering records
+ * 
+ * @param {Array} pColumns the column names
+ * @param {String|Object} pFilter the filter object
+ */
+function JditoFilterHelper (pColumns, pFilter) 
+{
+    var columnMap = {};
+    pColumns.forEach(function (row, i)
+    {
+        if (row)
+            columnMap[row] = i;
+    });
+    this._columnMap = columnMap;
+    
+    if (pFilter.length) //check if pFilter is a string
+        pFilter = JSON.parse(pFilter);
+    
+    this._operator = pFilter.operator;
+    this._filters = pFilter.childs;
+}
+
+/**
+ * tests the given row if it matches the filter
+ * 
+ * @param {Array} pRow one record
+ * 
+ * @return {boolean} true, if it matches the condition
+ */
+JditoFilterHelper.prototype.checkRecord = function (pRow)
+{
+    if (this._filters.length == 0)
+        return true;
+    
+    if (this._operator == "AND")
+        return this._filters.every(_testFn, this);
+    
+    return this._filters.some(_testFn, this);
+    
+    function _testFn (pFilter)
+    {
+        let value = pRow[this._columnMap[pFilter.name]];
+        return this._testValue(value, (pFilter.key || pFilter.value), pFilter.operator);
+    }
+}
+
+/**
+ * compares two values with the given operator
+ */
+JditoFilterHelper.prototype._testValue = function (pRowValue, pFilterValue, pOperator)
+{
+    switch (pOperator)
+    {
+        case "CONTAINS":
+            return (new RegExp(pFilterValue)).test(pRowValue);
+        case "CONTAINSNOT":
+            return !(new RegExp(pFilterValue)).test(pRowValue);
+        case "STARTSWITH":
+            return (new RegExp("^" + pFilterValue)).test(pRowValue);
+        case "ENDSWITH":
+            return (new RegExp(pFilterValue + "$")).test(pRowValue);
+        case "EQUAL":
+            return (new RegExp("^" + pFilterValue + "$")).test(pRowValue);
+        case "NOT_EQUAL":
+            return !(new RegExp("^" + pFilterValue + "$")).test(pRowValue);
+        case "LESS":
+            return pRowValue < pFilterValue;
+        case "LESS_OR_EQUAL":
+            return pRowValue <= pFilterValue;
+        case "GREATER":
+            return pRowValue > pFilterValue;
+        case "GREATER_OR_EQUAL":
+            return pRowValue >= pFilterValue;
+        case "ISNULL":
+            return pRowValue == "";
+        case "ISNOTNULL":
+            return pRowValue != "";
+    }
+}
+
+/**
+ * Provides functions for using the filter with jdito recordcontainers
+ * 
+ * Do not instanciate this!
+ * 
+ * @class
+ */
+function JditoFilterUtils () {}
+
+/**
+ * Filters the given records manually. If you get the records using a sql query, you might consider using
+ * JditoFilterUtils.getSqlCondition instead for better performance.
+ * 
+ * @param {Array} pColumns one dimensional array with all column names (only the columns with the idValue, displayValue columns should be null or ""), 
+ *                          the order has to match the columns of the recordFields property in the recordcontainer
+ * @param {Array} pRecords two dimensional array with all records
+ * @param {String|Object} pFilter the value of $local.filter
+ * 
+ * @return {Array} the filtered records
+ */
+JditoFilterUtils.filterRecords = function (pColumns, pRecords, pFilter)
+{
+    if (!pFilter)
+        return pRecords;
+    
+    var filter = new JditoFilterHelper(pColumns, pFilter);
+    
+    return pRecords.filter(function (row)
+        {
+            return this.checkRecord(row);
+        }, filter);
+}
+
+/**
+ * builds an sql condition from the given filter
+ * 
+ * @param {String|Object} pFilter the filter as JSON
+ * @param {String} pTable the database table
+ * @param {String} [pTableAlias=null] the database table alias
+ * @param {Object} [pColumnMap=null] custom mapping for the fields to the DB columns, this is necessary
+ *      if the fields are from different tables
+ *      
+ * @example
+ * if (vars.exists("$local.filter") && vars.get("$local.filter"))
+ * {
+ *     var filter = vars.get("$local.filter");
+ *     condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE")));
+ * }
+ *      
+ * @return {SqlCondition} the SqlCondition object
+ */
+JditoFilterUtils.getSqlCondition = function (pFilter, pTable, pTableAlias, pColumnMap)
+{
+    var condition = new SqlCondition();
+    
+    if (!pFilter)
+        return condition;
+    if (pFilter.length) //check if pFilter is a string
+        pFilter = pFilter;
+    if (!pColumnMap)
+        pColumnMap = {};
+    
+    _addCondition.call(condition, pFilter, pFilter.operator);
+    
+    return condition;
+    
+    //recursive function (for compatibility with a condition tree) that
+    //builds the SqlCondition
+    function _addCondition (pCondition, pOperator)
+    {
+        if (pCondition.type == "row")
+        {
+            if (pCondition.name in pColumnMap)
+                pCondition.name = pColumnMap[pCondition.name];
+            else if (pTable && pTableAlias)
+                pCondition.name = [pTable, pCondition.name, pTableAlias];
+            else if (pTable)
+                pCondition.name = pTable + "." + pCondition.name;
+            
+            pCondition.value = (pCondition.key || pCondition.value);
+            var condition = _getCondition.call(pCondition);
+            if (pOperator == "AND")
+                this.andPrepare(pCondition.name, pCondition.value, condition);
+            else if (pOperator == "OR")
+                this.orPrepare(pCondition.name, pCondition.value, condition);
+        }
+        else if (pCondition.type == "group")
+        {
+            let subCondition = new SqlCondition();
+            let operator = pCondition.operator;
+            pCondition.childs.forEach(function (cond)
+            {
+                _addCondition.call(subCondition, cond, operator);
+            });
+            if (pOperator == "AND")
+                this.andSqlCondition(subCondition);
+            else if (pOperator == "OR")
+                this.orSqlCondition(subCondition);
+        }
+    }
+    
+    //returns the condition depending on the operator and 
+    //adds wildcards to the value if necessary
+    function _getCondition ()
+    {
+        switch (this.operator)
+        {
+            case "CONTAINS":
+                this.value = "%" + this.value + "%";
+                return "# like ?";
+            case "CONTAINSNOT":
+                this.value = "%" + this.value + "%";
+                return "# not like ?";
+            case "STARTSWITH":
+                this.value = this.value + "%";
+                return "# like ?";
+            case "ENDSWITH":
+                this.value = "%" + this.value;
+                return "# like ?";
+            case "EQUAL":
+                return "# = ?";
+            case "NOT_EQUAL":
+                return "# != ?";
+            case "LESS":
+                return "# < ?";
+            case "LESS_OR_EQUAL":
+                return "# <= ?";
+            case "GREATER":
+                return "# > ?";
+            case "GREATER_OR_EQUAL":
+                return "# >= ?";
+            case "ISNULL":
+                return "# is null";
+            case "ISNOTNULL":
+                return "# is not null";
+        }
+    }
 }
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ece0b8e36a049827b257050e159e263d018c66aa..3a7a6a8f8ce6e0aad7e5b2bc0ed6bfaa79aa3fb2 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -33,7 +33,12 @@ $KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae
 $KeywordRegistry.currency = function(){return "Currency";};
 $KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
 $KeywordRegistry.offerStatus = function(){return "OfferStatus";};
+
 $KeywordRegistry.organisationType = function(){return "OrganisationType";};
+$KeywordRegistry.organisationType$manufacturer = function(){return "dbb3f596-bd2b-4e08-baef-ba28d7b752e9";};
+$KeywordRegistry.organisationType$competitor = function(){return "eccaf9de-5c7b-4b6e-ab77-0b33d8486f29";};
+
+
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.taskStatus = function(){return "TaskStatus";};
 $KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
@@ -89,4 +94,6 @@ $KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagemen
 $KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};
 $KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
 $KeywordRegistry.documentTemplateType$mail = function(){return "MAI                                 ";};
-$KeywordRegistry.documentTemplateType$attachment = function(){return "ATT                                 ";};
\ No newline at end of file
+$KeywordRegistry.documentTemplateType$attachment = function(){return "ATT                                 ";};
+$KeywordRegistry.classificationType = function(){return "ClassificationType";};
+$KeywordRegistry.classificationType$salesproject = function(){return "968eafa3-3e76-4afa-8999-878e51cc3bab";};
\ No newline at end of file
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 13ecd5b015837b24a1c5ce1b3af441eded71e992..4d5c93b08c4cce458a872e93c6955c99207d1d51 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,614 +1,616 @@
-import("system.util");
-import("system.SQLTYPES");
-import("system.datetime");
-import("system.db");
-import("system.vars");
-import("system.translate");
-import("KeywordRegistry_basic");
-import("Util_lib");
-import("Binary_lib");
-import("Sql_lib");
-import("Keyword_lib");
-import("Data_lib");
-
-/**
- * utility functions for products
- * Do not create an instance of this!
- * 
- * @class
- */
-function ProductUtils() {}
-
-/**
- * Delivers the currently valid product price 
- * 
- * @param {String} pid ProductID
- * @param {String} buySell possible values: PP, SP
- * @param {String} [onlyStandard=false] if true, only standard price lists are selected.
- * 
- * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
- * 
- * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
- */
-ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard) {
-    if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
-    {
-        var today = datetime.clearTime(vars.get("sys.date"), "utc");
-        var actualPriceCondition = SqlCondition.begin();
-        
-        if (onlyStandard != undefined && onlyStandard)
-        {
-            actualPriceCondition.andPrepare("PRODUCTPRICE.PRICELIST", "02553fc7-4611-4914-8ff5-0b7c4e7531c9");
-        }
-                    
-        actualPriceCondition.andPrepare("PRODUCTPRICE.BUYSELL", buySell)
-                            .andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
-                            .andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
-                            .andSqlCondition(SqlCondition.begin()
-                                .orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
-                                .or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
-                            
-        var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
-
-        if (productPriceData[0] && productPriceData[1])
-            return  [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
-        else
-            return [];
-    } else {
-        return [];
-    }
-}
-
-/**
- * Delivers the stock
- * 
- * @param {String} pid ProductID
- * 
- * @example productUtils.getStockCount(vars.get("$field.PRODUCTID"))
- * 
- * @return {String} stock count
- */
-ProductUtils.getStockCount = function(pid) {
-    if (pid != undefined && pid != "")
-    {
-        var sum = db.cell(SqlCondition.begin()
-                                      .andPrepare("STOCK.PRODUCT_ID", pid)
-                                      .buildSql("select sum(QUANTITY * case IN_OUT when 0 then -1 else 1)"
-                                                 + " from STOCK"));
-        
-        if (sum == "")
-            sum = "0";
-
-        return sum;
-    }
-    else
-    {
-        throw new Error(translate.withArguments("${PRODUCT_LIB_NO_PRODUCT_ID} function: %0", ["ProductUtils.getStockCount"]));
-    }
-}
-
-/**
- * Delivers metadata and price lists of the passed product. 
- * If parameter "priceListFilter" is passed valid price lists and the 
- * current price list to use for offer/order are delivered.
- * 
- * @param {String} pid req ProductID
- * @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
- * @param {String[]} additionalProductInfoFields additional fields from Product
- *                   They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
- * 
- * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
- *          var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
- *          var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- *          var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
- *          var pUtils = new ProductUtils();
- *          var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
- *          var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
- * 
- * @return {Object} { <br>
- *                   productId: "productid" <br>
- *                   , productName: "product name" <br>
- *                   , groupCode: "keyvalue of keyword 'GROUPCODE'" <br>
- *                   , unit: "keyvalue of keyword 'UNIT'" <br>
- *                   , PriceLists: {$pricelistid$ { <br>
- *                          priceListId: "pricelistid" <br>
- *                          , relationId: "contactid" when filled -> custom price list <br>
- *                          , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- *                          , price: "price" <br>
- *                          , vat: "vat" <br>
- *                          , validFrom: TIMESTAMP <br>
- *                          , validTo: TIMESTAMP <br>
- *                          , buySell: "SP" / "PP" <br>
- *                          , fromQuantity: "fromquantity" <br>
- *                          , currency: "keyvalue of keyword 'CURRENCY'" <br>
- *                      } } <br>
- *                   , CurrentValidPriceLists: {$pricelistid$ { <br>
- *                          priceListId: "pricelistid" <br>
- *                          , relationId: "contactid" when filled -> custom price list <br>
- *                          , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- *                          , price: "price" <br>
- *                          , vat: "vat" <br>
- *                          , validFrom: TIMESTAMP <br>
- *                          , validTo: TIMESTAMP <br>
- *                          , buySell: "SP" / "PP" <br>
- *                          , fromQuantity: "fromquantity" <br>
- *                          , currency: "keyvalue of keyword 'CURRENCY'" <br>
- *                      } } <br>
- *                   , PriceListToUse: {$pricelistid$ { <br>
- *                          priceListId: "pricelistid" <br>
- *                          , relationId: "contactid" when filled -> custom price list <br>
- *                          , priceList: "keyvalue of keyword 'PRICELIST'" <br>
- *                          , price: "price" <br>
- *                          , vat: "vat" <br>
- *                          , validFrom: TIMESTAMP <br>
- *                          , validTo: TIMESTAMP <br>
- *                          , buySell: "SP" / "PP" <br>
- *                          , fromQuantity: "fromquantity" <br>
- *                          , currency: "keyvalue of keyword 'CURRENCY'" <br>
- *                      } }, <br>
- *                   INFO: "the productinfo"
- *               }
- */
-ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
-{
-    if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
-    var ProductDetails = {};
-
-    var cols = [];
-    var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
-    var defaultProductFieldCount = colsProduct.length;
-    colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
-    
-    cols = cols.concat(colsProduct);
-
-    var joins = [];
-    var orderby = ["PRODUCTID"];
-
-    //PriceList (all)
-    var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
-                        , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
-
-    cols = cols.concat(colsPricelistAll);
-    joins.push(" left join PRODUCTPRICE allPP on allPP.PRODUCT_ID = PRODUCTID ");
-
-    //PriceList (currently valid)
-    var validPriceLists = false;
-    if (priceListFilter != undefined 
-        && priceListFilter.currency != undefined && priceListFilter.currency != "" 
-        && priceListFilter.quantity != undefined && priceListFilter.quantity != "")
-    {
-        validPriceLists = true;
-        var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
-                        , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
-        orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
-
-        cols = cols.concat(colsPricelistValid);
-        joins.push("left join PRODUCTPRICE validPP on " 
-                    + db.translateCondition(SqlCondition.begin()
-                               .and("validPP.PRODUCT_ID = PRODUCTID")
-                               .andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
-                               .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
-                               .andPrepare(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), "# >= ?")
-                               .andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
-                               .andSqlCondition(SqlCondition.begin()
-                                    .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
-                                    .orSqlCondition(SqlCondition.begin()
-                                        .and("validPP.CONTACT_ID is null")
-                                        .andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'), 
-                                    "1 = 2"), 
-                                "1 = 2")
-                                .build("1 = 2")))
-    }
-    
-    var ProductDataSql = SqlCondition.begin()
-                            .andPrepare("PRODUCT.PRODUCTID", pid)
-                            .buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
-                                         "1 = 2",
-                                         "order by " + orderby.join(", "))
-                                         
-    var ProductData = db.table(ProductDataSql);
-
-    for (var i = 0; i < ProductData.length; i++)
-    {
-        //Product
-        if (ProductDetails.productId == undefined)
-        {
-            ProductDetails = {
-                            productId: ProductData[i][0]
-                            , productName: ProductData[i][1]
-                            , groupCode: ProductData[i][2]
-                            , unit: ProductData[i][3]
-                            , PriceLists: {}
-                            , CurrentValidPriceLists: {}
-                            , PriceListToUse: null
-                        };
-                        
-            // add additional fields to the details
-            var countPos = defaultProductFieldCount;
-            additionalProductInfoFields.forEach(function(productField)
-            {
-                this[productField] = ProductData[i][countPos];
-                countPos++;
-            }, ProductDetails);
-        }
-        //Pricelist (all)
-        var colIdx = colsProduct.length;
-        if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
-        {
-            ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
-        }
-
-        //Pricelist (currently valid)
-        colIdx = colsProduct.length + colsPricelistAll.length;
-        if (validPriceLists)
-        {
-            if (ProductData[i][colIdx] != "" && ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
-            {
-                ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] = _getPriceListObject();
-            }
-        }
-    }
-
-    if (validPriceLists)
-        ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
-
-    return ProductDetails;
-
-    function _getPriceListObject() {
-        return {
-                priceListId: ProductData[i][colIdx++]
-                , relationId: ProductData[i][colIdx++]
-                , priceList: ProductData[i][colIdx++]
-                , price: ProductData[i][colIdx++]
-                , vat: ProductData[i][colIdx++]
-                , validFrom: ProductData[i][colIdx++]
-                , validTo: ProductData[i][colIdx++]
-                , buySell: ProductData[i][colIdx++]
-                , fromQuantity: ProductData[i][colIdx++]
-                , currency: ProductData[i][colIdx++]
-        };
-    }
-
-    //price list to use for offer/order
-    function _getPriceListToUse(priceLists, priceListFilter) {
-        for (var list in priceLists) {
-            //custom price (defined in Org -> Conditions)
-            if (priceListFilter.relationId != "" && priceListFilter.relationId == priceLists[list].relationId) {
-                return priceLists[list];
-            }
-            //customer deposited price list (defined by Attribute)
-            if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
-                return priceLists[list];
-            }
-            //default price list
-            if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
-                return priceLists[list];
-            }
-        }
-
-        //no valid price list found
-        return null;
-    }
-}
-
-/**
- * Checks if there is already an existing price list identical to the passed price list 
- * 
- * @param {String} pid ProductID
- * @param {Object} priceList { <br>
- *                                  priceList: "keyvalue of keyword 'PRICELIST'" <br>
- *                                  , validFrom: TIMESTAMP <br>
- *                                  , validTo: TIMESTAMP <br>
- *                                  , buySell: "SP" / "PP" <br>
- *                                  , fromQuantity: "fromquantity" <br>
- *                                  , currency: "keyvalue of keyword 'CURRENCY'" <br>
- *                             }
- * 
- * @example //Productprice_entity, Field: PRICELIST, Process: onValidation
- *          var pUtils = new ProductUtils();
- *          var priceList = {
- *                          priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
- *                          , fromQuantity: vars.get("$field.FROMQUANTITY")
- *                          , buySell: vars.get("$field.BUYSELL")
- *                          , currency: vars.get("$field.CURRENCY")
- *                          , validFrom: vars.get("$field.VALID_FROM")
- *                          , validTo: vars.get("$field.VALID_TO")
- *                      };
- *
- *          var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
- *          if (identicalPriceList != null)
- *          {
- *              result.string(translate.text("Identical price list found!"));
- *          }
- * 
- * @return {Object | null} null if no identical price list was found, otherwise the found price list
- */
-ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
-    var PriceLists = this.getProductDetails(pid).PriceLists;
-
-    for (var pricelist in PriceLists) {
-        //different pricelist id
-        //equal price list
-        //equal fromquantity
-        //equal currency
-        //equal pp/sp
-        if (priceList.priceListId != PriceLists[pricelist].priceListId
-            && priceList.priceList == PriceLists[pricelist].priceList 
-            && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity) 
-            && priceList.buySell == PriceLists[pricelist].buySell
-            && priceList.currency == PriceLists[pricelist].currency) {
-            
-            //identical validFrom & validTo
-            // OR NOT [ validFrom_new <= validFrom & validTo_new <= validTo
-            //        OR validFrom_new >= validFrom & validTo_new >= validTo
-            //        OR validFrom_new < validFrom & validTo_new > validTo
-            // ]
-            if (priceList.validFrom == PriceLists[pricelist].validFrom && priceList.validTo == PriceLists[pricelist].validTo
-                || ! (priceList.validFrom <= PriceLists[pricelist].validFrom && priceList.validTo <= PriceLists[pricelist].validTo
-                       || priceList.validFrom >= PriceLists[pricelist].validFrom && priceList.validTo >= PriceLists[pricelist].validTo
-                       || priceList.validFrom < PriceLists[pricelist].validFrom && priceList.validTo > PriceLists[pricelist].validTo)) {
-                //identical price list found
-                return PriceLists[pricelist];
-            }
-        }
-    }
-
-    //no identical price list found
-    return null;        
-}
-
-/**
- * returns the image for a product
- * 
- * @param {String} pProductId the id of the product.
- * @param {String} pDefaultText the text, to use for default image generation.
- * @return {String} base64 coded String of the image. If none existed, the given String is used to create an image.
- */
-ProductUtils.getImage = function(pProductId, pDefaultText)
-{
-    return ImageUtils.get("PRODUCT", "IMAGE", pProductId, pDefaultText);
-}
-
-/**
- * sets the image of a product
- * 
- * @param {String} pProductId the id of the product.
- * @param {String} pImageDateBase64 base64 coded String of the image.
- * @return {Boolean} if image could be set
- */
-ProductUtils.setImage = function(pProductId, pImageDateBase64)
-{
-    return ImageUtils.set("PRODUCT", "IMAGE", pProductId, pImageDateBase64, "ProductImage", "Image of the product");
-}
-
-/**
- * deletes the image of a product
- * 
- * @param {String} pProductId the id of the product.
- * @return {Boolean} if image could be removed
- */
-ProductUtils.removeImage = function(pProductId)
-{
-    return ImageUtils.remove("PRODUCT", "IMAGE", pProductId);
-}
-
-/**
- * Class containing utility functions for Prod2Prod (Parts list)
- * 
- * @param {String} productId req ProductID
- * 
- * @class
- *
- */
-function Prod2ProdUtils(productId) 
-{    
-    this.productId = productId;
-    this.data = undefined;
-}
-
-/**
- * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
- *  
- * @return {Object} { $prod2prodid$ { <br>
- *                       ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
- *                       , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
- *                       , destid: "Parent ProductID" <br>
- *                       , sourceid: "Child ProductID" <br>
- *                       , quantity: "Quantity" <br>
- *                       , optional: "0" = not optional, "1" = optional <br>
- *                       , takeprice: "0" = no price, "1" = price <br>
- *                       , productcode: "Productcode" <br>
- *                       , productid: "Productid" <br>
- *                  } }
- */
-Prod2ProdUtils.prototype.getPartsListObject = function() 
-{
-    return this._relateChilds();
-}
-
-/**
- * Delivers a 2D-Array for RecordContainer of Entity "Prod2prod_entity" 
- * containing parts list for passed product "productId" (Constructor parameter).
- * 
- * It is necessary to generate a specifically UID for the RecordContainer because 
- * the same data record can be listed several times. Therefore the primary key "PROD2PRODID"
- * can not be used for UID because this must be unique.
- * 
- * @return {String[][]} [ ["UID"
- *                    , "PARENTID" (equals "DEST_ID")
- *                    , "PROD2PRODID"
- *                    , "DEST_ID"
- *                    , "SOURCE_ID"
- *                    , "QUANTITY"
- *                    , "OPTIONAL"
- *                    , "TAKEPRICE"
- *                    , "PRODUCTCODE"
- *                    , "PRODUCTID"] ]
- */
-Prod2ProdUtils.prototype.getPartsListForRecordContainer = function() 
-{
-    var ret = [];
-    var childs = this._relateChilds();
-
-    __push(childs.root);
-
-    function __push(pObj)
-    {
-        for(var i = 0; i < pObj.ids.length; i++)
-        {
-            var rowdata = childs[pObj.ids[i]].rowdata;
-            var UID = util.getNewUUID();
-            var PARENTID = childs[pObj.ids[i]].destid;
-
-            rowdata = [UID, PARENTID].concat(rowdata);
-            ret.push(rowdata);
-            __push( childs[pObj.ids[i]] );
-        }
-    }
-    return ret;
-}
-
-/**
-* Delivers an Array containing productids of the parts list 
-* for passed product "productId" (Constructor parameter).
-* 
-* 
-* @return {String[]} [ "SOURCE_ID" ]
-*/
-Prod2ProdUtils.prototype.getPartsListProdIds = function() 
-{
-    var ret = [];
-    var childs = this._relateChilds();
-
-    __push(childs.root);
-
-    return ret;
-
-    function __push(pObj)
-    {
-        for(var i = 0; i < pObj.ids.length; i++)
-        {
-            ret.push(childs[pObj.ids[i]].sourceid);
-            __push( childs[pObj.ids[i]] );
-        }
-    }
-}
-
-/**
-* Delivers an Array containing productids of the parent list
-* for passed product "productId" (Constructor parameter).
-* 
-* 
-* @return {String[]} [ "DEST_ID" ]
-*/
-Prod2ProdUtils.prototype.getParentProdIds = function() 
-{
-    var ret = [];
-    var parents = this._relateParents();
-
-    __push(parents.root);
-
-    return ret;
-
-    function __push(pObj)
-    {
-        for(var i = 0; i < pObj.ids.length; i++)
-        {
-            ret.push(parents[pObj.ids[i]].destid);
-            __push( parents[pObj.ids[i]] );
-        }
-    }
-}
-
-/** 
-* Function to initalize class variable "data" containing complete Prod2Prod-Data.<br>
-* It guarantees a unique load of data per instance.
-*
-* @ignore
-*/
-Prod2ProdUtils.prototype._initProd2ProdData = function()
-{
-    if (this.data == undefined) {
-        this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
-                    + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
-                    + "order by PRODUCTCODE ");
-    }
-}
-
-/**
- * object tree to relate products by DEST_ID / SOURCE_ID.
- **/
-Prod2ProdUtils.prototype._buildTree = function(pSupervised)
-{
-    this._initProd2ProdData();
-
-        var tree = { root: {ids: [], sourceid: this.productId } };
-        
-        if(pSupervised)
-            tree = { root: {ids: [], destid: this.productId } };
-
-        for (var i = 0; i < this.data.length; i++)
-        {
-            var prod2prodid = this.data[i][0];
-            if ( tree[prod2prodid] == undefined )   
-            {
-                tree[prod2prodid] = {
-                    ids: [] 
-                    , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
-                    , destid: this.data[i][1]
-                    , sourceid: this.data[i][2] 
-                    , quantity: this.data[i][3]
-                    , optional: this.data[i][4]
-                    , takeprice: this.data[i][5]
-                    , productcode: this.data[i][6]
-                    , productid: this.data[i][7]
-                };
-            }
-        }
-        
-        return tree;
-
-}
-
-Prod2ProdUtils.prototype._relateChilds = function()
-{
-    var tree = this._buildTree(false);
-
-    __relate("root");
-
-    return tree;
-
-    function __relate(pID)
-    {
-        for ( var id in tree )
-        {
-            if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
-            {   
-                tree[pID].ids.push(id);
-                __relate(id);
-            }    
-        }
-    }
-}
-
-Prod2ProdUtils.prototype._relateParents = function() 
-{
-    var tree = this._buildTree(true);
-
-    __relate("root");
-
-    return tree;
-
-
-    function __relate(pID)
-    {
-        for ( var id in tree )
-        {
-            if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
-            {   
-                tree[pID].ids.push(id);
-                __relate(id);
-            }    
-        }
-    }
+import("system.util");
+import("system.SQLTYPES");
+import("system.datetime");
+import("system.db");
+import("system.vars");
+import("system.translate");
+import("KeywordRegistry_basic");
+import("Util_lib");
+import("Binary_lib");
+import("Sql_lib");
+import("Keyword_lib");
+import("Data_lib");
+
+/**
+ * utility functions for products
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function ProductUtils() {}
+
+/**
+ * Delivers the currently valid product price 
+ * 
+ * @param {String} pid ProductID
+ * @param {String} buySell possible values: PP, SP
+ * @param {String} [onlyStandard=false] if true, only standard price lists are selected.
+ * 
+ * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
+ * 
+ * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
+ */
+ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard) {
+    if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
+    {
+        var today = datetime.clearTime(vars.get("sys.date"), "utc");
+        var actualPriceCondition = SqlCondition.begin();
+        
+        if (onlyStandard != undefined && onlyStandard)
+        {
+            actualPriceCondition.andPrepare("PRODUCTPRICE.PRICELIST", "02553fc7-4611-4914-8ff5-0b7c4e7531c9");
+        }
+                    
+        actualPriceCondition.andPrepare("PRODUCTPRICE.BUYSELL", buySell)
+                            .andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
+                            .andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
+                            .andSqlCondition(SqlCondition.begin()
+                                .orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
+                                .or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
+                            
+        var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
+
+        if (productPriceData[0] && productPriceData[1])
+            return  [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
+        else
+            return [];
+    } else {
+        return [];
+    }
+}
+
+/**
+ * Delivers the stock
+ * 
+ * @param {String} pid ProductID
+ * 
+ * @example productUtils.getStockCount(vars.get("$field.PRODUCTID"))
+ * 
+ * @return {String} stock count
+ */
+ProductUtils.getStockCount = function(pid) {
+    if (pid != undefined && pid != "")
+    {
+        var sum = db.cell(SqlCondition.begin()
+                                      .andPrepare("STOCK.PRODUCT_ID", pid)
+                                      .buildSql("select sum(QUANTITY * case IN_OUT when 0 then -1 else 1)"
+                                                 + " from STOCK"));
+        
+        if (sum == "")
+            sum = "0";
+
+        return sum;
+    }
+    else
+    {
+        throw new Error(translate.withArguments("${PRODUCT_LIB_NO_PRODUCT_ID} function: %0", ["ProductUtils.getStockCount"]));
+    }
+}
+
+/**
+ * Delivers metadata and price lists of the passed product. 
+ * If parameter "priceListFilter" is passed valid price lists and the 
+ * current price list to use for offer/order are delivered.
+ * 
+ * @param {String} pid req ProductID
+ * @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
+ * @param {String[]} additionalProductInfoFields additional fields from Product
+ *                   They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
+ * 
+ * @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
+ *          var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
+ *          var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ *          var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+ *          var pUtils = new ProductUtils();
+ *          var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
+ *          var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
+ * 
+ * @return {Object} { <br>
+ *                   productId: "productid" <br>
+ *                   , productName: "product name" <br>
+ *                   , groupCode: "keyvalue of keyword 'GROUPCODE'" <br>
+ *                   , unit: "keyvalue of keyword 'UNIT'" <br>
+ *                   , PriceLists: {$pricelistid$ { <br>
+ *                          priceListId: "pricelistid" <br>
+ *                          , relationId: "contactid" when filled -> custom price list <br>
+ *                          , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ *                          , price: "price" <br>
+ *                          , vat: "vat" <br>
+ *                          , validFrom: TIMESTAMP <br>
+ *                          , validTo: TIMESTAMP <br>
+ *                          , buySell: "SP" / "PP" <br>
+ *                          , fromQuantity: "fromquantity" <br>
+ *                          , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ *                      } } <br>
+ *                   , CurrentValidPriceLists: {$pricelistid$ { <br>
+ *                          priceListId: "pricelistid" <br>
+ *                          , relationId: "contactid" when filled -> custom price list <br>
+ *                          , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ *                          , price: "price" <br>
+ *                          , vat: "vat" <br>
+ *                          , validFrom: TIMESTAMP <br>
+ *                          , validTo: TIMESTAMP <br>
+ *                          , buySell: "SP" / "PP" <br>
+ *                          , fromQuantity: "fromquantity" <br>
+ *                          , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ *                      } } <br>
+ *                   , PriceListToUse: {$pricelistid$ { <br>
+ *                          priceListId: "pricelistid" <br>
+ *                          , relationId: "contactid" when filled -> custom price list <br>
+ *                          , priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ *                          , price: "price" <br>
+ *                          , vat: "vat" <br>
+ *                          , validFrom: TIMESTAMP <br>
+ *                          , validTo: TIMESTAMP <br>
+ *                          , buySell: "SP" / "PP" <br>
+ *                          , fromQuantity: "fromquantity" <br>
+ *                          , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ *                      } }, <br>
+ *                   INFO: "the productinfo"
+ *               }
+ */
+ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
+{
+    if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
+    var ProductDetails = {};
+
+    var cols = [];
+    var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
+    var defaultProductFieldCount = colsProduct.length;
+    colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
+    
+    cols = cols.concat(colsProduct);
+
+    var joins = [];
+    var orderby = ["PRODUCTID"];
+
+    //PriceList (all)
+    var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
+                        , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
+
+    cols = cols.concat(colsPricelistAll);
+    joins.push(" left join PRODUCTPRICE allPP on allPP.PRODUCT_ID = PRODUCTID ");
+
+    //PriceList (currently valid)
+    var validPriceLists = false;
+    if (priceListFilter != undefined 
+        && priceListFilter.currency != undefined && priceListFilter.currency != "" 
+        && priceListFilter.quantity != undefined && priceListFilter.quantity != "")
+    {
+        validPriceLists = true;
+        var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
+                        , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
+        orderby = orderby.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
+
+        cols = cols.concat(colsPricelistValid);
+        joins.push("left join PRODUCTPRICE validPP on " 
+                    + db.translateCondition(SqlCondition.begin()
+                               .and("validPP.PRODUCT_ID = PRODUCTID")
+                               .andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
+                                .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
+                                .andSqlCondition(SqlCondition.begin()
+                                    .andPrepare(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), "# >= ?")
+                                    .or("validPP.VALID_TO is null")
+                                )
+                               .andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
+                               .andSqlCondition(SqlCondition.begin()
+                                    .orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
+                                    .orSqlCondition(SqlCondition.begin()
+                                        .and("validPP.CONTACT_ID is null")
+                                        .andPrepare(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP'), 
+                                    "1 = 2"), 
+                                "1 = 2")
+                                .build("1 = 2")))
+    }
+    
+    var ProductDataSql = SqlCondition.begin()
+                            .andPrepare("PRODUCT.PRODUCTID", pid)
+                            .buildSql("select " + cols.join(", ") + " from PRODUCT " + joins.join(" "),
+                                         "1 = 2",
+                                         "order by " + orderby.join(", "))
+                                         
+    var ProductData = db.table(ProductDataSql);
+
+    for (var i = 0; i < ProductData.length; i++)
+    {
+        //Product
+        if (ProductDetails.productId == undefined)
+        {
+            ProductDetails = {
+                            productId: ProductData[i][0]
+                            , productName: ProductData[i][1]
+                            , groupCode: ProductData[i][2]
+                            , unit: ProductData[i][3]
+                            , PriceLists: {}
+                            , CurrentValidPriceLists: {}
+                            , PriceListToUse: null
+                        };
+                        
+            // add additional fields to the details
+            var countPos = defaultProductFieldCount;
+            additionalProductInfoFields.forEach(function(productField)
+            {
+                this[productField] = ProductData[i][countPos];
+                countPos++;
+            }, ProductDetails);
+        }
+        //Pricelist (all)
+        var colIdx = colsProduct.length;
+        if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+        {
+            ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+        }
+
+        //Pricelist (currently valid)
+        colIdx = colsProduct.length + colsPricelistAll.length;
+        if (validPriceLists)
+        {
+            if (ProductData[i][colIdx] != "" && ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+            {
+                ProductDetails.CurrentValidPriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+            }
+        }
+    }
+
+    if (validPriceLists)
+        ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
+    return ProductDetails;
+
+    function _getPriceListObject() {
+        return {
+                priceListId: ProductData[i][colIdx++]
+                , relationId: ProductData[i][colIdx++]
+                , priceList: ProductData[i][colIdx++]
+                , price: ProductData[i][colIdx++]
+                , vat: ProductData[i][colIdx++]
+                , validFrom: ProductData[i][colIdx++]
+                , validTo: ProductData[i][colIdx++]
+                , buySell: ProductData[i][colIdx++]
+                , fromQuantity: ProductData[i][colIdx++]
+                , currency: ProductData[i][colIdx++]
+        };
+    }
+
+    //price list to use for offer/order
+    function _getPriceListToUse(priceLists, priceListFilter) {
+        for (var list in priceLists) {
+            //custom price (defined in Org -> Conditions)
+            if (priceListFilter.relationId != "" && priceListFilter.relationId == priceLists[list].relationId) {
+                return priceLists[list];
+            }
+            //customer deposited price list (defined by Attribute)
+            if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
+                return priceLists[list];
+            }
+            //default price list
+            if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
+                return priceLists[list];
+            }
+        }
+
+        //no valid price list found
+        return null;
+    }
+}
+
+/**
+ * Checks if there is already an existing price list identical to the passed price list 
+ * 
+ * @param {String} pid ProductID
+ * @param {Object} priceList { <br>
+ *                                  priceList: "keyvalue of keyword 'PRICELIST'" <br>
+ *                                  , validFrom: TIMESTAMP <br>
+ *                                  , validTo: TIMESTAMP <br>
+ *                                  , buySell: "SP" / "PP" <br>
+ *                                  , fromQuantity: "fromquantity" <br>
+ *                                  , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ *                             }
+ * 
+ * @example //Productprice_entity, Field: PRICELIST, Process: onValidation
+ *          var pUtils = new ProductUtils();
+ *          var priceList = {
+ *                          priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
+ *                          , fromQuantity: vars.get("$field.FROMQUANTITY")
+ *                          , buySell: vars.get("$field.BUYSELL")
+ *                          , currency: vars.get("$field.CURRENCY")
+ *                          , validFrom: vars.get("$field.VALID_FROM")
+ *                          , validTo: vars.get("$field.VALID_TO")
+ *                      };
+ *
+ *          var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
+ *          if (identicalPriceList != null)
+ *          {
+ *              result.string(translate.text("Identical price list found!"));
+ *          }
+ * 
+ * @return {Object | null} null if no identical price list was found, otherwise the found price list
+ */
+ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
+    var PriceLists = this.getProductDetails(pid).PriceLists;
+
+    for (var pricelist in PriceLists) {
+        //different pricelist id
+        //equal price list
+        //equal fromquantity
+        //equal currency
+        //equal pp/sp
+        if (priceList.priceListId != PriceLists[pricelist].priceListId
+            && priceList.priceList == PriceLists[pricelist].priceList 
+            && parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity) 
+            && priceList.buySell == PriceLists[pricelist].buySell
+            && priceList.currency == PriceLists[pricelist].currency) {
+            
+            //identical validFrom & validTo
+            // OR NOT [ validFrom_new <= validFrom & validTo_new <= validTo
+            //        OR validFrom_new >= validFrom & validTo_new >= validTo
+            //        OR validFrom_new < validFrom & validTo_new > validTo
+            // ]
+            if (priceList.validFrom == PriceLists[pricelist].validFrom && priceList.validTo == PriceLists[pricelist].validTo
+                || ! (priceList.validFrom <= PriceLists[pricelist].validFrom && priceList.validTo <= PriceLists[pricelist].validTo
+                       || priceList.validFrom >= PriceLists[pricelist].validFrom && priceList.validTo >= PriceLists[pricelist].validTo
+                       || priceList.validFrom < PriceLists[pricelist].validFrom && priceList.validTo > PriceLists[pricelist].validTo)) {
+                //identical price list found
+                return PriceLists[pricelist];
+            }
+        }
+    }
+
+    //no identical price list found
+    return null;        
+}
+
+/**
+ * returns the image for a product
+ * 
+ * @param {String} pProductId the id of the product.
+ * @param {String} pDefaultText the text, to use for default image generation.
+ * @return {String} base64 coded String of the image. If none existed, the given String is used to create an image.
+ */
+ProductUtils.getImage = function(pProductId, pDefaultText)
+{
+    return ImageUtils.get("PRODUCT", "IMAGE", pProductId, pDefaultText);
+}
+
+/**
+ * sets the image of a product
+ * 
+ * @param {String} pProductId the id of the product.
+ * @param {String} pImageDateBase64 base64 coded String of the image.
+ * @return {Boolean} if image could be set
+ */
+ProductUtils.setImage = function(pProductId, pImageDateBase64)
+{
+    return ImageUtils.set("PRODUCT", "IMAGE", pProductId, pImageDateBase64, "ProductImage", "Image of the product");
+}
+
+/**
+ * deletes the image of a product
+ * 
+ * @param {String} pProductId the id of the product.
+ * @return {Boolean} if image could be removed
+ */
+ProductUtils.removeImage = function(pProductId)
+{
+    return ImageUtils.remove("PRODUCT", "IMAGE", pProductId);
+}
+
+/**
+ * Class containing utility functions for Prod2Prod (Parts list)
+ * 
+ * @param {String} productId req ProductID
+ * 
+ * @class
+ *
+ */
+function Prod2ProdUtils(productId) 
+{    
+    this.productId = productId;
+    this.data = undefined;
+}
+
+/**
+ * Delivers an Object containing parts list structure for passed product "pProductId" (Constructor parameter)
+ *  
+ * @return {Object} { $prod2prodid$ { <br>
+ *                       ids: [ Array containing child Prod2ProdIds for passed product "pProductId" (Constructor parameter) ] <br>
+ *                       , rowdata: [ "PROD2PRODID", "DEST_ID", "SOURCE_ID", "QUANTITY", "OPTIONAL", "TAKEPRICE" ] from DB-Table PROD2PROD <br>
+ *                       , destid: "Parent ProductID" <br>
+ *                       , sourceid: "Child ProductID" <br>
+ *                       , quantity: "Quantity" <br>
+ *                       , optional: "0" = not optional, "1" = optional <br>
+ *                       , takeprice: "0" = no price, "1" = price <br>
+ *                       , productcode: "Productcode" <br>
+ *                       , productid: "Productid" <br>
+ *                  } }
+ */
+Prod2ProdUtils.prototype.getPartsListObject = function() 
+{
+    return this._relateChilds();
+}
+
+/**
+ * Delivers a 2D-Array for RecordContainer of Entity "Prod2prod_entity" 
+ * containing parts list for passed product "productId" (Constructor parameter).
+ * 
+ * It is necessary to generate a specifically UID for the RecordContainer because 
+ * the same data record can be listed several times. Therefore the primary key "PROD2PRODID"
+ * can not be used for UID because this must be unique.
+ * 
+ * @return {String[][]} [ ["UID"
+ *                    , "PARENTID" (equals "DEST_ID")
+ *                    , "PROD2PRODID"
+ *                    , "DEST_ID"
+ *                    , "SOURCE_ID"
+ *                    , "QUANTITY"
+ *                    , "OPTIONAL"
+ *                    , "TAKEPRICE"
+ *                    , "PRODUCTCODE"
+ *                    , "PRODUCTID"] ]
+ */
+Prod2ProdUtils.prototype.getPartsListForRecordContainer = function() 
+{
+    var ret = [];
+    var childs = this._relateChilds();
+
+    __push(childs.root);
+
+    function __push(pObj)
+    {
+        for(var i = 0; i < pObj.ids.length; i++)
+        {
+            var rowdata = childs[pObj.ids[i]].rowdata;
+            var UID = util.getNewUUID();
+            var PARENTID = childs[pObj.ids[i]].destid;
+
+            rowdata = [UID, PARENTID].concat(rowdata);
+            ret.push(rowdata);
+            __push( childs[pObj.ids[i]] );
+        }
+    }
+    return ret;
+}
+
+/**
+* Delivers an Array containing productids of the parts list 
+* for passed product "productId" (Constructor parameter).
+* 
+* 
+* @return {String[]} [ "SOURCE_ID" ]
+*/
+Prod2ProdUtils.prototype.getPartsListProdIds = function() 
+{
+    var ret = [];
+    var childs = this._relateChilds();
+
+    __push(childs.root);
+
+    return ret;
+
+    function __push(pObj)
+    {
+        for(var i = 0; i < pObj.ids.length; i++)
+        {
+            ret.push(childs[pObj.ids[i]].sourceid);
+            __push( childs[pObj.ids[i]] );
+        }
+    }
+}
+
+/**
+* Delivers an Array containing productids of the parent list
+* for passed product "productId" (Constructor parameter).
+* 
+* 
+* @return {String[]} [ "DEST_ID" ]
+*/
+Prod2ProdUtils.prototype.getParentProdIds = function() 
+{
+    var ret = [];
+    var parents = this._relateParents();
+
+    __push(parents.root);
+
+    return ret;
+
+    function __push(pObj)
+    {
+        for(var i = 0; i < pObj.ids.length; i++)
+        {
+            ret.push(parents[pObj.ids[i]].destid);
+            __push( parents[pObj.ids[i]] );
+        }
+    }
+}
+
+/** 
+* Function to initalize class variable "data" containing complete Prod2Prod-Data.<br>
+* It guarantees a unique load of data per instance.
+*
+* @ignore
+*/
+Prod2ProdUtils.prototype._initProd2ProdData = function()
+{
+    if (this.data == undefined) {
+        this.data = db.table("select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE, PRODUCTID "
+                    + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+                    + "order by PRODUCTCODE ");
+    }
+}
+
+/**
+ * object tree to relate products by DEST_ID / SOURCE_ID.
+ **/
+Prod2ProdUtils.prototype._buildTree = function(pSupervised)
+{
+    this._initProd2ProdData();
+
+        var tree = { root: {ids: [], sourceid: this.productId } };
+        
+        if(pSupervised)
+            tree = { root: {ids: [], destid: this.productId } };
+
+        for (var i = 0; i < this.data.length; i++)
+        {
+            var prod2prodid = this.data[i][0];
+            if ( tree[prod2prodid] == undefined )   
+            {
+                tree[prod2prodid] = {
+                    ids: [] 
+                    , rowdata: this.data[i].slice(0)//copy to get NativeArray for concatenation
+                    , destid: this.data[i][1]
+                    , sourceid: this.data[i][2] 
+                    , quantity: this.data[i][3]
+                    , optional: this.data[i][4]
+                    , takeprice: this.data[i][5]
+                    , productcode: this.data[i][6]
+                    , productid: this.data[i][7]
+                };
+            }
+        }
+        
+        return tree;
+
+}
+
+Prod2ProdUtils.prototype._relateChilds = function()
+{
+    var tree = this._buildTree(false);
+
+    __relate("root");
+
+    return tree;
+
+    function __relate(pID)
+    {
+        for ( var id in tree )
+        {
+            if ( tree[id].destid == tree[pID].sourceid && tree[pID].ids.indexOf(id) == -1 )
+            {   
+                tree[pID].ids.push(id);
+                __relate(id);
+            }    
+        }
+    }
+}
+
+Prod2ProdUtils.prototype._relateParents = function() 
+{
+    var tree = this._buildTree(true);
+
+    __relate("root");
+
+    return tree;
+
+
+    function __relate(pID)
+    {
+        for ( var id in tree )
+        {
+            if ( tree[id].sourceid == tree[pID].destid && tree[pID].ids.indexOf(id) == -1 )
+            {   
+                tree[pID].ids.push(id);
+                __relate(id);
+            }    
+        }
+    }
 }
\ No newline at end of file
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index ed91181666cc83a81ea369e1943243a0245991f8..03f48c5e100800f646437603b34d8d522d76a0cd 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -1,224 +1,298 @@
-import("system.translate");
-import("system.logging");
-import("system.project");
-import("system.vars");
-import("system.neon");
-import("system.net");
-import("system.util");
-
-/**
- * Class used for the webservice validation types.
- * 
- * Do not create new instances anywhere else than inside of the get-function!
- * 
- * @param {String} pKey the key-name
- * @param {String} pParamName name used by the webservice
- * @param {String} pWebserviceName name of the webservice. Used to find the correct webservice configuraation
- * @param {Function} pProcessResultCallback function for processing Webservice-result to the return value
- */
-function WsValidationType(pKey, pParamName, pWebserviceName, pProcessResultCallback) 
-{
-    this.key = pKey;
-    this.paramName = pParamName;
-    this.processResultCallback = pProcessResultCallback;
-    this.webserviceName = pWebserviceName;
-}
-
-/**
- * get all possible validation types or one specific
- * @param {String} [pKey=undefined] if provided, this function returns only the validation type with this key
- * 
- * @return {Object|WsValidationType} object containing all WsValidationTypes or one specific WsValidationType
- */
-WsValidationType.get = function(pKey)
-{
-    if (!this._cache)
-        this._cache = {
-            // Address lookups
-            TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "addressValidation", _processAddressLookup),
-            TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "addressValidation", _processAddressLookup),
-            
-            // Communication validation
-            TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation)
-        }
-    
-    if (pKey)
-        return this._cache[pKey];
-    
-    return this._cache;
-    
-    function _processAddressLookup(pWsResult, pValue)
-    {
-        
-        
-        // add default result consisting of pValue
-        var defaultResult = [[{}, pValue]];
-        defaultResult[0][0][this.paramName] = pValue;
-        
-        var resultAddresses = [];
-        
-        // if error, only add the default value else parse the body
-        if (!WsValidationUtils._isError(pWsResult))
-        {
-            resultAddresses = JSON.parse(pWsResult.body);
-        }
-        
-        resultAddresses = resultAddresses.concat(defaultResult);
-        
-        return resultAddresses.map(function(pAddress)
-                    {
-                        var data = pAddress[0];
-                        return [
-                            JSON.stringify(data),
-                            pAddress[1],
-                            data.zip,
-                            data.city,
-                            data.country,
-                            data.district,
-                            data.region,
-                            data.state,
-                            data[this.paramName]]
-                    }, this);
-    }
-
-    function _processCommunicationValidation(pWsResult, pValue)
-    {
-        if (!WsValidationUtils._isError(pWsResult))
-        {
-            return pWsResult.body;
-        }
-        else
-        {
-            return pValue;
-        }
-    }
-}
-
-/**
- * Class containing utility functions for validation webservices
- * It can be used for lookups (like AddressValidation-entity) or onValueChange-formatting/validation like the Communication.ADDR-field.
- * do not create an instance of this
- * 
- * @class
- */
-function WsValidationUtils() {}
-
-/**
- * validate the value with the webservice
- * @param {String} pValue to search for
- * @param {WsValidationType|String} pType type used for the search. Can be an WsValidationType or the key of the WsValidationType
- * @param {String} pCountry needed by the webservice e.g. "DE"
- * 
- * @return {String[][]} [UID,
- *                       displayName,
- *                       zip,
- *                       city,
- *                       country,
- *                       district,
- *                       region,
- *                       state,
- *                       value (the result. e.g. if pType was ZIP, the value is the found zip)
- */
-WsValidationUtils.validate = function(pValue, pType, pCountry)
-{
-    // get WsValidationType-Object if it is only the key
-    if (typeof pType == "string")
-        pType = WsValidationType.get(pType);
-    
-    if (WsValidationUtils.isWsEnabled(pType))
-    {
-
-        var userName = project.getPreferenceValue("custom." + pType.webserviceName + ".user");
-        var pw = project.getPreferenceValue("custom." + pType.webserviceName + ".pw");
-        var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url");
-        var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName");
-
-        var actionType = "GET";
-
-        if (pValue && pType)
-        {
-            // fill params
-            var parameters = {};
-            if (pCountry)
-            {
-                parameters[countryParamName] = pCountry;
-            }
-            parameters[pType.paramName] = pValue;
-
-            // call webservice
-            var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
-
-            // if error, log the error. But also process the result and let the callback generate the correct default value
-            if (WsValidationUtils._isError(ret))
-            {
-                logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
-                logging.log("Params: " + parameters.toSource());
-            }
-
-            // different handling of the result per type
-            return pType.processResultCallback(ret, pValue);
-        }
-    }
-    
-    return pType.processResultCallback(null, pValue);
-}
-
-/**
- * set all address-fields by the value of $this.value, which should contain an object of all values as JSON
- */
-WsValidationUtils.setAddressFields = function()
-{
-    try 
-    {
-        var data = JSON.parse(vars.get("$this.value"));
-    } catch (exception) { 
-        // if no valid json, it is a direct user input and not a uuid.
-        // ignore error
-        return
-    }
-     
-    _setField("$field.ZIP", data.zip);
-    _setField("$field.COUNTRY", data.country);
-    _setField("$field.CITY", data.city);
-    //_setField("$field.DISTRICT", data.district); not needed currently
-    _setField("$field.REGION", data.region);
-    _setField("$field.STATE", data.state);
-        
-    function _setField(pField, pValue)
-    {
-        if (pValue)
-            neon.setFieldValue(pField, pValue);
-    }
-}
-
-/**
- * check if the Webservice is enabled in the project preferences
- * @param {Object} pType
- * 
- * @return {boolean}
- */
-WsValidationUtils.isWsEnabled = function(pType)
-{
-    // get WsValidationType-Object if it is only the key
-    if (typeof pType == "string")
-        pType = WsValidationType.get(pType);
-    
-    // get configurations for this type
-    try 
-    {
-        return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable"));
-    } catch (exception) { 
-        return false;
-    }
-}
-
-/**
- * check if the Webservice-result is valid or an error
- * @param {Object} pWsReturn
- * 
- * @return {boolean}
- */
-WsValidationUtils._isError = function(pWsReturn)
-{
-    return pWsReturn == null || !pWsReturn.hasHttpSuccessStatusCode || pWsReturn.httpStatusCode != 200;
+import("system.translate");
+import("system.logging");
+import("system.project");
+import("system.vars");
+import("system.neon");
+import("system.net");
+import("system.util");
+
+/**
+ * Class used for the webservice validation types.
+ * 
+ * Do not create new instances anywhere else than inside of the get-function!
+ * 
+ * @param {String} pKey the key-name
+ * @param {String} pParamName name used by the webservice
+ * @param {String} pWebserviceName name of the webservice. Used to find the correct webservice configuraation
+ * @param {Function} pProcessResultCallback function for processing Webservice-result to the return value
+ */
+function WsValidationType(pKey, pParamName, pWebserviceName, pProcessResultCallback) 
+{
+    this.key = pKey;
+    this.paramName = pParamName;
+    this.processResultCallback = pProcessResultCallback;
+    this.webserviceName = pWebserviceName;
+}
+
+/**
+ * get all possible validation types or one specific
+ * @param {String} [pKey=undefined] if provided, this function returns only the validation type with this key
+ * 
+ * @return {Object|WsValidationType} object containing all WsValidationTypes or one specific WsValidationType
+ */
+WsValidationType.get = function(pKey)
+{
+    if (!this._cache)
+        this._cache = {
+            // Address lookups
+            TYPE_ADDRESS: new WsValidationType("TYPE_ADDRESS", "search", "addressValidation", _processAllAddressLookup),
+            TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "zipCityValidation", _processAddressLookup),
+            TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "zipCityValidation", _processAddressLookup),
+            
+            // Communication validation
+            TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation)
+        }
+    
+    if (pKey)
+        return this._cache[pKey];
+    
+    return this._cache;
+    
+    /**
+    *   [UID,
+    *    displayName,
+    *    zip,
+    *    city,
+    *    cityext,
+    *    country,
+    *    district,
+    *    region,
+    *    state,
+    *    street,
+    *    from_bn, // building number
+    *    to_bn,   // building number
+    *    lon,
+    *    lat,
+    *    value // pValue
+    */                       
+    function _processAllAddressLookup(pWsResult, pValue)
+    {
+        var resultAddresses = [];
+        
+        // if error, only add the default value else parse the body
+        if (!WsValidationUtils._isError(pWsResult))
+        {
+            resultAddresses = JSON.parse(pWsResult.body);
+        }
+        
+        return resultAddresses.map(function(pAddress, pIndex)
+                    {
+                        pAddress[0].value = pValue;
+                        pAddress[0].index = pIndex;
+                        var data = pAddress[0];
+                        
+                        return [
+                            JSON.stringify(data),
+                            pAddress[1],
+                            data.zip,
+                            data.city,
+                            data.cityext,
+                            data.country,
+                            data.district,
+                            data.region,
+                            data.state,
+                            data.streat,
+                            data.from_bn,
+                            data.to_bn,
+                            data.lon,
+                            data.lat,
+                            pValue]
+                    }, this);
+    }
+    
+    /**
+    *   [UID,
+    *    displayName,
+    *    zip,
+    *    city,
+    *    cityext,
+    *    country,
+    *    district,
+    *    region,
+    *    state,
+    *    street,
+    *    from_bn, // building number
+    *    to_bn,   // building number
+    *    lon,
+    *    lat,
+    *    value // (the result. e.g. if pType was ZIP, the value is the found zip)
+    */     
+    function _processAddressLookup(pWsResult, pValue)
+    {
+        var resultAddresses = [];
+        
+        // if error, only add the default value else parse the body
+        if (!WsValidationUtils._isError(pWsResult))
+        {
+            resultAddresses = JSON.parse(pWsResult.body);
+        }
+        
+         // add default result consisting of pValue
+        var defaultResult = [[{}, pValue]];
+        defaultResult[0][0][this.paramName] = pValue;
+        resultAddresses = resultAddresses.concat(defaultResult);
+        
+        return resultAddresses.map(function(pAddress, pIndex)
+                    {
+                        pAddress[0].index = pIndex;
+                        var data = pAddress[0];
+                        return [
+                            JSON.stringify(data),
+                            pAddress[1],
+                            data.zip,
+                            data.city,
+                            data.cityext,
+                            data.country,
+                            data.district,
+                            data.region,
+                            data.state,
+                            data.streat,
+                            data.from_bn,
+                            data.to_bn,
+                            data.lon,
+                            data.lat,
+                            data[this.paramName]]
+                    }, this);
+    }
+
+    function _processCommunicationValidation(pWsResult, pValue)
+    {
+        if (!WsValidationUtils._isError(pWsResult))
+        {
+            return pWsResult.body;
+        }
+        else
+        {
+            return pValue;
+        }
+    }
+}
+
+/**
+ * Class containing utility functions for validation webservices
+ * It can be used for lookups (like AddressValidation-entity) or onValueChange-formatting/validation like the Communication.ADDR-field.
+ * do not create an instance of this
+ * 
+ * @class
+ */
+function WsValidationUtils() {}
+
+/**
+ * validate the value with the webservice
+ * @param {String} pValue to search for
+ * @param {WsValidationType|String} pType type used for the search. Can be an WsValidationType or the key of the WsValidationType
+ * @param {String} pCountry needed by the webservice e.g. "DE"
+ * 
+ * @return {object} this is different, based on which webservice-type is used
+ */
+WsValidationUtils.validate = function(pValue, pType, pCountry)
+{
+    // get WsValidationType-Object if it is only the key
+    if (typeof pType == "string")
+        pType = WsValidationType.get(pType);
+    
+    if (WsValidationUtils.isWsEnabled(pType))
+    {
+
+        var userName = project.getPreferenceValue("custom." + pType.webserviceName + ".user");
+        var pw = project.getPreferenceValue("custom." + pType.webserviceName + ".pw");
+        var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url");
+        var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName");
+
+        var actionType = "GET";
+
+        if (pValue && pType)
+        {
+            // fill params
+            var parameters = {};
+            if (pCountry)
+            {
+                parameters[countryParamName] = pCountry;
+            }
+            parameters[pType.paramName] = pValue;
+
+            // call webservice
+            var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
+
+            // if error, log the error. But also process the result and let the callback generate the correct default value
+            if (WsValidationUtils._isError(ret))
+            {
+                logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
+                logging.log("Params: " + parameters.toSource());
+            }
+
+            // different handling of the result per type
+            return pType.processResultCallback(ret, pValue);
+        }
+    }
+    
+    return pType.processResultCallback(null, pValue);
+}
+
+/**
+ * set all address-fields by the value of $this.value, which should contain an object of all values as JSON
+ * @param {String} [pFieldToSetToValue=undefined] the field which should be set to data.value
+ */
+WsValidationUtils.setAddressFields = function(pFieldToSetToValue)
+{
+    logging.log(vars.getString("$this.value"))
+    try 
+    {
+        var data = JSON.parse(vars.getString("$this.value"));
+    } catch (exception) { 
+        // if no valid json, it is a direct user input and not a uuid.
+        // ignore error
+        return
+    }
+     
+    _setField("$field.ZIP", data.zip);
+    _setField("$field.COUNTRY", data.country);
+    _setField("$field.CITY", data.city);
+    //_setField("$field.DISTRICT", data.district); not needed currently
+    _setField("$field.REGION", data.region);
+    _setField("$field.STATE", data.state);
+    _setField("$field.ADDRESS", data.streat);
+    
+    if (pFieldToSetToValue)
+    {
+        _setField(pFieldToSetToValue, data.value)
+    }
+    
+    function _setField(pField, pValue)
+    {
+        if (pValue)
+            neon.setFieldValue(pField, pValue);
+    }
+}
+
+/**
+ * check if the Webservice is enabled in the project preferences
+ * @param {Object} pType
+ * 
+ * @return {boolean}
+ */
+WsValidationUtils.isWsEnabled = function(pType)
+{
+    // get WsValidationType-Object if it is only the key
+    if (typeof pType == "string")
+        pType = WsValidationType.get(pType);
+    
+    // get configurations for this type
+    try 
+    {
+        return JSON.parse(project.getPreferenceValue("custom." + pType.webserviceName + ".enable"));
+    } catch (exception) { 
+        return false;
+    }
+}
+
+/**
+ * check if the Webservice-result is valid or an error
+ * @param {Object} pWsReturn
+ * 
+ * @return {boolean}
+ */
+WsValidationUtils._isError = function(pWsReturn)
+{
+    return pWsReturn == null || !pWsReturn.hasHttpSuccessStatusCode || pWsReturn.httpStatusCode != 200;
 }
\ No newline at end of file