diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index ec35104b9fdeda2b33be40d492d5f1fcc61e1262..f439350ecfede252c4003d2ce0434c49a434fc0e 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!
-#Tue May 28 08:41:41 CEST 2019
-version=5.1.15
+#This file is generated by ADITO designer. Do NOT delete or modify!
+#Wed Jun 05 09:32:39 CEST 2019
+version=5.1.15
diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
index d536780462a9d9e5e1ba88aa83b6f508f7f602f1..30333008faaeecbd5a76da221e63bb57ffe509d0 100644
--- a/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
@@ -6,7 +6,7 @@
 
             <column name="KEYID" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
             <column name="TITLE" value="Open"/>
-            <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+            <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="1"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -16,7 +16,7 @@
 
             <column name="KEYID" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
             <column name="TITLE" value="Postponed"/>
-            <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+            <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="2"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -26,7 +26,7 @@
 
             <column name="KEYID" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
             <column name="TITLE" value="Aborted"/>
-            <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+            <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="3"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -36,7 +36,7 @@
 
             <column name="KEYID" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
             <column name="TITLE" value="Partial order"/>
-            <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+            <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="4"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -46,7 +46,7 @@
 
             <column name="KEYID" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
             <column name="TITLE" value="Order"/>
-            <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+            <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="5"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -56,7 +56,7 @@
 
             <column name="KEYID" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
             <column name="TITLE" value="Lost"/>
-            <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+            <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="6"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
diff --git a/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_YesNo.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_YesNo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6d6ecabeeacc14d3d4b104e2a65ccdf4e4a9302b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_YesNo.xml
@@ -0,0 +1,23 @@
+<?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="n.bugl" id="65c6bfc8-5de5-479e-8d64-a93cffe8ce89">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="eadf3ecb-ac35-4a94-879a-f6e85a72fa29"/>
+            <column name="KEYID" value="d657755e-50e8-409b-8b1e-2d8315c2307a"/>
+            <column name="TITLE" value="Yes"/>
+            <column name="CONTAINER" value="YesNo"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="4dcc3315-8a38-42d9-ba34-f8899b86ca85"/>
+            <column name="KEYID" value="3389c206-5916-401b-8aa5-6ebaf012a09b"/>
+            <column name="TITLE" value="No"/>
+            <column name="CONTAINER" value="YesNo"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <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/Contactmanagement_added_ImageBlobs.xml b/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
index 285d0f993be8fb154019c0127ec548e10051b320..504f318af1ce7ab7abb70e0ff28b9726cd29d1c3 100644
--- a/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
+++ b/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
@@ -4,10 +4,10 @@
     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="2f82302d-1fb0-46d2-a290-dbeca32f427f">
         <addColumn tableName="PERSON">
-            <column name="PICTURE" type="BLOB"/>
+            <column name="PICTURE" type="LONGBLOB"/>
         </addColumn>
         <addColumn tableName="ORGANISATION">
-            <column name="PICTURE" type="BLOB"/>
+            <column name="PICTURE" type="LONGBLOB"/>
         </addColumn>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
index fcbb269fbdfb34ae7b5fbdf4df342abc124457da..35a9a912338a915f9a6dc684e2154e445d267de6 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="7c558f07-2ee7-4eb3-8b8c-a433acc7c39b">
-        <renameColumn newColumnName="CATEGORY_OLD" oldColumnName="CATEGORY" tableName="ACTIVITY"/>
+        <renameColumn newColumnName="CATEGORY_OLD" oldColumnName="CATEGORY" columnDataType="INTEGER" tableName="ACTIVITY"/>
 	<addColumn tableName="ACTIVITY">
             <column name="CATEGORY" type="CHAR(36)"/>
 	</addColumn> 
@@ -24,7 +24,7 @@
         <dropColumn tableName="ACTIVITY" columnName="CATEGORY_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="CATEGORY_OLD" oldColumnName="CATEGORY" tableName="ACTIVITY"/>
+            <renameColumn newColumnName="CATEGORY_OLD" oldColumnName="CATEGORY" columnDataType="CHAR(36)" tableName="ACTIVITY"/>
             <addColumn tableName="ACTIVITY">
                 <column name="CATEGORY" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
index 64f8191fc2f44baa0e91a15cf714985ab13b797b..8b4d8e7886f04889101b906b026c473b42875045 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="6604df3f-37ad-4658-80c5-abe75fa71c14">
-        <renameColumn newColumnName="ADDR_TYPE_OLD" oldColumnName="ADDR_TYPE" tableName="ADDRESS"/>
+        <renameColumn newColumnName="ADDR_TYPE_OLD" oldColumnName="ADDR_TYPE" columnDataType="INTEGER" tableName="ADDRESS"/>
 	<addColumn tableName="ADDRESS">
             <column name="ADDR_TYPE" type="CHAR(36)"/>
 	</addColumn> 
@@ -24,7 +24,7 @@
         <dropColumn tableName="ADDRESS" columnName="ADDR_TYPE_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="ADDR_TYPE_OLD" oldColumnName="ADDR_TYPE" tableName="ADDRESS"/>
+            <renameColumn newColumnName="ADDR_TYPE_OLD" oldColumnName="ADDR_TYPE" columnDataType="CHAR(36)" tableName="ADDRESS"/>
             <addColumn tableName="ADDRESS">
                 <column name="ADDR_TYPE" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
index 41ec048e1ac61aff091825420e5dc45f7a453eba..56d6b71209b8c6cf46150dfb50202f0908860369 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="72dc4a28-da73-4c4a-bd7e-2fbedd0abe4a">
-        <renameColumn newColumnName="MEDIUM_OLD" oldColumnName="MEDIUM_ID" tableName="COMMUNICATION"/>
+        <renameColumn newColumnName="MEDIUM_OLD" oldColumnName="MEDIUM_ID" columnDataType="INTEGER" tableName="COMMUNICATION"/>
 	<addColumn tableName="COMMUNICATION">
             <column name="MEDIUM_ID" type="CHAR(36)"/>
 	</addColumn> 
@@ -24,7 +24,7 @@
         <dropColumn tableName="COMMUNICATION" columnName="MEDIUM_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="MEDIUM_OLD" oldColumnName="MEDIUM_ID" tableName="COMMUNICATION"/>
+            <renameColumn newColumnName="MEDIUM_OLD" oldColumnName="MEDIUM_ID" columnDataType="CHAR(36)" tableName="COMMUNICATION"/>
             <addColumn tableName="COMMUNICATION">
                 <column name="MEDIUM_ID" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
index adaa2322a621e1a9b39869ef01f85bea37b912e7..e6b9f3298ee8e0de24f9a3f830787f3ddf32c2cc 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="fa33c0ca-f311-45ab-b8ad-359241301584">
-        <renameColumn newColumnName="PROBABILITY_OLD" oldColumnName="PROBABILITY" tableName="OFFER"/>
+        <renameColumn newColumnName="PROBABILITY_OLD" oldColumnName="PROBABILITY" columnDataType="INTEGER" tableName="OFFER"/>
 	<addColumn tableName="OFFER">
             <column name="PROBABILITY" type="CHAR(36)"/>
 	</addColumn> 
@@ -28,7 +28,7 @@
         <dropColumn tableName="OFFER" columnName="PROBABILITY_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="PROBABILITY_OLD" oldColumnName="PROBABILITY" tableName="OFFER"/>
+            <renameColumn newColumnName="PROBABILITY_OLD" oldColumnName="PROBABILITY" columnDataType="CHAR(36)" tableName="OFFER"/>
             <addColumn tableName="OFFER">
                 <column name="PROBABILITY" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
index cc89e529520708a75f46292dfca8af2841f86e1a..22a289d2cea610e547f33c32bf3c72ff8dbc7526 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="d3255092-9908-46da-aa7f-923f58cf5d68">
-        <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" tableName="SALESPROJECT_COMPETITION"/>
+        <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" columnDataType="INTEGER" tableName="SALESPROJECT_COMPETITION"/>
 	<addColumn tableName="SALESPROJECT_COMPETITION">
             <column name="PHASE" type="CHAR(36)"/>
 	</addColumn> 
@@ -72,7 +72,7 @@
         <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="PHASE_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" tableName="SALESPROJECT_COMPETITION"/>
+            <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" columnDataType="CHAR(36)" tableName="SALESPROJECT_COMPETITION"/>
             <addColumn tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
index 34cf2c7d6d48c86d198b85bda5af28d4d7174491..63c6e4c7f6380ddef196273619356662a86da879 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="d748d3d3-762f-4b1d-bb2a-9035a7373ae6">
-        <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" tableName="SALESPROJECT"/>
+        <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" columnDataType="INTEGER" tableName="SALESPROJECT"/>
 	<addColumn tableName="SALESPROJECT">
             <column name="PHASE" type="CHAR(36)"/>
 	</addColumn> 
@@ -72,7 +72,7 @@
         <dropColumn tableName="SALESPROJECT" columnName="PHASE_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" tableName="SALESPROJECT"/>
+            <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" columnDataType="CHAR(36)" tableName="SALESPROJECT"/>
             <addColumn tableName="SALESPROJECT">
                 <column name="PHASE" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
index 8153cc75b9bb9a40c4829c44a1648b3e30aaf43e..0acac991150f458740cb87a8a1793d0a8e705204 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="99538b46-216c-4c4f-ae29-888742df56c1">
-        <renameColumn newColumnName="PRICE_POLITICS_OLD" oldColumnName="PRICE_POLITICS" tableName="ORGANISATION"/>
+        <renameColumn newColumnName="PRICE_POLITICS_OLD" oldColumnName="PRICE_POLITICS" columnDataType="INTEGER" tableName="ORGANISATION"/>
 	<addColumn tableName="ORGANISATION">
             <column name="PRICE_POLITICS" type="CHAR(36)"/>
 	</addColumn> 
@@ -20,7 +20,7 @@
         <dropColumn tableName="ORGANISATION" columnName="PRICE_POLITICS_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="PRICE_POLITICS_OLD" oldColumnName="PRICE_POLITICS" tableName="ORGANISATION"/>
+            <renameColumn newColumnName="PRICE_POLITICS_OLD" oldColumnName="PRICE_POLITICS" columnDataType="CHAR(36)" tableName="ORGANISATION"/>
             <addColumn tableName="ORGANISATION">
                 <column name="PRICE_POLITICS" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
index 579f8bdd2cc8014a5925b76aa546cf95fcce9bff..773dc4868aec13a097420a2435f82dbe96020bfb 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="8de6cb0d-0dc3-4440-9ad9-a3c084b0d470">
-        <renameColumn newColumnName="STATE_OLD" oldColumnName="STATE" tableName="SALESPROJECT"/>
+        <renameColumn newColumnName="STATE_OLD" oldColumnName="STATE" columnDataType="INTEGER" tableName="SALESPROJECT"/>
 	<addColumn tableName="SALESPROJECT">
             <column name="STATE" type="CHAR(36)"/>
 	</addColumn> 
@@ -32,7 +32,7 @@
         <dropColumn tableName="SALESPROJECT" columnName="STATE_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="STATE_OLD" oldColumnName="STATE" tableName="SALESPROJECT"/>
+            <renameColumn newColumnName="STATE_OLD" oldColumnName="STATE" columnDataType="CHAR(36)" tableName="SALESPROJECT"/>
             <addColumn tableName="SALESPROJECT">
                 <column name="STATE" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
index ae35aed7f007d357961742c22b4581c50277fe49..a5c255d5cb7b4fb3d2dde94a15d8d9c049e19669 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="ed05d1c9-045e-43c8-bbca-5dacee2855ba">
-        <renameColumn newColumnName="STRENGTH_OLD" oldColumnName="STRENGTH" tableName="ORGANISATION"/>
+        <renameColumn newColumnName="STRENGTH_OLD" oldColumnName="STRENGTH" columnDataType="INTEGER" tableName="ORGANISATION"/>
 	<addColumn tableName="ORGANISATION">
             <column name="STRENGTH" type="CHAR(36)"/>
 	</addColumn> 
@@ -20,7 +20,7 @@
         <dropColumn tableName="ORGANISATION" columnName="STRENGTH_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="STRENGTH_OLD" oldColumnName="STRENGTH" tableName="ORGANISATION"/>
+            <renameColumn newColumnName="STRENGTH_OLD" oldColumnName="STRENGTH" columnDataType="CHAR(36)" tableName="ORGANISATION"/>
             <addColumn tableName="ORGANISATION">
                 <column name="STRENGTH" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
index 1e3ff5dfb738ccdc6845350f0f43790de57c2486..267fcca0be64ecfe6257f23cec8f9cbb8926bd7d 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="0b194aa7-44da-46d8-98f3-a4ab87b9fd0e">
-        <renameColumn newColumnName="WEAKNESS_OLD" oldColumnName="WEAKNESS" tableName="ORGANISATION"/>
+        <renameColumn newColumnName="WEAKNESS_OLD" oldColumnName="WEAKNESS" columnDataType="INTEGER" tableName="ORGANISATION"/>
 	<addColumn tableName="ORGANISATION">
             <column name="WEAKNESS" type="CHAR(36)"/>
 	</addColumn> 
@@ -20,7 +20,7 @@
         <dropColumn tableName="ORGANISATION" columnName="WEAKNESS_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="WEAKNESS_OLD" oldColumnName="WEAKNESS" tableName="ORGANISATION"/>
+            <renameColumn newColumnName="WEAKNESS_OLD" oldColumnName="WEAKNESS" columnDataType="CHAR(36)" tableName="ORGANISATION"/>
             <addColumn tableName="ORGANISATION">
                 <column name="WEAKNESS" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
index 829092c2bf9d1cdf06ad148777ae0139a308c275..d4aa8de109c8ceaba72b9e87dacf19098876bf50 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="2991ebff-fbc5-4862-ac79-4b8217e71e68">
-        <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" tableName="SALESPROJECT_COMPETITION"/>
+        <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" columnDataType="INTEGER" tableName="SALESPROJECT_COMPETITION"/>
 	<addColumn tableName="SALESPROJECT_COMPETITION">
             <column name="STATUS" type="CHAR(36)"/>
 	</addColumn> 
@@ -32,7 +32,7 @@
         <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
  
         <rollback>
-            <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" tableName="SALESPROJECT_COMPETITION"/>
+            <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" columnDataType="CHAR(36)" tableName="SALESPROJECT_COMPETITION"/>
             <addColumn tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
index 44a9d53f2cc6896e99cb4c9421178e935c51a289..cf600a9052afad01691051b9535c4735826070e9 100644
--- a/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
@@ -1,7 +1,7 @@
 <?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="a.voegl" id="d748d3d3-762f-4b1d-bb2a-9035a7373ae6">
-        <renameColumn newColumnName="PRIORITY_OLD" oldColumnName="PRIORITY" tableName="TASK"/>
+        <renameColumn newColumnName="PRIORITY_OLD" oldColumnName="PRIORITY" columnDataType="INTEGER" tableName="TASK"/>
 	<addColumn tableName="TASK">
             <column name="PRIORITY" type="CHAR(36)"/>
 	</addColumn> 
@@ -23,7 +23,7 @@
         </update>
         <dropColumn tableName="TASK" columnName="PRIORITY_OLD"/>
         <rollback>
-            <renameColumn newColumnName="PRIORITY_OLD" oldColumnName="PRIORITY" tableName="TASK"/>
+            <renameColumn newColumnName="PRIORITY_OLD" oldColumnName="PRIORITY" columnDataType="CHAR(36)" tableName="TASK"/>
             <addColumn tableName="TASK">
                 <column name="PRIORITY" type="INTEGER"/>
             </addColumn>   
diff --git a/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f7b5ccda42857ba76f8a421a9a56d3aff83d5f7b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
@@ -0,0 +1,168 @@
+<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="e06fe9ba-7cad-4d83-a366-06882ebc7fff">
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="                                    "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_NAME" value="Ticket"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_NAME" value="Bug Ticket"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="5a580b0d-4c63-4d2f-ae5b-87f5e2d84abd"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_NAME" value="Version betroffen"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_NAME" value="Kategorie"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="2"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="72bcad07-6f26-48c0-84b0-1e6ab46d88a9"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_NAME" value="Allgemein"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="02e77970-3ea4-4fff-9ffa-099746b5f3c8"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_NAME" value="Server"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="2"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="abc52bbb-047c-405c-9d58-c2e8ac8eb585"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_NAME" value="Client"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="3"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="01d761e0-802a-46d0-827f-b6ca5d9a2148"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_NAME" value="Support Ticket"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="2"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="3fda569e-2ed3-44b8-b82e-a42c4f7ea464"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="01d761e0-802a-46d0-827f-b6ca5d9a2148"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_NAME" value="Status"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="edf6f743-2b01-4961-9738-e61c472c96ec"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="3fda569e-2ed3-44b8-b82e-a42c4f7ea464"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_NAME" value="erfasst"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="fa771c64-464c-46d7-9350-16ef03b2e227"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="3fda569e-2ed3-44b8-b82e-a42c4f7ea464"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_NAME" value="in Bearbeitung"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="2"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="44f986ab-07c7-4413-b3f1-662995ecc254"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="3fda569e-2ed3-44b8-b82e-a42c4f7ea464"/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_NAME" value="abgeschlossen"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="KEYWORD_CONTAINER"/>
+      <column name="ATTRIBUTE_INFO"/>
+      <column name="SORTING" valueNumeric="3"/>
+    </insert>
+    
+    
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="a1154583-ccc0-45f0-8a39-4fbfa29c6a41"/>
+      <column name="AB_ATTRIBUTE_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
+      <column name="OBJECT_TYPE" value="Task"/>
+      <column name="MIN_COUNT"/>
+      <column name="MAX_COUNT"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="382b1619-7939-4b7d-9571-3f340cb62c56"/>
+      <column name="AB_ATTRIBUTE_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+      <column name="OBJECT_TYPE" value="Task"/>
+      <column name="MIN_COUNT"/>
+      <column name="MAX_COUNT"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="b88b468b-94f5-4157-880b-534e9f913409"/>
+      <column name="AB_ATTRIBUTE_ID" value="5a580b0d-4c63-4d2f-ae5b-87f5e2d84abd"/>
+      <column name="OBJECT_TYPE" value="Task"/>
+      <column name="MIN_COUNT"/>
+      <column name="MAX_COUNT"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="a4d3f9e3-8b03-4667-bf71-7b91bb6dce83"/>
+      <column name="AB_ATTRIBUTE_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="OBJECT_TYPE" value="Task"/>
+      <column name="MIN_COUNT"/>
+      <column name="MAX_COUNT"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="3207c64b-dd89-49fb-b582-79ce4bedc37e"/>
+      <column name="AB_ATTRIBUTE_ID" value="01d761e0-802a-46d0-827f-b6ca5d9a2148"/>
+      <column name="OBJECT_TYPE" value="Task"/>
+      <column name="MIN_COUNT"/>
+      <column name="MAX_COUNT"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="96e5575b-8a4d-49f4-b168-1dbe1665d2d9"/>
+      <column name="AB_ATTRIBUTE_ID" value="3fda569e-2ed3-44b8-b82e-a42c4f7ea464"/>
+      <column name="OBJECT_TYPE" value="Task"/>
+      <column name="MIN_COUNT"/>
+      <column name="MAX_COUNT"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TaskType_Task.xml
new file mode 100644
index 0000000000000000000000000000000000000000..86cbe99543c78f872f95443701c60071039e6a7b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TaskType_Task.xml
@@ -0,0 +1,98 @@
+<?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="d1440b93-e01c-406b-9f0d-c55cac877fcd">       
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
+            <column name="NAME" value="group"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
+            <column name="NAME" value="attributes"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
+            <column name="NAME" value="status"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="9ac96671-b519-488b-bbad-6dea3e5baafd"/>
+            <column name="NAME" value="showCode"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="TYPE" value="BOOL_VALUE"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1eef7882-90eb-4c5b-a01a-c6cf1ea7a82b"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
+            <column name="CHAR_VALUE" value="Task"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cd293e92-224f-4bc3-9552-b3f7caa95c99"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="9ac96671-b519-488b-bbad-6dea3e5baafd"/>
+            <column name="BOOL_VALUE" valueNumeric="0"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
+            <column name="KEYID" value="f3da0edd-49d9-4061-98c1-8fda8631be7e"/>
+            <column name="TITLE" value="Bug Ticket"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ca8e16d4-0bae-45e7-a288-0f8a846193f1"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
+            <column name="CHAR_VALUE" value="Ticket"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="fa35bb8d-1aa6-47fd-a674-0fdb7c838ddd"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
+            <column name="CHAR_VALUE" value="[&quot;ff8b1caf-cf30-4edb-b5ca-a9a219ba8399&quot;]"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1e35235b-fc50-4098-bf10-2b05b4c37373"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
+            <column name="CHAR_VALUE" value="TicketStatus"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
+            <column name="KEYID" value="7bf77721-470f-4cdf-a6af-452bf05a405b"/>
+            <column name="TITLE" value="Support ticket"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="6e54c8f3-f24b-411f-a3e3-eba878fdaa1b"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
+            <column name="CHAR_VALUE" value="Ticket"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7f1bed92-7158-4c89-b811-85dea257fa6a"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
+            <column name="CHAR_VALUE" value="[&quot;01d761e0-802a-46d0-827f-b6ca5d9a2148&quot;]"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="713685f5-18d6-4c8a-ad4c-1d193ca0b592"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
+            <column name="CHAR_VALUE" value="TicketStatus"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TicketStatus_Task.xml b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TicketStatus_Task.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a5f7e51ee9f2e0a796bad89d34d47305c98dd6b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TicketStatus_Task.xml
@@ -0,0 +1,107 @@
+<?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="d1440b93-e01c-406b-9f0d-c55cac877fcd">
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="NAME" value="icon"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9cd52d5f-7438-45f9-96d9-47d093dc3245"/>
+            <column name="KEYID" value="ea5a0f80-4ba2-442f-892d-4992d664705b"/>
+            <column name="TITLE" value="new"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1a93bc02-6cec-4f56-9b63-fac2f5ff4dc5"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9cd52d5f-7438-45f9-96d9-47d093dc3245"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="75175699-62bd-43bf-81a1-0e0ace930e39"/>
+            <column name="KEYID" value="6f5fb83d-9a2a-420a-a73c-22bd7d31d3d5"/>
+            <column name="TITLE" value="in process"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="c67cdf5a-18e6-45ff-a077-5a8b0a174c00"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="75175699-62bd-43bf-81a1-0e0ace930e39"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_IN_PROGRESS"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="d9c2402b-62d2-4d3e-9d48-c102c45935bd"/>
+            <column name="KEYID" value="34327ed4-75ed-4040-adc2-2919afe99209"/>
+            <column name="TITLE" value="testing"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b429d563-2e04-4df8-a800-e3abf0c2bb66"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="d9c2402b-62d2-4d3e-9d48-c102c45935bd"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="b0549a0d-d0e2-46be-9e57-741d6ddfc2ae"/>
+            <column name="KEYID" value="b0549a0d-d0e2-46be-9e57-741d6ddfc2ae"/>
+            <column name="TITLE" value="waiting"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="SORTING" valueNumeric="3"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="e07e624c-1556-4908-a80f-7656fc5f2009"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="b0549a0d-d0e2-46be-9e57-741d6ddfc2ae"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="5d938aa3-cf32-4cd0-97a5-2b685ff7dc1b"/>
+            <column name="KEYID" value="84b84207-25ae-4988-ba0a-f998f64afb37"/>
+            <column name="TITLE" value="double"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="SORTING" valueNumeric="4"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3b295993-8bbb-442f-8405-99adbad3ad7d"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="5d938aa3-cf32-4cd0-97a5-2b685ff7dc1b"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="73a6493d-37a4-47ce-8d38-53a5e72e76c1"/>
+            <column name="KEYID" value="18ca0cb6-54d2-4696-8f24-b67c8aa56a77"/>
+            <column name="TITLE" value="closed"/>
+            <column name="CONTAINER" value="TicketStatus"/>
+            <column name="SORTING" valueNumeric="5"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="22bac516-3dd6-47f1-a95b-26712031630b"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="73a6493d-37a4-47ce-8d38-53a5e72e76c1"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7186d414-710b-4171-902f-f96f728fe38f"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/update_TaskStatus_add_icon.xml b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/update_TaskStatus_add_icon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..567a96007e7a5cf0a0cf9e450e6968d0f25cbb28
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Ticketmanagement/update_TaskStatus_add_icon.xml
@@ -0,0 +1,36 @@
+<?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="d1440b93-e01c-406b-9f0d-c55cac877fcd">
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
+            <column name="NAME" value="icon"/>
+            <column name="CONTAINER" value="TaskStatus"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3a2e147c-614e-49ae-8b7e-16a8a16d0c05"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f0ec52a0-81f1-43b7-bb5b-d9e925d525aa"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_IN_PROGRESS"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9b9eac4b-886b-46b1-a099-2ead6cfbc99d"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7f4d36bd-4ab2-4ccc-bdf5-ae05d817c255"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
+            <column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml b/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
index 9892f159854d05b95c6dadcc766220e9746d2b61..c18630e4ce7465402c5b02199b998fcac4a3b6ec 100644
--- a/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
+++ b/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
@@ -1,9 +1,9 @@
 <?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="5e48c1ac-ceb1-4b93-90b1-900a3c68351d">
-    <renameColumn tableName="ACTIVITY" oldColumnName="CREATOR" newColumnName="RESPONSIBLE"/>
+    <renameColumn tableName="ACTIVITY" oldColumnName="CREATOR" columnDataType="CHAR(36)" newColumnName="RESPONSIBLE"/>
     <rollback>
-        <renameColumn tableName="ACTIVITY" oldColumnName="RESPONSIBLE" newColumnName="CREATOR"/>
+        <renameColumn tableName="ACTIVITY" oldColumnName="RESPONSIBLE" columnDataType="CHAR(36)" newColumnName="CREATOR"/>
     </rollback>
   </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 0fba6576ae45de4196b7909a186dded858657866..10a9b2c92186abc167ae643988ffecd3cc0e90c2 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -1,176 +1,188 @@
-<?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"/>
-    
-    <include relativeToChangelogFile="true" file="AditoBasic/insert_permission_keyword.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="AditoBasic/init_YesNo.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="update_Salesproject_Forecast.xml"/>
+    <include relativeToChangelogFile="true" file="update_Offer.xml"/>
+    <include relativeToChangelogFile="true" file="update_Salesproject_Competition.xml"/>
+    <include relativeToChangelogFile="true" file="update_Salesproject_Member.xml"/>
+    <include relativeToChangelogFile="true" file="update_Memberrole_InternExtern.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"/>
+    
+    <include relativeToChangelogFile="true" file="AditoBasic/insert_permission_keyword.xml"/>
+    
+    <include relativeToChangelogFile="true" file="Ticketmanagement/insertTicketAttributes_TaskType_Task.xml"/>
+    <include relativeToChangelogFile="true" file="Ticketmanagement/insert_TaskType_Task.xml"/>
+    <include relativeToChangelogFile="true" file="Ticketmanagement/insert_TicketStatus_Task.xml"/>
+    <include relativeToChangelogFile="true" file="Ticketmanagement/update_TaskStatus_add_icon.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index b9658b3b597c8f92e82bb7fccf06d7681c6aac22..7d0bb354a6dcec9a529f415e6b9911be1e3a88c2 100644
--- a/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -1,2254 +1,2254 @@
-<?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="f1b149fb-bd9d-44b7-a334-8f6d77261b95">
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Vertrieb"/>
-    <column name="ATTRIBUTE_PARENT_ID" value=""/>
-    <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Präsentation"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Fachanforderung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Vorteile"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="flexibel"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Referenz"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Technologie"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Defizite"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Technologie"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Referenz"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Nächste Schritte"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="ToDos"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Nachfassen (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Sonstiges (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Pers. Einschätzung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="6"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Wertung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="30"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="60"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="90"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Begründung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Teilnehmer"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="7"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="eigene Firma"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Interessent"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Kunde"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Berater"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Partner"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Akquise"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Projekt geplant?"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Kein Projekt geplant"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Planung Projekt offen"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Nächster Kontakt?"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Erstkontakt"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Produktinteresse"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Warengruppe A"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Produkt A1"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Produkt A2"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Warengruppe B"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Produkt B1"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Produkt B2"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Allgemein"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="ToDo"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Informationen senden"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Warengruppe A (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Warengruppe B (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Nachfassen (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Herkunft"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="persönlich"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Referenz-Kunde"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Website"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Messe"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Anruf"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Vertrag"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Dienstleistungsvertrag"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Wartungsvertrag"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Rahmenvertrag (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Verwahrungsvereinbarung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Datenschutzvereinbarung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Abnahmeerklärung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="6"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Bekannt durch"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="6"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Bestehender Kontakt"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Empfehlung"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Printmedien"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Messe"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="ToDo"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="7"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Rückruf (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Unterlagen senden (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Angebot erstellen (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-    <column name="AB_ATTRIBUTEID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
-    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-    <column name="ATTRIBUTE_NAME" value="Broschüre zukommen lassen (WV)"/>
-    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-    <column name="ATTRIBUTE_TYPE" value="VOID"/>
-    <column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Abteilungen"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Geschäftsleitung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Vertrieb"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Außendienst"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="5999ee67-44a4-4ec6-a4c4-6c6d58b8e50a"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Innendienst"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Marketing"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="IT/Service"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="c133a157-0109-4d88-8343-71db25b12fc5"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Produktion"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
-	<column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Mitbewerber"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Preispolitik"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
-	<column name="KEYWORD_CONTAINER" value="SalesprojectPricePolitics"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="558419b2-6113-4060-b88d-cc6324754765"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Stärke"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
-	<column name="KEYWORD_CONTAINER" value="SalesprojectStrength"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Schwäche"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
-	<column name="KEYWORD_CONTAINER" value="SalesprojectWeakness"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Interessen"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Kulanz"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Schadensart"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Regulierung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Technische Merkmale"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="B"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="0 gering"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="gut"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Stimmung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="6"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Risiko"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Rennrad"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="A"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="NPO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_INFO" value="Als Attribut ist der Name aus lib_frame z.B. 'ORG' 'PERS' 'OFFER' etc. zu verwenden."/>
-	<column name="ATTRIBUTE_NAME" value="Doku Vorlagen Verwendung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="2b6e3225-9447-4706-9313-62c9463d6671"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Handwerk"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Dumpingpreis Wettbewerb"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="6d15f683-389e-4915-9043-c4cfdf188095"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Vollberechnung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_INFO" value="Konditionen die bei Angebotserstellung übernommen werden"/>
-	<column name="ATTRIBUTE_NAME" value="Konditionen"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Sonstiges"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Produkttyp"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="6"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="mittel"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="D"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="1 mittel"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="liebt Geselligkeit"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Projektverschiebung Kunde"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Qualitätsproblem Kunde"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Wein"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Wechsel Entscheidungsträger"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Finanzdienstleistung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Sport"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Gerät/Maschine"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Jahresurlaub"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Fernreisen"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Teilberechnung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="PERS"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Beurteilung"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Branche"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Dienstleistung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Kunde"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Interessent"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Hersteller"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Wettbewerber"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Betreuung"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Kontaktierung"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Signatur"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Bier"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Genuss"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Motorrad"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Drehzahl (rpm)"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="ORG"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="2318607b-556a-4537-92f0-9870ee9a9201"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Zigarren"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Verschleißteil"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Maschinenbau"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Loyalität"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Tabellen Daten"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Liefersperre"/>
-	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Partner"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Geburtstagsliste"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="10"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Nein"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Ja"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Projektart"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Intern"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="615d3850-ef32-4988-9a8d-7b702b489194"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Partner"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Bestandskunde"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Interessent"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Fussball"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Förderband"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="weitere Daten"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="kein Risiko"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="schlecht"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Ersatzteil"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="23a4d394-9fae-4205-a811-730d5109c115"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Segeln"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Werkzeugwechsler"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Logistik"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="7"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="IT"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Zahlungsproblem Kunde"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Behörde"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="6"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Tourismus"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Handel"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="4"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="79378933-9f74-4391-b876-4528b582661f"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Bauwesen"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="5"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="2 gross"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Gewicht (kg)"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Bonität"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Beruf"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Personal"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="C"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="zusätzliche Daten"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Wirtschaft"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Golf"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Bauteil"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Mitarbeiterkonto"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="unvollständige Lieferung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Qualitätsbeanstandung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="1"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="fehlerhafte Lieferung"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="2"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="66b64741-a896-4404-874a-b83b3525fcff"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Transportschaden"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="EVENT"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
-	<column name="SORTING" valueNumeric="3"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Zahlungskondition"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
-	<column name="KEYWORD_CONTAINER" value="PaymentTerm"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Lieferkondition"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
-	<column name="KEYWORD_CONTAINER" value="DeliveryTerm"/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Preisliste"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
-        <column name="KEYWORD_CONTAINER" value="ProductPricelist"/>
-</insert>
-
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Lieferant"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Rückantwort Kampagne"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="schreibt für"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Unterkampagne von"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="093c7337-c134-4be5-a215-dc94804c3511"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="übergeordnete Kampagne von"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Feiertag"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Innendienst"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Aussendienst"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Service"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
-	<column name="ATTRIBUTE_NAME" value="Besuchsfrequenz"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Vorgesetzter von"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="berichtet an"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Gebiet"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Urlaubsgenehmigung durch"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<insert tableName="AB_ATTRIBUTE">
-	<column name="AB_ATTRIBUTEID" value="3f119858-9d69-4903-a572-d286be151f73"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_NAME" value="Urlaubsprüfung durch"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
-</insert>
-<rollback>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="558419b2-6113-4060-b88d-cc6324754765"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="2b6e3225-9447-4706-9313-62c9463d6671"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="6d15f683-389e-4915-9043-c4cfdf188095"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="ab545654-1fce-4993-b763-0ec469781302"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="2318607b-556a-4537-92f0-9870ee9a9201"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="915d566f-acbe-448c-a7b6-11898adc3880"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="615d3850-ef32-4988-9a8d-7b702b489194"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="23a4d394-9fae-4205-a811-730d5109c115"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="79378933-9f74-4391-b876-4528b582661f"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="66b64741-a896-4404-874a-b83b3525fcff"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e7886e41-252e-414c-a169-5d1481d010c8"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="093c7337-c134-4be5-a215-dc94804c3511"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID = ?</where>
-	<whereParams>
-		<param value="3f119858-9d69-4903-a572-d286be151f73"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTE">
-	<where>AB_ATTRIBUTEID in (?, ?, ?, ?, ?, ?, ?, ?)</where>
-	<whereParams>
-		<param value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-		<param value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
-		<param value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
-		<param value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
-		<param value="5999ee67-44a4-4ec6-a4c4-6c6d58b8e50a"/>
-		<param value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
-		<param value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
-		<param value="c133a157-0109-4d88-8343-71db25b12fc5"/>
-	</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="f1b149fb-bd9d-44b7-a334-8f6d77261b95">
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Vertrieb"/>
+    <column name="ATTRIBUTE_PARENT_ID" value=""/>
+    <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Präsentation"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Fachanforderung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Vorteile"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="flexibel"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Referenz"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Technologie"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Defizite"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Technologie"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Referenz"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Nächste Schritte"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="ToDos"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Nachfassen (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Sonstiges (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Pers. Einschätzung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Wertung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="30"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="60"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="90"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Begründung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Teilnehmer"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="eigene Firma"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Interessent"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Kunde"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Berater"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Partner"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Akquise"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Projekt geplant?"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Kein Projekt geplant"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Planung Projekt offen"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Nächster Kontakt?"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Erstkontakt"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Produktinteresse"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Warengruppe A"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Produkt A1"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Produkt A2"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Warengruppe B"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Produkt B1"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Produkt B2"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Allgemein"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="ToDo"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Informationen senden"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Warengruppe A (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Warengruppe B (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Nachfassen (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Herkunft"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="persönlich"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Referenz-Kunde"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Website"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Messe"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Anruf"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Vertrag"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Dienstleistungsvertrag"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Wartungsvertrag"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Rahmenvertrag (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Verwahrungsvereinbarung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Datenschutzvereinbarung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Abnahmeerklärung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Bekannt durch"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Bestehender Kontakt"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Empfehlung"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Printmedien"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Messe"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="ToDo"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Rückruf (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Unterlagen senden (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Angebot erstellen (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+    <column name="AB_ATTRIBUTEID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
+    <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+    <column name="ATTRIBUTE_NAME" value="Broschüre zukommen lassen (WV)"/>
+    <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
+    <column name="ATTRIBUTE_TYPE" value="VOID"/>
+    <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Abteilungen"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Geschäftsleitung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Vertrieb"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Außendienst"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="5999ee67-44a4-4ec6-a4c4-6c6d58b8e50a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Innendienst"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Marketing"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="IT/Service"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="c133a157-0109-4d88-8343-71db25b12fc5"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Produktion"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+	<column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+	<column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Mitbewerber"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Preispolitik"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+	<column name="KEYWORD_CONTAINER" value="SalesprojectPricePolitics"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Stärke"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+	<column name="KEYWORD_CONTAINER" value="SalesprojectStrength"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Schwäche"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+	<column name="KEYWORD_CONTAINER" value="SalesprojectWeakness"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Interessen"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Kulanz"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Schadensart"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Regulierung"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Technische Merkmale"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="B"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="gering"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="gut"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Stimmung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Risiko"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Rennrad"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="A"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="NPO"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_INFO" value="Als Attribut ist der Name aus lib_frame z.B. 'ORG' 'PERS' 'OFFER' etc. zu verwenden."/>
+	<column name="ATTRIBUTE_NAME" value="Doku Vorlagen Verwendung"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="2b6e3225-9447-4706-9313-62c9463d6671"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Handwerk"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Dumpingpreis Wettbewerb"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="6d15f683-389e-4915-9043-c4cfdf188095"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Vollberechnung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_INFO" value="Konditionen die bei Angebotserstellung übernommen werden"/>
+	<column name="ATTRIBUTE_NAME" value="Konditionen"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Sonstiges"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Produkttyp"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="mittel"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="D"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="mittel"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="liebt Geselligkeit"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Projektverschiebung Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Qualitätsproblem Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Wein"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Wechsel Entscheidungsträger"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Finanzdienstleistung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Sport"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Gerät/Maschine"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Jahresurlaub"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Fernreisen"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Teilberechnung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="PERS"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Beurteilung"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Branche"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Dienstleistung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Interessent"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Hersteller"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Wettbewerber"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Betreuung"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Kontaktierung"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Signatur"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bier"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Genuss"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Motorrad"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Drehzahl (rpm)"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="ORG"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="2318607b-556a-4537-92f0-9870ee9a9201"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Zigarren"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Verschleißteil"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Maschinenbau"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Loyalität"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Tabellen Daten"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Liefersperre"/>
+	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Partner"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Geburtstagsliste"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="10"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Nein"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Ja"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Projektart"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Intern"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="615d3850-ef32-4988-9a8d-7b702b489194"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Partner"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bestandskunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Interessent"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Fussball"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Förderband"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="weitere Daten"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="kein Risiko"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="schlecht"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Ersatzteil"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="23a4d394-9fae-4205-a811-730d5109c115"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Segeln"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Werkzeugwechsler"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Logistik"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="IT"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Zahlungsproblem Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Behörde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Tourismus"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Handel"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="79378933-9f74-4391-b876-4528b582661f"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bauwesen"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="gross"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Gewicht (kg)"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bonität"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Beruf"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Personal"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="C"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="zusätzliche Daten"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Wirtschaft"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Golf"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bauteil"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Mitarbeiterkonto"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="unvollständige Lieferung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Qualitätsbeanstandung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="fehlerhafte Lieferung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="66b64741-a896-4404-874a-b83b3525fcff"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Transportschaden"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="EVENT"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+	<column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Zahlungskondition"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+	<column name="KEYWORD_CONTAINER" value="PaymentTerm"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Lieferkondition"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+	<column name="KEYWORD_CONTAINER" value="DeliveryTerm"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Preisliste"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+        <column name="KEYWORD_CONTAINER" value="ProductPricelist"/>
+</insert>
+
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Lieferant"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Rückantwort Kampagne"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="schreibt für"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Unterkampagne von"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="093c7337-c134-4be5-a215-dc94804c3511"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="übergeordnete Kampagne von"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Feiertag"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Innendienst"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Aussendienst"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Service"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Besuchsfrequenz"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Vorgesetzter von"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="berichtet an"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Gebiet"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Urlaubsgenehmigung durch"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3f119858-9d69-4903-a572-d286be151f73"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Urlaubsprüfung durch"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<rollback>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="558419b2-6113-4060-b88d-cc6324754765"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="2b6e3225-9447-4706-9313-62c9463d6671"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="6d15f683-389e-4915-9043-c4cfdf188095"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="ab545654-1fce-4993-b763-0ec469781302"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="2318607b-556a-4537-92f0-9870ee9a9201"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="915d566f-acbe-448c-a7b6-11898adc3880"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="615d3850-ef32-4988-9a8d-7b702b489194"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="23a4d394-9fae-4205-a811-730d5109c115"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="79378933-9f74-4391-b876-4528b582661f"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="66b64741-a896-4404-874a-b83b3525fcff"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e7886e41-252e-414c-a169-5d1481d010c8"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="093c7337-c134-4be5-a215-dc94804c3511"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3f119858-9d69-4903-a572-d286be151f73"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID in (?, ?, ?, ?, ?, ?, ?, ?)</where>
+	<whereParams>
+		<param value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+		<param value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
+		<param value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
+		<param value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
+		<param value="5999ee67-44a4-4ec6-a4c4-6c6d58b8e50a"/>
+		<param value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
+		<param value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
+		<param value="c133a157-0109-4d88-8343-71db25b12fc5"/>
+	</whereParams>
+</delete>
+</rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml b/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40aafe37e6091f0446fa6b16f6e77185f123fc2e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/update_Memberrole_InternExtern.xml
@@ -0,0 +1,42 @@
+<?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="n.bugl" id="edd0e09f-830e-4cd8-acf6-ee0oord82d7a">  
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
+            <column name="NAME" value="Intern"/>
+            <column name="CONTAINER" value="MemberRole"/>
+            <column name="TYPE" value="BOOL_VALUE"/>
+        </insert>
+        
+<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="c3cb11b1-6b0a-47c2-bb86-e72be9b4c229"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="215b0167-1e5f-43d5-a1a5-2af2f9cf04d5"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="965d3371-1632-4f2b-9fb6-d8503558fb88"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9a7e069c-7ac7-4874-8c0a-5e97f9b7c6f6"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
+            <column name="BOOL_VALUE" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="6d50e721-2f38-43d8-a323-7a685e54614b"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Offer.xml b/.liquibase/Data_alias/basic/2019.2/update_Offer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c513f47119f73710d6468ee3eb64709c37f4101f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/update_Offer.xml
@@ -0,0 +1,20 @@
+<?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="n.bugl" id="edd0e09f-830e-4cd3-acf6-ee0c2cd82d7a">  
+        
+        <addColumn tableName="OFFER">
+            <column name="OBJECT_TYPE" type="NVARCHAR(63)">
+            </column>
+        </addColumn>
+        <renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="OFFER"/>
+        <update tableName="OFFER">
+            <column name="OBJECT_TYPE" value="Salesproject" />
+            <where>OBJECT_ROWID = '0833465c-8851-4fbb-b7e3-8c1d73c903da' </where>
+        </update>
+        
+        <addNotNullConstraint
+            tableName="OFFER"
+            columnName="OBJECT_TYPE"/>
+        
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Competition.xml b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Competition.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0d00e648e99d7af6befbfae4c7705d3829e1700
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Competition.xml
@@ -0,0 +1,23 @@
+<?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="n.bugl" id="edd0e09f-830e-4cd3-acf6-ee0c2cd82d7a">  
+        
+        <addColumn tableName="SALESPROJECT_COMPETITION">
+            <column name="OBJECT_TYPE" type="NVARCHAR(63)">
+            </column>
+        </addColumn>
+        <renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESPROJECT_COMPETITION"/>
+        <renameColumn newColumnName="COMPETITIONID" oldColumnName="SALESPROJECT_COMPETITIONID" tableName="SALESPROJECT_COMPETITION"/>
+        <update tableName="SALESPROJECT_COMPETITION">
+            <column name="OBJECT_TYPE" value="Salesproject" />
+            <where>OBJECT_ROWID = '0833465c-8851-4fbb-b7e3-8c1d73c903da' </where>
+        </update>
+        
+        <addNotNullConstraint
+            tableName="SALESPROJECT_COMPETITION"
+            columnName="OBJECT_TYPE"/>
+        
+        <renameTable oldTableName="SALESPROJECT_COMPETITION" newTableName="COMPETITION"/>
+        
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Forecast.xml b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Forecast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e7ee03202f47ad2bbe8949b0e20eb5d1dd12702
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Forecast.xml
@@ -0,0 +1,23 @@
+<?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="n.bugl" id="edd0e09f-830e-4cd3-acf6-ee0c2cd82d7a">  
+        
+        <addColumn tableName="SALESPROJECT_FORECAST">
+            <column name="OBJECT_TYPE" type="NVARCHAR(63)">
+            </column>
+        </addColumn>
+        <renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESPROJECT_FORECAST"/>
+        <renameColumn newColumnName="FORECASTID" oldColumnName="SALESPROJECT_FORECASTID" tableName="SALESPROJECT_FORECAST"/>
+        <update tableName="SALESPROJECT_FORECAST">
+            <column name="OBJECT_TYPE" value="Salesproject" />
+            <where>OBJECT_ROWID = '0833465c-8851-4fbb-b7e3-8c1d73c903da' </where>
+        </update>
+        
+        <addNotNullConstraint
+            tableName="SALESPROJECT_FORECAST"
+            columnName="OBJECT_TYPE"/>
+        
+        <renameTable oldTableName="SALESPROJECT_FORECAST" newTableName="FORECAST"/>
+        
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e6a9d523a13fd4b1bd6c7d051d855a55afc3af2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/update_Salesproject_Member.xml
@@ -0,0 +1,24 @@
+<?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="n.bugl" id="edd0e09f-830e-4cd3-acf6-ee0c2cd82d7a">  
+        
+        <addColumn tableName="SALESPROJECT_MEMBER">
+            <column name="OBJECT_TYPE" type="NVARCHAR(63)"/>
+            <column name="DECIDER" type="BOOLEAN"/>
+        </addColumn>
+        <renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESPROJECT_MEMBER"/>
+        <renameColumn newColumnName="MEMBERID" oldColumnName="SALESPROJECT_MEMBERID" tableName="SALESPROJECT_MEMBER"/>
+        <renameColumn newColumnName="ROLE" oldColumnName="SALESPROJECT_ROLE" tableName="SALESPROJECT_MEMBER"/>
+        <update tableName="SALESPROJECT_MEMBER">
+            <column name="OBJECT_TYPE" value="Salesproject" />
+            <where>OBJECT_ROWID = '0833465c-8851-4fbb-b7e3-8c1d73c903da'</where>
+        </update>
+        
+        <addNotNullConstraint
+            tableName="SALESPROJECT_MEMBER"
+            columnName="OBJECT_TYPE"/>
+        
+        <renameTable oldTableName="SALESPROJECT_MEMBER" newTableName="MEMBER"/>
+        
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
index 6e9186ce3f0d10263f64b464ab7aeb3a3e2a6755..ed33a9a787fbd2360d9d172df1640a1f6fdb69a6 100644
--- a/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
+++ b/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
@@ -1,85 +1,24 @@
 <?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="a.loreth" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
-        <insert tableName="AB_KEYWORD_ENTRY">
-            <column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
-            <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
-            <column name="TITLE" value="Task"/>
-            <column name="CONTAINER" value="TaskType"/>
-            <column name="SORTING" valueNumeric="0"/>
-            <column name="ISACTIVE" valueNumeric="1"/>
-            <column name="ISESSENTIAL" valueNumeric="0"/>
-        </insert>
-
+    <changeSet author="j.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
         <delete tableName="AB_KEYWORD_ENTRY">
-            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <where>AB_KEYWORD_ENTRYID in (?, ?, ?, ?)</where>
             <whereParams>
                 <param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0" />
-            </whereParams>
-        </delete>
-        <delete tableName="AB_KEYWORD_ENTRY">
-            <where>AB_KEYWORD_ENTRYID = ?</where>
-            <whereParams>
                 <param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad" />
-            </whereParams>
-        </delete>
-        <delete tableName="AB_KEYWORD_ENTRY">
-            <where>AB_KEYWORD_ENTRYID = ?</where>
-            <whereParams>
                 <param value="54231fc1-050e-4f00-91e1-4968387a6370" />
-            </whereParams>
-        </delete>
-        <delete tableName="AB_KEYWORD_ENTRY">
-            <where>AB_KEYWORD_ENTRYID = ?</where>
-            <whereParams>
                 <param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b" />
             </whereParams>
         </delete>
-    
-    
-        <rollback>
-            <delete tableName="AB_KEYWORD_ENTRY">
-                <where>AB_KEYWORD_ENTRYID = ?</where>
-                <whereParams>
-                    <param value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
-                </whereParams>
-            </delete>
-            <insert tableName="AB_KEYWORD_ENTRY">
-                <column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
-                <column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
-                <column name="TITLE" value="Visit"/>
-                <column name="CONTAINER" value="TaskType"/>
-                <column name="SORTING" valueNumeric="0"/>
-                <column name="ISACTIVE" valueNumeric="1"/>
-                <column name="ISESSENTIAL" valueNumeric="0"/>
-            </insert>
-            <insert tableName="AB_KEYWORD_ENTRY">
-                <column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
-                <column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
-                <column name="TITLE" value="E-Mail"/>
-                <column name="CONTAINER" value="TaskType"/>
-                <column name="SORTING" valueNumeric="1"/>
-                <column name="ISACTIVE" valueNumeric="1"/>
-                <column name="ISESSENTIAL" valueNumeric="0"/>
-            </insert>
-            <insert tableName="AB_KEYWORD_ENTRY">
-                <column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
-                <column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
-                <column name="TITLE" value="Phone"/>
-                <column name="CONTAINER" value="TaskType"/>
-                <column name="SORTING" valueNumeric="2"/>
-                <column name="ISACTIVE" valueNumeric="1"/>
-                <column name="ISESSENTIAL" valueNumeric="0"/>
-            </insert>
-            <insert tableName="AB_KEYWORD_ENTRY">
-                <column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
-                <column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
-                <column name="TITLE" value="Online-Meeting"/>
-                <column name="CONTAINER" value="TaskType"/>
-                <column name="SORTING" valueNumeric="3"/>
-                <column name="ISACTIVE" valueNumeric="1"/>
-                <column name="ISESSENTIAL" valueNumeric="0"/>
-            </insert>
-        </rollback>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+            <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+            <column name="TITLE" value="Task"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+        </insert>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
index 6bb21bcdb6d80558a3cda81c2cd7b4c9b031fd82..3ed1316c978dd5917f4823d27f18d21757c8aa8f 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
@@ -5,7 +5,7 @@
       <column name="AB_KEYWORD_ENTRYID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
       <column name="KEYID" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
       <column name="TITLE" value="Project manager"/>
-      <column name="CONTAINER" value="SalesprojectMemberRole"/>
+      <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="0"/>
       <column name="ISACTIVE" valueNumeric="1"/>
       <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -14,7 +14,7 @@
       <column name="AB_KEYWORD_ENTRYID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
       <column name="KEYID" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
       <column name="TITLE" value="Project assistant"/>
-      <column name="CONTAINER" value="SalesprojectMemberRole"/>
+      <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="1"/>
       <column name="ISACTIVE" valueNumeric="1"/>
       <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -23,25 +23,16 @@
       <column name="AB_KEYWORD_ENTRYID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
       <column name="KEYID" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
       <column name="TITLE" value="Adviser"/>
-      <column name="CONTAINER" value="SalesprojectMemberRole"/>
+      <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="2"/>
       <column name="ISACTIVE" valueNumeric="1"/>
       <column name="ISESSENTIAL" valueNumeric="0"/>
     </insert>
-    <insert tableName="AB_KEYWORD_ENTRY">
-      <column name="AB_KEYWORD_ENTRYID" value="3d603fe3-1b06-43fc-9e20-2efd6e9e4afd"/>
-      <column name="KEYID" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
-      <column name="TITLE" value="Decision maker"/>
-      <column name="CONTAINER" value="SalesprojectMemberRole"/>
-      <column name="SORTING" valueNumeric="3"/>
-      <column name="ISACTIVE" valueNumeric="1"/>
-      <column name="ISESSENTIAL" valueNumeric="0"/>
-    </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
       <column name="KEYID" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
       <column name="TITLE" value="External sales manager"/>
-      <column name="CONTAINER" value="SalesprojectMemberRole"/>
+      <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="4"/>
       <column name="ISACTIVE" valueNumeric="1"/>
       <column name="ISESSENTIAL" valueNumeric="0"/>
@@ -50,7 +41,7 @@
       <column name="AB_KEYWORD_ENTRYID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
       <column name="KEYID" value="67baabb5-abd0-43bd-aea1-cf7e606814a6"/>
       <column name="TITLE" value="Internal sales manager"/>
-      <column name="CONTAINER" value="SalesprojectMemberRole"/>
+      <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="5"/>
       <column name="ISACTIVE" valueNumeric="1"/>
       <column name="ISESSENTIAL" valueNumeric="0"/>
diff --git a/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
index df09eed4ad83332ccf0101444fbc789897682876..c2e0b2937809f22b3a4b638d40c27fe25b190445 100644
--- a/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
+++ b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
@@ -13,7 +13,7 @@
             <column name="ADDR_FORMAT" type="NVARCHAR(50)"/>
             <column name="REQUIRED_FIELDS" type="NVARCHAR(50)"/>
             <column name="ZIP_REGEX" type="NVARCHAR(1000)"/>
-            <column name="FLAG" type="BLOB"/>
+            <column name="FLAG" type="LONGBLOB"/>
         </createTable>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7601b701157905f491563be8ac1ce26c548b9f5a
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/defaultBlob/_____configuration.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasConfig 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/aliasConfig/1.1.0">
+  <name>_____CONFIGURATION</name>
+  <serverId>default</serverId>
+  <definitionName>_____CONFIGURATION</definitionName>
+  <aliasConfigSub>
+    <aliasSubInstanceConfiguration>
+      <databaseAuditEnabled v="true" />
+      <indexsearchEnabled v="true" />
+      <loggingConsoleEnabled v="true" />
+      <loggingFileEnabled v="true" />
+      <loggingRemoteEnabled v="false" />
+      <neonVaadinClientEnabled v="true" />
+      <neonDisableConnectionSecurity v="false" />
+      <neonUseDummyKeystore v="true" />
+      <securityConnectionSSLEnabled v="true" />
+      <securitySSLDisableCertificateCheck v="true" />
+      <telephonyEnabled v="true" />
+      <telephonyProvider></telephonyProvider>
+      <customProperties>
+        <customBooleanProperty>
+          <name>dataCaching.client.forceDisable</name>
+          <description>Enabling this option will disable the per-client-context data-cache within the customzing (for exameple the caching of Keywords). This is usefull if you're testing and want to frequently add data like keywords, etc. which are cached which help of the "DataCaching_lib".</description>
+          <property v="false" />
+        </customBooleanProperty>
+      </customProperties>
+    </aliasSubInstanceConfiguration>
+  </aliasConfigSub>
+</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb64c2a29000803b05bccba19dde9457665c24c5
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/aliasConfig/updateForDataCaching.xml
@@ -0,0 +1,12 @@
+<?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="6947b44d-0ef4-4fb6-a74d-f496d99b1e69">
+    <update tableName="ASYS_ALIASCONFIG">
+        <column name="XMLDATA" valueBlobFile="defaultBlob/_____configuration.xml"/>
+        <where>ID = ?</where>
+        <whereParams>
+                <param value="f4a33c35-5033-4699-b55a-9520b465b4c5" />
+        </whereParams>
+    </update>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml
index 0d2b50c2fce940c2c88152ef8c06ebda17816aa7..bdcd0928c4a502920fda60fa49811fd1d5e3344e 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/changelog.xml
@@ -1,8 +1,9 @@
-<?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="create_asys_notifications.xml"/>
-    <include relativeToChangelogFile="true" file="create_asys_notificationcontents.xml"/>
-    <include relativeToChangelogFile="true" file="create_asys_permission.xml"/>
-    <include relativeToChangelogFile="true" file="create_asys_permissionset.xml"/>
-    <include relativeToChangelogFile="true" file="create_asys_permissionaction.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="notificationcenter/create_asys_notifications.xml"/>
+    <include relativeToChangelogFile="true" file="notificationcenter/create_asys_notificationcontents.xml"/>
+    <include relativeToChangelogFile="true" file="permission/create_asys_permission.xml"/>
+    <include relativeToChangelogFile="true" file="permission/create_asys_permissionset.xml"/>
+    <include relativeToChangelogFile="true" file="permission/create_asys_permissionaction.xml"/>
+    <include relativeToChangelogFile="true" file="aliasConfig/updateForDataCaching.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notificationcontents.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notificationcontents.xml
index 8cd8c16972458c92f043d4f3831d2aa04c00f7e0..b5195dab42f4d8f2218f945cf10e69a1139b7d06 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notificationcontents.xml
@@ -1,22 +1,22 @@
-<?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="a.schindlbeck" id="6b25f062-fb39-4230-9348-b67ec5ec45a1">
-    <createTable tableName="ASYS_NOTIFICATIONCONTENTS">
-        <column name="CONTENTID" type="CHAR(36)">
-            <constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONCONTENTS_CONTENTID"/>
-        </column>
-        <column name="BACKPACK" type="CLOB"/>
-        <column name="CAPTION" type="VARCHAR(512)"/>
-        <column name="CREATIONDATE" type="TIMESTAMP"/>
-        <column name="DESCRIPTION" type="VARCHAR(1023)"/>
-        <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
-        <column name="ICON_INFO" type="VARCHAR(1023)"/>
-        <column name="LIFETIME" type="BIGINT"/>
-        <column name="LINK_INFO" type="VARCHAR(1023)"/>
-        <column name="ORIGINATORNAME" type="VARCHAR(63)"/>
-        <column name="RECIPIENTUSERIDS" type="CLOB"/>
-        <column name="TYPECODE" type="VARCHAR(63)"/>
-        <column name="VERSION" type="INTEGER"/>
-    </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="a.schindlbeck" id="6b25f062-fb39-4230-9348-b67ec5ec45a1">
+    <createTable tableName="ASYS_NOTIFICATIONCONTENTS">
+        <column name="CONTENTID" type="CHAR(36)">
+            <constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONCONTENTS_CONTENTID"/>
+        </column>
+        <column name="BACKPACK" type="CLOB"/>
+        <column name="CAPTION" type="VARCHAR(512)"/>
+        <column name="CREATIONDATE" type="TIMESTAMP"/>
+        <column name="DESCRIPTION" type="VARCHAR(1023)"/>
+        <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
+        <column name="ICON_INFO" type="VARCHAR(1023)"/>
+        <column name="LIFETIME" type="BIGINT"/>
+        <column name="LINK_INFO" type="VARCHAR(1023)"/>
+        <column name="ORIGINATORNAME" type="VARCHAR(63)"/>
+        <column name="RECIPIENTUSERIDS" type="CLOB"/>
+        <column name="TYPECODE" type="VARCHAR(63)"/>
+        <column name="VERSION" type="INTEGER"/>
+    </createTable>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notifications.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notifications.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/notificationcenter/create_asys_notifications.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permission.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permission.xml
index 66b4bfee09b402b07f768935eb7b78554e769f80..ab5313229af678139f5d2adcd3002afddc28609c 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permission.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permission.xml
@@ -1,13 +1,13 @@
-<?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.leipold" id="746f6e0c-3eab-4424-867f-4cf4fb4c45bb">
-        <createTable tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" type="CHAR(36)">
-                <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSION_ID"/>
-            </column>
-            <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
-            <column name="COND" type="VARCHAR(255)"/>
-            <column name="CONDTYPE" type="BOOLEAN"/>
-        </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="s.leipold" id="746f6e0c-3eab-4424-867f-4cf4fb4c45bb">
+        <createTable tableName="ASYS_PERMISSION">
+            <column name="ASYS_PERMISSIONID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSION_ID"/>
+            </column>
+            <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
+            <column name="COND" type="VARCHAR(255)"/>
+            <column name="CONDTYPE" type="BOOLEAN"/>
+        </createTable>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionaction.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionaction.xml
index 746ab274026f414aa708682cc2ec7bae8072dc9f..5b52530e4d446cb322df84584eb9cb138c4f6d87 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionaction.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionaction.xml
@@ -1,12 +1,12 @@
-<?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.leipold" id="20241de4-091e-4093-8055-c87c172e5788">
-        <createTable tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" type="CHAR(36)">
-                <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONACTION_ID"/>
-            </column>
-            <column name="ASYS_PERMISSION_ID" type="CHAR(36)"/>
-            <column name="ACTION" type="VARCHAR(255)"/>
-        </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="s.leipold" id="20241de4-091e-4093-8055-c87c172e5788">
+        <createTable tableName="ASYS_PERMISSIONACTION">
+            <column name="ASYS_PERMISSIONACTIONID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONACTION_ID"/>
+            </column>
+            <column name="ASYS_PERMISSION_ID" type="CHAR(36)"/>
+            <column name="ACTION" type="VARCHAR(255)"/>
+        </createTable>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionset.xml
similarity index 98%
rename from .liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
rename to .liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionset.xml
index 31583db7ce1321ba3e5fad77723b211e919f2493..70f767b18128f0c6bb680a45dc88df3120dfa8a6 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_permissionset.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.2/permission/create_asys_permissionset.xml
@@ -1,15 +1,15 @@
-<?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.leipold" id="8a125d57-48c6-4d2e-9568-d5e66f72a702">
-        <createTable tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" type="CHAR(36)">
-                <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONSET_ID"/>
-            </column>
-            <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
-            <column name="ENTITY_ID" type="VARCHAR(255)"/>
-            <column name="ROLE_ID" type="VARCHAR(255)"/>
-            <column name="FIELD_ID" type="VARCHAR(255)"/>
-            <column name="ACCESSTYPE" type="CHAR(1)"/>
-        </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="s.leipold" id="8a125d57-48c6-4d2e-9568-d5e66f72a702">
+        <createTable tableName="ASYS_PERMISSIONSET">
+            <column name="ASYS_PERMISSIONSETID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_ASYS_PERMISSIONSET_ID"/>
+            </column>
+            <column name="ASYS_PERMISSIONSET_ID" type="CHAR(36)"/>
+            <column name="ENTITY_ID" type="VARCHAR(255)"/>
+            <column name="ROLE_ID" type="VARCHAR(255)"/>
+            <column name="FIELD_ID" type="VARCHAR(255)"/>
+            <column name="ACCESSTYPE" type="CHAR(1)"/>
+        </createTable>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
index 88d3c5a8853f2eb7ae72c97dce81c40df5b93c4d..f196fedfb7d3b403106f4a4665ee0767b72544de 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
@@ -1,112 +1,121 @@
-<?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.hoermanns" id="f51b5b01-c172-49b7-97b8-13b54d3aafdb">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="6f2070f6-26ce-4361-8ad5-df7e8bb09410"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1edd7253-c1a9-4eb1-92b8-ce2ad9262aa9"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="22864525-f580-4ce3-b5d5-2034519cb482"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0a9afbd0-54c8-4141-834c-a1fad149aeed"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Birgit Leicht"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="afc7201d-a72d-49d5-842d-04d6192f6302"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Birgit"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="b1832c76-356c-4909-a6ef-bde0c0e1c857"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Leicht"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="b091cb95-5976-4b8f-975f-c411b82b5b8c"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="48e35d4e-93c9-49e9-bc7e-b1f105bed72d"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="8888f771-9e61-4ea8-8e3b-388bcfbdd4bf"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="e961b7da-561c-436a-a718-8746fa818d30"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="b.leicht@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="fb684399-de76-44dd-975d-f3d4d6c95c42"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="b.leicht@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115" />
-            </whereParams>
-        </delete>
-    </rollback>
-</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="j.hoermanns" id="f51b5b01-c172-49b7-97b8-13b54d3aafdb">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="6f2070f6-26ce-4361-8ad5-df7e8bb09410"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="1edd7253-c1a9-4eb1-92b8-ce2ad9262aa9"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="22864525-f580-4ce3-b5d5-2034519cb482"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0a9afbd0-54c8-4141-834c-a1fad149aeed"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Birgit Leicht"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="afc7201d-a72d-49d5-842d-04d6192f6302"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Birgit"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="b1832c76-356c-4909-a6ef-bde0c0e1c857"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Leicht"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="b091cb95-5976-4b8f-975f-c411b82b5b8c"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="48e35d4e-93c9-49e9-bc7e-b1f105bed72d"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="8888f771-9e61-4ea8-8e3b-388bcfbdd4bf"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="e961b7da-561c-436a-a718-8746fa818d30"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="b.leicht@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="fb684399-de76-44dd-975d-f3d4d6c95c42"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="b.leicht@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="7025fd5a-3b29-4412-87d9-a02b7e543649"/>
+        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
index 647680ecf2f91147da4abdc4302d66de55c7734d..93e94c583b5664bf56730da9e573201237bd4f52 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
@@ -1,112 +1,121 @@
-<?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.hoermanns" id="3b2eb88a-7d8f-4b51-a361-29170982d152">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="63b9438d-1a63-49c9-85c2-6bc28efe87e5"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0eabe917-fcf7-46e4-92d1-f7d326ded6c4"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="a9efc147-d086-477f-b3d5-6eea09c95e2e"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="5064165c-a566-4905-a9ba-6df21c150935"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Harold Smith"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="efb6610d-8990-40c7-8044-9d3f471fe08c"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Harold"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="95761793-e2e5-439f-9313-e75e4558c8f0"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Smith"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="9e7f3f53-3df4-4e6e-b16c-f13f2430c871"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="89cda16b-f94f-4b20-8fea-184250de76f2"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="70fcb1a9-b13b-4222-afdc-c39de33ffe36"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="28b90a4a-b098-42cc-bd5c-27cb27988307"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="h.smith@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="ce8946ae-eb69-46fe-b63b-d4684c0189bb"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="h.smith@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_0555b87b-5708-4748-aa88-064e33cab002" />
-            </whereParams>
-        </delete>
-    </rollback>
-</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="j.hoermanns" id="3b2eb88a-7d8f-4b51-a361-29170982d152">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="63b9438d-1a63-49c9-85c2-6bc28efe87e5"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0eabe917-fcf7-46e4-92d1-f7d326ded6c4"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="a9efc147-d086-477f-b3d5-6eea09c95e2e"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="5064165c-a566-4905-a9ba-6df21c150935"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Harold Smith"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="efb6610d-8990-40c7-8044-9d3f471fe08c"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Harold"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="95761793-e2e5-439f-9313-e75e4558c8f0"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Smith"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="9e7f3f53-3df4-4e6e-b16c-f13f2430c871"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="89cda16b-f94f-4b20-8fea-184250de76f2"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="70fcb1a9-b13b-4222-afdc-c39de33ffe36"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="28b90a4a-b098-42cc-bd5c-27cb27988307"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="h.smith@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="ce8946ae-eb69-46fe-b63b-d4684c0189bb"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="h.smith@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0b5d827a-32dc-4cd5-b023-2f4fbc65f43e"/>
+        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_0555b87b-5708-4748-aa88-064e33cab002" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
index d6bfa4cc7aae62e64d57e5a460edbfc20f4a98a1..ee371fc7639d5acd9d334a2d0b0641e51215ef6e 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
@@ -1,112 +1,121 @@
-<?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.hoermanns" id="f9502718-5fca-4a3c-a439-22b28a6a4866">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="a501ba6e-4229-4bcc-9587-3e5b3516f1b5"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="e7a50a5e-7208-4821-b223-720721067edb"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3cd16b02-ea88-4a95-b837-95cd4e989094"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="c1114ba2-3a61-460f-868b-af15e1113a87"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Herbert Obermeier"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="182783dc-9ca6-469c-8f5b-1c732a0c4830"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Herbert"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="3a555e19-4f2e-4327-98cc-515658c7c17f"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Obermeier"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="fbd983eb-e30b-4dee-b2c5-d682727a614b"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="98a96f11-de67-4efb-8977-5dc459f3f396"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="68a5bb62-d0f7-4268-881f-d86466ad67c3"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="230a9a3b-92d9-474b-a10f-8e5ac63d9a12"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="h.obermeier@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="b1ef9091-a7e1-4800-9e7e-ed72aa419124"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="h.obermeier@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65" />
-            </whereParams>
-        </delete>
-    </rollback>
-</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="j.hoermanns" id="f9502718-5fca-4a3c-a439-22b28a6a4866">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="a501ba6e-4229-4bcc-9587-3e5b3516f1b5"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="e7a50a5e-7208-4821-b223-720721067edb"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="3cd16b02-ea88-4a95-b837-95cd4e989094"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="c1114ba2-3a61-460f-868b-af15e1113a87"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Herbert Obermeier"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="182783dc-9ca6-469c-8f5b-1c732a0c4830"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Herbert"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="3a555e19-4f2e-4327-98cc-515658c7c17f"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Obermeier"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="fbd983eb-e30b-4dee-b2c5-d682727a614b"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="98a96f11-de67-4efb-8977-5dc459f3f396"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="68a5bb62-d0f7-4268-881f-d86466ad67c3"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="230a9a3b-92d9-474b-a10f-8e5ac63d9a12"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="h.obermeier@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="b1ef9091-a7e1-4800-9e7e-ed72aa419124"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="h.obermeier@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="70f4ff0b-06de-4346-9350-469d401fad5e"/>
+        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
index 127523a4a751669d6f30bf1ef8894a89d96f68d9..8e7e94d052ab9f5e7e46ff656f32036e7575159d 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
@@ -1,112 +1,121 @@
-<?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.hoermanns" id="d0cbed0a-5977-456f-b410-7f4a80c17cfd">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="f139e953-b295-4bbd-927e-b894ff4d3b67"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0a73d381-b0a1-4156-b9c2-3c6e1d909ff0"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3264f099-27f8-4d8d-a471-01536ef8bdbd"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="54e6a89d-5283-4966-8780-b93cbca97b29"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Lisa Sommer"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="f3403820-b7ee-4e90-8c4b-881d8ccc223b"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Lisa"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="3cedc3be-ad6d-489a-a8c9-84bf96363229"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Sommer"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="9dc8712b-384b-4e62-9fab-22982c1a8acc"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="a4de6db6-fc43-4bc4-b3fd-75bb7602a08c"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="8479dc65-f3eb-43fe-9161-92e2e5bd7a52"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="535e6910-1e5c-45dd-89cc-8695266d2563"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="demo@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="518fa115-27f6-42af-883d-f234229df8f5"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="demo@domain.local"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9" />
-            </whereParams>
-        </delete>
-    </rollback>
-</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="j.hoermanns" id="d0cbed0a-5977-456f-b410-7f4a80c17cfd">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="f139e953-b295-4bbd-927e-b894ff4d3b67"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="0a73d381-b0a1-4156-b9c2-3c6e1d909ff0"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="3264f099-27f8-4d8d-a471-01536ef8bdbd"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="54e6a89d-5283-4966-8780-b93cbca97b29"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Lisa Sommer"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="f3403820-b7ee-4e90-8c4b-881d8ccc223b"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Lisa"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="3cedc3be-ad6d-489a-a8c9-84bf96363229"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Sommer"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="9dc8712b-384b-4e62-9fab-22982c1a8acc"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="a4de6db6-fc43-4bc4-b3fd-75bb7602a08c"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="8479dc65-f3eb-43fe-9161-92e2e5bd7a52"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="535e6910-1e5c-45dd-89cc-8695266d2563"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="demo@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="518fa115-27f6-42af-883d-f234229df8f5"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="demo@domain.local"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="9d66fea5-771e-44e2-8663-792ef9f13f8e"/>
+        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
index d69b80a262fde90f2f6ac552996c9fbd5d8d3ea8..fbe592df0aee0e00b14bfb9b62577029b72869a8 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
@@ -1,112 +1,121 @@
-<?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.hoermanns" id="88a254de-509f-4eba-a88d-8539ca8cd37f">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="b5dd10e8-188d-477d-ae61-a3c36da643a8"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="7f566326-c405-4238-8974-d92aafab0b80"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1525c79d-2f48-4fa4-b2e7-1a5a6cb502e8"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="8ee8c986-72da-49d6-87eb-403b0994203a"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Susanne Lustig"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="2360c964-f456-423c-83f7-79ec57aff10f"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Susanne"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="504e660a-8c64-41e3-99c3-e39b5f2ee0ce"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Lustig"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="e753cd61-fcb6-4b89-8f29-93b875ccc388"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="e4d362f3-8bc3-4dd5-9b1c-d338017b5aaa"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="a796eef7-72b6-435a-adbc-4e9356fcd35d"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="8b8a49a6-7909-422d-8d55-5f70503946fe"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="665922d4-e0b4-4f36-b907-0e0e73a1bffc"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea" />
-            </whereParams>
-        </delete>
-    </rollback>
-</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="j.hoermanns" id="88a254de-509f-4eba-a88d-8539ca8cd37f">
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="b5dd10e8-188d-477d-ae61-a3c36da643a8"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="lastModified"/>
+        <column name="PROPVAL" value="1544193908535"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="7f566326-c405-4238-8974-d92aafab0b80"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="contactID"/>
+        <column name="PROPVAL" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="1525c79d-2f48-4fa4-b2e7-1a5a6cb502e8"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="name"/>
+        <column name="PROPVAL" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="8ee8c986-72da-49d6-87eb-403b0994203a"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="title"/>
+        <column name="PROPVAL" value="Susanne Lustig"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="2360c964-f456-423c-83f7-79ec57aff10f"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="firstname"/>
+        <column name="PROPVAL" value="Susanne"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PERSONAL"/>
+        <column name="ID" value="504e660a-8c64-41e3-99c3-e39b5f2ee0ce"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="lastname"/>
+        <column name="PROPVAL" value="Lustig"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="ROLE"/>
+        <column name="ID" value="e753cd61-fcb6-4b89-8f29-93b875ccc388"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="roleNames"/>
+        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="e4d362f3-8bc3-4dd5-9b1c-d338017b5aaa"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="password"/>
+        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="PASSWORD"/>
+        <column name="ID" value="a796eef7-72b6-435a-adbc-4e9356fcd35d"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="passwordChanged"/>
+        <column name="PROPVAL" value="1533122217399"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="8b8a49a6-7909-422d-8d55-5f70503946fe"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="email"/>
+        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="665922d4-e0b4-4f36-b907-0e0e73a1bffc"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="calendarID"/>
+        <column name="PROPVAL" value="s.lustig@meinefirma.de"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
+        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
+        <column name="GROUPID" value="BASIC"/>
+        <column name="ID" value="1ff6b066-12ba-4b01-a29e-0a84241a8b2c"/>
+        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+        <column name="PROPKEY" value="isActive"/>
+        <column name="PROPVAL" value="true"/>
+    </insert>
+    <rollback>
+        <delete tableName="ASYS_USERS">
+            <where>NAME = ?</where>
+            <whereParams>
+                    <param value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea" />
+            </whereParams>
+        </delete>
+    </rollback>
+</changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
index eff6802896736834f311fff91c44d6ac40bc5c45..b7e91b535e551a61c40145be23b9c6b3aa6c519e 100644
--- a/.liquibase/_____SYSTEMALIAS/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/changelog.xml
@@ -1,7 +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">
-    <include file="basic/init/init.xml"/>
-    <include file="basic/init/init.xml"/>
-    <include file="basic/2019.2/changelog.xml"/>
-    <include file="basic/init/system_aliasTestdata.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 file="basic/init/init.xml"/>
+    <include file="basic/init/system_aliasTestdata.xml"/>
+    <include file="basic/2019.2/changelog.xml"/>
+</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6392c1a5eb0b9099f376032bf5553f476839e29f..32e31e96d5bff8abb488726c992823bbf826d853 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2726,31 +2726,6 @@
                 <title>Offer Id</title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <title>Salesproject</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
-                </customProperties>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>OFFERCODE</name>
                 <dbName></dbName>
@@ -3083,6 +3058,34 @@
                 <title>Creation user</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="false" />
+                <isUnique v="false" />
+                <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="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>FOOTER</name>
                 <dbName></dbName>
@@ -3840,9 +3843,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESPROJECT_FORECAST</name>
+            <name>TIMETRACKING</name>
             <dbName></dbName>
-            <idColumn>SALESPROJECT_FORECASTID</idColumn>
+            <idColumn>TIMETRACKINGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -3857,7 +3860,28 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SALESPROJECT_FORECASTID</name>
+                <name>DATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>Date</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TIMETRACKINGID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -3867,21 +3891,21 @@
                 <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject forecast Id</title>
+                <title>Timetracking Id</title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GROUPCODE</name>
+                <name>OBJECT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Commodity group</title>
+                <title>Object Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -3889,25 +3913,20 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>ProductGroupcode</property>
-                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VOLUME</name>
+                <name>MINUTES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Volume</title>
+                <title>Time</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -3918,17 +3937,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_START</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>Planned</title>
+                <title>Creator</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -3949,7 +3968,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Info</title>
+                <title>Description</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -3960,7 +3979,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
+                <name>ROW_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -3970,33 +3989,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject Id</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="false" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>tableRef</name>
-                    <global v="false" />
-                    <property>SALESPROJECT</property>
-                  </customStringProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Type</title>
+                <title>Connection</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4009,9 +4002,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESPROJECT_COMPETITION</name>
+            <name>ACTIVITY</name>
             <dbName></dbName>
-            <idColumn>SALESPROJECT_COMPETITIONID</idColumn>
+            <idColumn>ACTIVITYID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -4026,7 +4019,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DIRECTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -4036,7 +4029,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>State</title>
+                <title>Direction</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4047,17 +4040,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Info</title>
+                <title>Subject</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4068,17 +4061,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REASON</name>
+                <name>ENTRYDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Reason</title>
+                <title>Entry date</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4089,17 +4082,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_CANCELLED</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Excreted</title>
+                <title>Description</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4110,7 +4103,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_COMPETITIONID</name>
+                <name>ACTIVITYID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -4120,21 +4113,21 @@
                 <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject competition Id</title>
+                <title>Activity Id</title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
+                <name>CATEGORY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject Id</title>
+                <title>Category</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4142,25 +4135,20 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customStringProperty>
-                    <name>tableRef</name>
-                    <global v="false" />
-                    <property>SALESPROJECT</property>
-                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>PARENT_CONTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="64" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Company</title>
+                <title>Parent context</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4168,14 +4156,10 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PHASE</name>
+                <name>PARENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -4185,7 +4169,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Phase</title>
+                <title>Parent Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4195,129 +4179,74 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>SALESPROJECT_MEMBER</name>
-            <dbName></dbName>
-            <idColumn>SALESPROJECT_MEMBERID</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_MEMBERID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject member Id</title>
+                <title>Modification date</title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Person</title>
+                <title>Modification user</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ROLE</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Role</title>
+                <title>Creation date</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>SalesprojectMemberRole</property>
-                  </customStringProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject Id</title>
+                <title>Creation user</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="false" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>tableRef</name>
-                    <global v="false" />
-                    <property>SALESPROJECT</property>
-                  </customStringProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RELATIONSHIP</name>
+                <name>RESPONSIBLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Relationship</title>
+                <title>Responsible</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4330,9 +4259,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>TIMETRACKING</name>
+            <name>SALESORDER</name>
             <dbName></dbName>
-            <idColumn>TIMETRACKINGID</idColumn>
+            <idColumn>SALESORDERID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -4347,17 +4276,17 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE</name>
+                <name>CURRENCY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Date</title>
+                <title>Currency</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4368,31 +4297,43 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TIMETRACKINGID</name>
+                <name>LANGUAGE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="3" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Timetracking Id</title>
+                <title>Language</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/language/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ID</name>
+                <name>VERSNR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object Id</title>
+                <title>Vers. no.</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4403,17 +4344,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MINUTES</name>
+                <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Time</title>
+                <title>VAT</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4424,17 +4365,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>FOOTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title>Creator</title>
+                <title>Footer text</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4445,7 +4386,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>HEADER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -4455,7 +4396,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Description</title>
+                <title>Header text</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4466,17 +4407,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>SALESORDERCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Connection</title>
+                <title>Receipt number</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4486,27 +4427,8 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ACTIVITY</name>
-            <dbName></dbName>
-            <idColumn>ACTIVITYID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="2" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>DIRECTION</name>
+                <name>SALESPROJECT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -4516,7 +4438,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Direction</title>
+                <title>Salesproject</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4524,20 +4446,25 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/salesproject_id/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SUBJECT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Subject</title>
+                <title>Status</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4545,10 +4472,15 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customStringProperty>
+                    <name>keyword</name>
+                    <global v="false" />
+                    <property>SalesorderState</property>
+                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ENTRYDATE</name>
+                <name>SALESORDERDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -4558,7 +4490,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Entry date</title>
+                <title>Date</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4569,17 +4501,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>SALESORDER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Description</title>
+                <title>Salesorder Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4590,31 +4522,43 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ACTIVITYID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Activity Id</title>
+                <title>Connection</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CATEGORY</name>
+                <name>NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Category</title>
+                <title>Total net</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4625,17 +4569,31 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_CONTEXT</name>
+                <name>SALESORDERID</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>Salesorder Id</title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Parent context</title>
+                <title>Address</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4646,7 +4604,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_ID</name>
+                <name>OFFER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -4656,84 +4614,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Parent Id</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Modification date</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</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>Modification user</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Creation date</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</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>Creation user</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RESPONSIBLE</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>Responsible</title>
+                <title>Offer</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4746,9 +4627,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESORDER</name>
+            <name>SALESORDERITEM</name>
             <dbName></dbName>
-            <idColumn>SALESORDERID</idColumn>
+            <idColumn>SALESORDERITEMID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -4763,7 +4644,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CURRENCY</name>
+                <name>UNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -4773,7 +4654,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Currency</title>
+                <title>Unit</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4781,20 +4662,25 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customStringProperty>
+                    <name>keyword</name>
+                    <global v="false" />
+                    <property>QuantityUnit</property>
+                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LANGUAGE</name>
+                <name>PRICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="3" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Language</title>
+                <title>Unit price</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4802,25 +4688,20 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/language/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VERSNR</name>
+                <name>QUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Vers. no.</title>
+                <title>Quantity</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4841,7 +4722,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>VAT</title>
+                <title>VAT in %</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4852,17 +4733,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FOOTER</name>
+                <name>PRODUCT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Footer text</title>
+                <title>Article</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4870,20 +4751,24 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>HEADER</name>
+                <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Header text</title>
+                <title>Discount</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4894,17 +4779,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERCODE</name>
+                <name>ITEMPOSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Receipt number</title>
+                <title>Position</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4915,17 +4800,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
+                <name>OPTIONAL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject</title>
+                <title>Optional</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4933,15 +4818,15 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
+                  <customBooleanProperty>
+                    <name>autoMapTrueFalse4Log</name>
                     <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/salesproject_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
+                    <property v="true" />
+                  </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>GROUPCODEID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -4951,7 +4836,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Status</title>
+                <title>Commodity group</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -4962,28 +4847,28 @@
                   <customStringProperty>
                     <name>keyword</name>
                     <global v="false" />
-                    <property>SalesorderState</property>
+                    <property>ProductGroupcode</property>
                   </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERDATE</name>
+                <name>ITEMSORT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Date</title>
+                <title>Item sort</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
                     <name>log</name>
                     <global v="false" />
-                    <property v="true" />
+                    <property v="false" />
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
@@ -5004,48 +4889,27 @@
                   <customBooleanProperty>
                     <name>log</name>
                     <global v="false" />
-                    <property v="true" />
+                    <property v="false" />
                   </customBooleanProperty>
+                  <customStringProperty>
+                    <name>tableRef</name>
+                    <global v="false" />
+                    <property>SALESORDER</property>
+                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>ASSIGNEDTO</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>Connection</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>NET</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>Total net</title>
+                <title>Assigned to</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5056,7 +4920,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERID</name>
+                <name>SALESORDERITEMID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -5066,21 +4930,21 @@
                 <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesorder Id</title>
+                <title>Salesorder item Id</title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
+                <name>ITEMNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="250" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Address</title>
+                <title>Designation</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5091,17 +4955,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OFFER_ID</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Offer</title>
+                <title>Description</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5114,9 +4978,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESORDERITEM</name>
+            <name>TASK</name>
             <dbName></dbName>
-            <idColumn>SALESORDERITEMID</idColumn>
+            <idColumn>TASKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -5131,7 +4995,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>UNIT</name>
+                <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5141,7 +5005,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Unit</title>
+                <title>priority</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5152,22 +5016,22 @@
                   <customStringProperty>
                     <name>keyword</name>
                     <global v="false" />
-                    <property>QuantityUnit</property>
+                    <property>TaskPriority</property>
                   </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRICE</name>
+                <name>MATURITY_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Unit price</title>
+                <title>Maturity</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5178,17 +5042,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>QUANTITY</name>
+                <name>EDITOR_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>Quantity</title>
+                <title>{$TASK_EDITOR}</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5196,20 +5060,39 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VAT</name>
+                <name>TASKID</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>Task Id</title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>VAT in %</title>
+                <title>task number</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5220,17 +5103,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRODUCT_ID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Article</title>
+                <title>{$TASK_STATUS}</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5238,24 +5121,25 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
+                  <customStringProperty>
+                    <name>keyword</name>
                     <global v="false" />
-                  </customJDitoProperty>
+                    <property>TaskStatus</property>
+                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISCOUNT</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Discount</title>
+                <title>Description</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5266,17 +5150,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ITEMPOSITION</name>
+                <name>REQUESTOR_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>Position</title>
+                <title>{$TASK_REQUESTOR}</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5284,20 +5168,25 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OPTIONAL</name>
+                <name>SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Optional</title>
+                <title>subject</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5305,25 +5194,20 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customBooleanProperty>
-                    <name>autoMapTrueFalse4Log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GROUPCODEID</name>
+                <name>PROTECTIONLEVEL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Commodity group</title>
+                <title>Protected</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5331,36 +5215,36 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
+                  <customBooleanProperty>
+                    <name>autoMapTrueFalse4Log</name>
                     <global v="false" />
-                    <property>ProductGroupcode</property>
-                  </customStringProperty>
+                    <property v="true" />
+                  </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ITEMSORT</name>
+                <name>START_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Item sort</title>
+                <title>Begin</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
                     <name>log</name>
                     <global v="false" />
-                    <property v="false" />
+                    <property v="true" />
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDER_ID</name>
+                <name>TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5370,7 +5254,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesorder Id</title>
+                <title>type</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5379,14 +5263,14 @@
                     <property v="false" />
                   </customBooleanProperty>
                   <customStringProperty>
-                    <name>tableRef</name>
+                    <name>keyword</name>
                     <global v="false" />
-                    <property>SALESORDER</property>
+                    <property>TaskType</property>
                   </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ASSIGNEDTO</name>
+                <name>PARENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5394,9 +5278,9 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title>Assigned to</title>
+                <title>Parent Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5407,31 +5291,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERITEMID</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>Salesorder item Id</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ITEMNAME</name>
+                <name>PARENT_CONTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="64" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Designation</title>
+                <title>Parent context</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5442,17 +5312,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>PROGRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Description</title>
+                <title>Progress</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5460,14 +5330,19 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
+                  <customStringProperty>
+                    <name>keyword</name>
+                    <global v="false" />
+                    <property>TaskProgress</property>
+                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>TASK</name>
+            <name>AB_OBJECTRELATION</name>
             <dbName></dbName>
-            <idColumn>TASKID</idColumn>
+            <idColumn>AB_OBJECTRELATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -5482,43 +5357,17 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>PRIORITY</name>
+                <name>OBJECT2_ROWID</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>priority</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>TaskPriority</property>
-                  </customStringProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MATURITY_DATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Maturity</title>
+                <title>Object 2 row Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5529,17 +5378,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EDITOR_CONTACT_ID</name>
+                <name>OBJECT1_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title>{$TASK_EDITOR}</title>
+                <title>Object 1 row Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5547,15 +5396,10 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TASKID</name>
+                <name>AB_OBJECTRELATIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -5565,21 +5409,21 @@
                 <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Task Id</title>
+                <title>Object relation</title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CODE</name>
+                <name>AB_OBJECTRELATIONTYPE1</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title>task number</title>
+                <title>Object relation type 1</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5590,7 +5434,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>AB_OBJECTRELATIONTYPE2</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5600,7 +5444,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>{$TASK_STATUS}</title>
+                <title>Object relation type 2</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5608,15 +5452,10 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>TaskStatus</property>
-                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -5626,54 +5465,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Description</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>REQUESTOR_CONTACT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title>{$TASK_REQUESTOR}</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SUBJECT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>subject</title>
+                <title>Info</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5683,55 +5475,41 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_ATTRIBUTEUSAGE</name>
+            <dbName></dbName>
+            <idColumn>AB_ATTRIBUTEUSAGEID</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>PROTECTIONLEVEL</name>
+                <name>AB_ATTRIBUTEUSAGEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Protected</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customBooleanProperty>
-                    <name>autoMapTrueFalse4Log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>START_DATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Begin</title>
+                <title>Attribute usage Id</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TYPE</name>
+                <name>AB_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5741,33 +5519,28 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>type</title>
+                <title>Attribute Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
                     <name>log</name>
                     <global v="false" />
-                    <property v="false" />
+                    <property v="true" />
                   </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>TaskType</property>
-                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_ID</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Parent Id</title>
+                <title>Module</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5778,17 +5551,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_CONTEXT</name>
+                <name>MIN_COUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Parent context</title>
+                <title>Minimal count</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5799,17 +5572,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROGRESS</name>
+                <name>MAX_COUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Progress</title>
+                <title>Maximal count</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5817,19 +5590,14 @@
                     <global v="false" />
                     <property v="true" />
                   </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>TaskProgress</property>
-                  </customStringProperty>
                 </customProperties>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_OBJECTRELATION</name>
+            <name>AB_ATTRIBUTE</name>
             <dbName></dbName>
-            <idColumn>AB_OBJECTRELATIONID</idColumn>
+            <idColumn>AB_ATTRIBUTEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -5844,17 +5612,17 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT2_ROWID</name>
+                <name>ATTRIBUTE_NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object 2 row Id</title>
+                <title>Name</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5865,7 +5633,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT1_ROWID</name>
+                <name>ATTRIBUTE_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5875,7 +5643,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object 1 row Id</title>
+                <title>Type</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5886,7 +5654,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONID</name>
+                <name>AB_ATTRIBUTEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -5896,11 +5664,32 @@
                 <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object relation</title>
+                <title>Attribute Id</title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONTYPE1</name>
+                <name>ATTRIBUTE_ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>Active</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_PARENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -5908,9 +5697,30 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title>Superordinate Attribute</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KEYWORD_CONTAINER</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>Object relation type 1</title>
+                <title>Keyword</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5921,17 +5731,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONTYPE2</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object relation type 2</title>
+                <title>Sorting</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5942,7 +5752,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>ATTRIBUTE_INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -5952,7 +5762,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Info</title>
+                <title>Description</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -5965,9 +5775,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_ATTRIBUTEUSAGE</name>
+            <name>AB_ATTRIBUTERELATION</name>
             <dbName></dbName>
-            <idColumn>AB_ATTRIBUTEUSAGEID</idColumn>
+            <idColumn>AB_ATTRIBUTERELATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -5982,31 +5792,38 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>AB_ATTRIBUTEUSAGEID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Attribute usage Id</title>
+                <title>Object row Id</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTE_ID</name>
+                <name>DATE_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Attribute Id</title>
+                <title>Date value</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6017,17 +5834,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>NUMBER_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Module</title>
+                <title>Number value</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6038,38 +5855,31 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MIN_COUNT</name>
+                <name>AB_ATTRIBUTERELATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Minimal count</title>
+                <title>Attribute relation Id</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAX_COUNT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Maximal count</title>
+                <title>Object type</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6079,37 +5889,18 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>AB_ATTRIBUTE</name>
-            <dbName></dbName>
-            <idColumn>AB_ATTRIBUTEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="2" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>ATTRIBUTE_NAME</name>
+                <name>CHAR_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Name</title>
+                <title>Char value</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6120,7 +5911,7 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_TYPE</name>
+                <name>AB_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -6130,7 +5921,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Type</title>
+                <title>Attribute</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6141,31 +5932,17 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTEID</name>
+                <name>ID_VALUE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Attribute Id</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ATTRIBUTE_ACTIVE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Active</title>
+                <title>Id value</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6176,80 +5953,73 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_PARENT_ID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title>Superordinate Attribute</title>
+                <title>Modification date</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KEYWORD_CONTAINER</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Keyword</title>
+                <title>Modification user</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>Creation date</title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Sorting</title>
+                <title>Creation user</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_INFO</name>
+                <name>INT_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Description</title>
+                <title>Int value</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6262,9 +6032,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_ATTRIBUTERELATION</name>
+            <name>ACTIVITYLINK</name>
             <dbName></dbName>
-            <idColumn>AB_ATTRIBUTERELATIONID</idColumn>
+            <idColumn>ACTIVITYLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <title></title>
@@ -6289,7 +6059,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object row Id</title>
+                <title>{$OBJECTLINK_OBJECT}</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6300,38 +6070,31 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_VALUE</name>
+                <name>ACTIVITYLINKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Date value</title>
+                <title>Activity link Id</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NUMBER_VALUE</name>
+                <name>ACTIVITY_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Number value</title>
+                <title>Activity Id</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6341,20 +6104,6 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>AB_ATTRIBUTERELATIONID</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>Attribute relation Id</title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>OBJECT_TYPE</name>
                 <dbName></dbName>
@@ -6366,7 +6115,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Object type</title>
+                <title>{$OBJECTLINK_TYPE}</title>
                 <description></description>
                 <customProperties>
                   <customBooleanProperty>
@@ -6377,275 +6126,39 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHAR_VALUE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Char value</title>
+                <title>Modification date</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTE_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Attribute</title>
+                <title>Creation date</title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ID_VALUE</name>
+                <name>USER_NEW</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>Id value</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Modification date</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</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>Modification user</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Creation date</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</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>Creation user</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>INT_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>Int value</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ACTIVITYLINK</name>
-            <dbName></dbName>
-            <idColumn>ACTIVITYLINKID</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>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>{$OBJECTLINK_OBJECT}</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ACTIVITYLINKID</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>Activity link Id</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ACTIVITY_ID</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>Activity Id</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>OBJECT_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>{$OBJECTLINK_TYPE}</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Modification date</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title>Creation date</title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8107,6 +7620,7 @@
           <entityDb>
             <name>AB_LOGHISTORY</name>
             <dbName></dbName>
+            <idColumn>AB_LOGHISTORYID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8114,6 +7628,7 @@
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
+              <auditMode v="2" />
               <syncActive v="false" />
               <syncComplete v="true" />
               <syncDirection v="1" />
@@ -8274,7 +7789,431 @@
                 </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VALUE</name>
+                <name>VALUE</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>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="80" />
+                <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>
+              <entityFieldDb>
+                <name>DATE_END</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>Date end</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALESPROJECT_MILESTONEID</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 milestone Id</title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CAMPAIGNPARTICIPANT</name>
+            <dbName></dbName>
+            <idColumn>CAMPAIGNPARTICIPANTID</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>CAMPAIGN_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>CAMPAIGNPARTICIPANTID</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>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_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>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</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>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CAMPAIGNSTEP_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>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DOCUMENTTEMPLATE</name>
+            <dbName></dbName>
+            <idColumn>DOCUMENTTEMPLATEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>LANGUAGE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DOCUMENTTEMPLATEID</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>CLASSIFICATION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</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>
+              <entityFieldDb>
+                <name>TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</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>
+          <entityDb>
+            <name>DOCUMENTTEMPLATELINK</name>
+            <dbName></dbName>
+            <idColumn>DOCUMENTTEMPLATELINKID</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>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="91" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DOCUMENTTEMPLATE_ID_PARENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -8284,99 +8223,85 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Value</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject Id</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TYPE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Type</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_END</name>
+                <name>DOCUMENTTEMPLATELINKID</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>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Date end</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_MILESTONEID</name>
+                <name>DOCUMENTTEMPLATE_ID_CHILD</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Salesproject milestone Id</title>
+                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CAMPAIGNPARTICIPANT</name>
+            <name>CAMPAIGN</name>
             <dbName></dbName>
-            <idColumn>CAMPAIGNPARTICIPANTID</idColumn>
+            <idColumn>CAMPAIGNID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8392,13 +8317,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CAMPAIGN_ID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8406,27 +8331,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNPARTICIPANTID</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>EMPLOYEE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8434,7 +8359,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>STATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -8475,6 +8400,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CAMPAIGNID</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>USER_EDIT</name>
                 <dbName></dbName>
@@ -8490,11 +8429,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNSTEP_ID</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8506,9 +8445,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DOCUMENTTEMPLATE</name>
+            <name>CAMPAIGNSTEP</name>
             <dbName></dbName>
-            <idColumn>DOCUMENTTEMPLATEID</idColumn>
+            <idColumn>CAMPAIGNSTEPID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8524,13 +8463,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>LANGUAGE</name>
+                <name>CAMPAIGN_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
-                <size v="3" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8552,13 +8491,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>STATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8566,7 +8505,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATEID</name>
+                <name>CAMPAIGNSTEPID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -8580,11 +8519,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATION</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8594,21 +8533,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -8622,25 +8547,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="500" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8650,47 +8561,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>DATE_START</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DOCUMENTTEMPLATELINK</name>
-            <dbName></dbName>
-            <idColumn>DOCUMENTTEMPLATELINKID</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>DATE_EDIT</name>
+                <name>EMPLOYEE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8698,13 +8589,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATE_ID_PARENT</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8740,27 +8631,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATELINKID</name>
+                <name>MAXPARTICIPANTS</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DATE_END</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="false" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8768,7 +8659,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATE_ID_CHILD</name>
+                <name>PREDECESSORSTEP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -8784,9 +8675,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CAMPAIGN</name>
+            <name>CAMPAIGNPARTICIPANTLOG</name>
             <dbName></dbName>
-            <idColumn>CAMPAIGNID</idColumn>
+            <idColumn>CAMPAIGNPARTICIPANTLOGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8802,13 +8693,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CAMPAIGN_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8816,12 +8707,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8830,7 +8721,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMPLOYEE_CONTACT_ID</name>
+                <name>CAMPAIGNPARTICIPANT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -8844,12 +8735,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATE</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8858,11 +8749,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8872,13 +8763,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8886,7 +8777,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNID</name>
+                <name>CAMPAIGNPARTICIPANTLOGID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -8900,25 +8791,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>NAME</name>
+                <name>CAMPAIGNSTEP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8930,9 +8807,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CAMPAIGNSTEP</name>
+            <name>CAMPAIGNCOST</name>
             <dbName></dbName>
-            <idColumn>CAMPAIGNSTEPID</idColumn>
+            <idColumn>CAMPAIGNCOSTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8976,41 +8853,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATE</name>
+                <name>CAMPAIGNCOSTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNSTEPID</name>
+                <name>CATEGORY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9018,7 +8895,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -9032,11 +8909,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>NET</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9046,41 +8937,75 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_START</name>
+                <name>CAMPAIGNSTEP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </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>EMPLOYEE_CONTACT_ID</name>
+                <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="false" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>CLASSIFICATIONTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9088,25 +9013,45 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>CLASSIFICATIONGROUP</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="80" />
                 <scale v="0" />
-                <notNull v="true" />
+                <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>USER_NEW</name>
+                <name>CLASSIFICATIONTYPE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9116,11 +9061,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAXPARTICIPANTS</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9130,11 +9075,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_END</name>
+                <name>CLASSIFICATIONSCORE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9144,13 +9089,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PREDECESSORSTEP_ID</name>
+                <name>CLASSIFICATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <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>
@@ -9160,9 +9119,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CAMPAIGNPARTICIPANTLOG</name>
+            <name>CLASSIFICATIONSCORE</name>
             <dbName></dbName>
-            <idColumn>CAMPAIGNPARTICIPANTLOGID</idColumn>
+            <idColumn>CLASSIFICATIONSCOREID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9178,26 +9137,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CAMPAIGN_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>DATE_EDIT</name>
+                <name>SCORE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2" />
+                <size v="10" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9206,41 +9151,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNPARTICIPANT_ID</name>
+                <name>CLASSIFICATIONSCOREID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <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>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>SORT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9248,7 +9179,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -9262,27 +9193,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNPARTICIPANTLOGID</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>CAMPAIGNSTEP_ID</name>
+                <name>CLASSIFICATIONTYPE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9292,9 +9209,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CAMPAIGNCOST</name>
+            <name>FORECAST</name>
             <dbName></dbName>
-            <idColumn>CAMPAIGNCOSTID</idColumn>
+            <idColumn>FORECASTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9310,7 +9227,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CAMPAIGN_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -9324,11 +9241,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>GROUPCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9338,7 +9255,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNCOSTID</name>
+                <name>FORECASTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -9352,27 +9269,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CATEGORY</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>DATE_NEW</name>
+                <name>VOLUME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
+                <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9380,13 +9283,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DATE_START</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9394,12 +9297,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NET</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9408,13 +9311,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9422,11 +9325,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNSTEP_ID</name>
+                <name>TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9438,9 +9341,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CLASSIFICATIONTYPE</name>
+            <name>COMPETITION</name>
             <dbName></dbName>
-            <idColumn>CLASSIFICATIONTYPEID</idColumn>
+            <idColumn>COMPETITIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9456,13 +9359,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SCORETYPE</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="80" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9470,21 +9373,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONTYPEID</name>
+                <name>PHASE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONTYPE</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -9498,61 +9401,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONGROUP</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="80" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <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>
+                <name>COMPETITIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9560,11 +9443,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONSCORE_ID</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9574,27 +9457,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONID</name>
+                <name>REASON</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DATE_CANCELLED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9604,9 +9487,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CLASSIFICATIONSCORE</name>
+            <name>MEMBER</name>
             <dbName></dbName>
-            <idColumn>CLASSIFICATIONSCOREID</idColumn>
+            <idColumn>MEMBERID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9622,12 +9505,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SCORE</name>
+                <name>ROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="10" />
-                <scale v="2" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9636,7 +9519,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONSCOREID</name>
+                <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>DECIDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="16" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MEMBERID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -9650,13 +9561,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORT</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9664,11 +9575,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>RELATIONSHIP</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9678,13 +9589,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONTYPE_ID</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js
index b7b4c8e045a71a997420bb2da092ded73666e5a2..fe5b38dc6a1c6f1cee4388397e12a5a7bb713de3 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("system.result");
-import("Country_lib");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var countryName = CountryUtils.getLatinNameByIso2(params.value, params.locale);
+import("system.result");
+import("CountryInfo_lib");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var countryName = CountryUtils.getLatinNameByIso2(params.value, params.locale);
 result.string(countryName);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js
deleted file mode 100644
index c7b37e7e5dcae4e2c4da115790c35aca283d6e74..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.result");
-import("system.db");
-import("Sql_lib");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-
-var res = db.cell(SqlCondition.begin()
-                              .andPrepare("SALESPROJECT.SALESPROJECTID", params.value)
-                              .buildSql("select PROJECTTITLE from SALESPROJECT"));
-result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/productprice/entityfields/contact_id/customproperties/translate4log/property.js
similarity index 61%
rename from aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js
rename to aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/productprice/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..9f7c5917a2317799200776b01469d749759bd6bb 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/productprice/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,8 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/defaultDbRepository/defaultDbRepository.aod b/aliasDefinition/defaultDbRepository/defaultDbRepository.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2d27216f469dcb55496a68d426234b030b0d5474
--- /dev/null
+++ b/aliasDefinition/defaultDbRepository/defaultDbRepository.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasDefinition 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/aliasDefinition/1.2.0">
+  <name>defaultDbRepository</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <datasourceType v="2" />
+</aliasDefinition>
diff --git a/aliasDefinition/mailServerIMAP/mailServerIMAP.aod b/aliasDefinition/mailServerIMAP/mailServerIMAP.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bd7c8304ea189e69837f794799d49803f41ee962
--- /dev/null
+++ b/aliasDefinition/mailServerIMAP/mailServerIMAP.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasDefinition 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/aliasDefinition/1.2.0">
+  <name>mailServerIMAP</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <datasourceType v="4" />
+</aliasDefinition>
diff --git a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
index 628a839e5fbb735dcc9481caa60e7ce37bb2f14d..ec11a32ebe4eeb702b0d4b93821a9c92ad8d77c7 100644
--- a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
+++ b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_APPLICATION</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <company>
-    <name>company</name>
-    <backgroundColor v="0xff83cbd8" />
-  </company>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_APPLICATION</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <company>
+    <name>company</name>
+    <backgroundColor v="0xff83cbd8" />
+  </company>
+</application>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index d4ac43360909c8d7e2b5097cdb83bb332847d73f..2954157afbb42df149397653ce0b671699d7b38d 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -1,54 +1,176 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+<application 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/application/1.2.1">
   <name>_____SYSTEM_APPLICATION_NEON</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200">
-    <node name="CONTACTS" kind="123" title="Contactmanagement">
-      <icon>VAADIN:CONNECT</icon>
-      <node name="Group1" kind="123" title="">
-        <node name="Person" kind="10077" />
-        <node name="Organisation" kind="10077" />
-        <node name="Activity" kind="10077" />
-        <node name="Task" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-    <node name="SALES" kind="123" title="Sales">
-      <icon>VAADIN:BRIEFCASE</icon>
-      <node name="Group2" kind="123" title="">
-        <node name="Vertriebsdashboard" kind="10090" />
-        <node name="Salesproject" kind="10077" />
-        <node name="Offer" kind="10077" />
-        <node name="Order" kind="10077" />
-        <node name="Contract" kind="10077" />
-        <node name="Product" kind="10077" />
-        <node name="Turnover" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-    <node name="Marketing" kind="123" title="Marketing">
-      <icon>VAADIN:GROUP</icon>
-      <node name="Group4" kind="123" title="">
-        <node name="CampaignPlanning" kind="10077" />
-        <node name="Campaign" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-    <node name="ADMINISTRATION" kind="123" title="Administration">
-      <icon>VAADIN:CONTROLLER</icon>
-      <node name="Group3" kind="123" title="">
-        <node name="Notification" kind="10077" />
-        <node name="Attribute" kind="10077" />
-        <node name="DocumentTemplate" kind="10077" />
-        <node name="Employee" kind="10077" />
-        <node name="KeywordEntry" kind="10077" />
-        <node name="KeywordAttribute" kind="10077" />
-        <node name="ObjectRelationType" kind="10077" />
-        <node name="ClassificationAdmin" kind="10077" />
-        <node name="Salutation" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+    <childNodes>
+      <entityNode>
+        <name>CONTACTS</name>
+        <kind v="123" />
+        <title>Contactmanagement</title>
+        <icon>VAADIN:CONNECT</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group1</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Person</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Organisation</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Activity</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Task</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+      <entityNode>
+        <name>SALES</name>
+        <kind v="123" />
+        <title>Sales</title>
+        <icon>VAADIN:BRIEFCASE</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group2</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Vertriebsdashboard</name>
+                <kind v="10090" />
+              </entityNode>
+              <entityNode>
+                <name>Salesproject</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Offer</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Order</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Contract</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Product</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Turnover</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+      <entityNode>
+        <name>Marketing</name>
+        <kind v="123" />
+        <title>Marketing</title>
+        <icon>VAADIN:GROUP</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group4</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>CampaignPlanning</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Campaign</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+      <entityNode>
+        <name>ADMINISTRATION</name>
+        <kind v="123" />
+        <title>Administration</title>
+        <icon>VAADIN:CONTROLLER</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group3</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Notification</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Attribute</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>DocumentTemplate</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Employee</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>KeywordEntry</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>KeywordAttribute</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>ObjectRelationType</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>ClassificationAdmin</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Salutation</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+    </childNodes>
   </entityNode>
   <company>
     <name>company</name>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
index 6d333cf4cd3b9aee342d350544b30ec55525ae90..9c0722a0cb6e6ee0addb2a5dbc0838334dd09970 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_CALENDAR_RIBBON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <calendarRibbon>
-    <name>calendarRibbon</name>
-    <ribbonTasks>
-      <ribbonTask>
-        <name>TASK_CALENDAR</name>
-      </ribbonTask>
-    </ribbonTasks>
-  </calendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_CALENDAR_RIBBON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <calendarRibbon>
+    <name>calendarRibbon</name>
+    <ribbonTasks>
+      <ribbonTask>
+        <name>TASK_CALENDAR</name>
+      </ribbonTask>
+    </ribbonTasks>
+  </calendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
index 4fcea10c0e846904f456e1b056498f7470b3ca15..d75ce776afb4af858583e7c7e58fd4da2b68fa6d 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <neonCalendarRibbon>
-    <name>neonCalendarRibbon</name>
-    <entity>
-      <name>entity</name>
-    </entity>
-  </neonCalendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <neonCalendarRibbon>
+    <name>neonCalendarRibbon</name>
+    <entity>
+      <name>entity</name>
+    </entity>
+  </neonCalendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
index 0dc789214fb90fd1cc60f2d8e83b7c6862ed7e7e..aed93b8da3aa895422ae40f41b66bdd50f0d3bdd 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <indexSearchRibbon>
-    <name>indexSearchRibbon</name>
-    <ribbonTasks>
-      <ribbonTask>
-        <name>TASK_INDEXSEARCH</name>
-      </ribbonTask>
-    </ribbonTasks>
-  </indexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <indexSearchRibbon>
+    <name>indexSearchRibbon</name>
+    <ribbonTasks>
+      <ribbonTask>
+        <name>TASK_INDEXSEARCH</name>
+      </ribbonTask>
+    </ribbonTasks>
+  </indexSearchRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
index 3af3e141c0620c42cc92bee49e58870fcb1bf5c8..45edac7e715795520238ce9f82aca48008dee834 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <neonIndexSearchRibbon>
-    <name>neonIndexSearchRibbon</name>
-  </neonIndexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <neonIndexSearchRibbon>
+    <name>neonIndexSearchRibbon</name>
+  </neonIndexSearchRibbon>
+</application>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 8a294e75b5d47d36d8173564d182c06533dde849..3ba0c8cf84f5f8d1634d4335768cfd1ce0fa36d1 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,161 +1,162 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-          <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>
-          <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>
-          <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>
-          <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>
-      <isFilterable v="true" />
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+          <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>
+          <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>
+          <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>
+          <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>
+      <isFilterable v="true" />
+      <isRequireContainerFiltering v="true" />
+      <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/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index e82563d8d0d7b2bcd7038236f1ccdeec286c6f26..42ddc44f1ea7c4a54b2afc944bff3cfd6496855a 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -11,17 +11,18 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
     
     var active;
     var selectMap = ContextUtils.getSelectMap ()
-    if(vars.exists("$local.userfilter") && vars.get("$local.userfilter") )
+    if(vars.exists("$local.filter") && vars.get("$local.filter") )
     {
-        var filter = JSON.parse(vars.getString("$local.userfilter"));
-        if(filter.childs != null && filter.childs.length > 0)
-        {
-            filter.childs.forEach(function(child)
+        var filter = vars.get("$local.filter");
+        if (filter.filter)
+            if(filter.childs != null && filter.childs.length > 0)
             {
-                if(child.name === "ACTIVE")
-                    active = child.key;
-            });  
-        }  
+                filter.childs.forEach(function(child)
+                {
+                    if(child.name === "ACTIVE")
+                        active = child.key;
+                });  
+            }  
     }
     
     var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 96b5f9bec75d0d9c349a012e686f91ace69e613e..3b7de486467a5725013ce626a2acdd24fe9ccd75 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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 0c36c05424a98c91b6672d166c0f058b32aad84d..8b3f20d69f434693777219a1d1fbc8e79a244b78 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,521 +1,531 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <onValidation>%aditoprj%/entity/Activity_entity/entityfields/entrydate/onValidation.js</onValidation>
-    </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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ENTRYDATE</name>
+      <title>Entrydate</title>
+      <contentType>DATE</contentType>
+      <resolution>MINUTE</resolution>
+      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+      <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Activity_entity/entityfields/entrydate/onValidation.js</onValidation>
+    </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>
+      <groupable v="true" />
+      <mandatory v="false" />
+      <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SUBJECT</name>
+      <title>Subject</title>
+      <groupable v="false" />
+      <mandatory v="true" />
+    </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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <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>
+      <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>
+      </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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+    <entityField>
+      <name>entryDateDateFormat</name>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+    </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>
+        <dbRecordFieldMapping>
+          <name>entryDateTimelineDate.value</name>
+          <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>entryDateDateFormat.value</name>
+          <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Activity_entity/entityfields/icon/valueProcess.js b/entity/Activity_entity/entityfields/icon/valueProcess.js
index 19bec4e77a8305f04a4b851908011003ffacc34e..c903657a3b96ff64d55ff833ccfff580511bd73c 100644
--- a/entity/Activity_entity/entityfields/icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/icon/valueProcess.js
@@ -11,4 +11,4 @@ if (category)
     var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(category, $KeywordRegistry.activityCategory())
     icon = keywordAttributes.defaultAvatarRepresentation;
 }
-result.string(icon || "NEON:HISTORY");
+result.string(icon || "VAADIN:HOURGLASS_END");
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index db1ed69d22949c42f33e439c7a6fe0d8b9bcb94b..db5a8afcc7b579d851781e543bca8d0b6bc83ab2 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -1,5 +1,5 @@
 import("system.vars");
 import("system.result");
 
-var category = vars.get("$field.CATEGORY.displayValue");
-result.string(vars.get("$field.SUBJECT") + (category ? " (" + category + ")" : ""));
\ No newline at end of file
+var responsible = vars.get("$field.RESPONSIBLE.displayValue");
+result.string(vars.get("$field.SUBJECT") + (responsible ? " (" + responsible + ")" : ""));
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 9e14d0b2ef2ed8f4ad75bbee6884c2d96c9bcd92..2d7d8e58d07b4b7a4e5eead6f8528736d4eade6f 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -7,15 +7,17 @@ var cond = new SqlCondition();
 if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
 {
     var rowId = vars.get("$param.RowId_param");
+    var rowIds = [rowId];
     var rowIdCond = null;
     if (vars.get("$param.ObjectId_param") == "Person")
     {
-        rowId = db.cell(SqlCondition.begin()
-            .andPrepare("CONTACT.CONTACTID", rowId)
-            .buildSql("select PERSON_ID from CONTACT", "1 = 2"))
-        rowIdCond = "# in (select CONTACTID from CONTACT where PERSON_ID = ?)";
+        rowIds = db.array(db.COLUMN, SqlCondition.begin()
+                                                 .andPrepare("CONTACT.CONTACTID", rowId)
+                                                 .buildSql("select CONTACT.CONTACTID \n\
+                                                            from CONTACT \n\
+                                                            where CONTACT.PERSON_ID = (select CONTACT.PERSON_ID from CONTACT", null, ")"));
     }
-    var activityLinkCond = SqlCondition.begin().andPrepare("ACTIVITYLINK.OBJECT_ROWID", rowId, rowIdCond)
+    var activityLinkCond = SqlCondition.begin().and("ACTIVITYLINK.OBJECT_ROWID in ('" + rowIds.join(", ") + "')")
                                                .andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
 
                                                             // TODO: more performant way than IN. Maybe a join??
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index ef6e5ee7a508f53812e12d8d97b24dd7012bbfff..30b60b15c6ce5256a35301946016f34bcc86905a 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 ef443c249bbff1f3ca8575c93f77a8b1176dceb3..d5a91a79eb2c1c02f99df8a49b3f66ab37917940 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,162 +1,163 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+      <isFilterable v="true" />
+      <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/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index 10dfbbe0dde27a43332b86932b0e18102495a99e..70bcb62de39fd2d5e04dcdaf5f8bc1689a1342bf 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -12,9 +12,10 @@ if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
 
 // get the value typed by the user
 var filter = "";
-var sysFilter = vars.getString("$sys.filter");
-if(sysFilter.filter != null) {
-    filter = sysFilter.filter.childs[0].value;
+var localFilter = vars.get("$local.filter");
+
+if(localFilter.filter != null) {
+    filter = localFilter.filter.childs[0].value;
 }
 
 if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index a0a7f3e02d0852fb915ddecc5d617691a3b1764d..39ceccae11503adb411eb47d5b1a7d49c0a577cf 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,458 +1,460 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-        <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>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Countries_Entity</entityName>
-        <fieldName>ISO2Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityProvider>
-      <name>OrganisationAddressesByContact</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Countries_Entity</entityName>
+        <fieldName>ISO2Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>OrganisationAddressesByContact</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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/country/displayValueProcess.js b/entity/Address_entity/entityfields/country/displayValueProcess.js
index c6d030f60a71e4901c86eaffdc717c4dfc848045..91e2f20f24cdb6b86c5f5c742fa9838037d05828 100644
--- a/entity/Address_entity/entityfields/country/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/country/displayValueProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.result");
-import("Country_lib");
-
-//TODO: temporary testing code -> will be replaced with title-mechanic
-var isoCode = vars.get("$field.COUNTRY");
-var countryName = CountryUtils.getLatinNameByIso2(isoCode);
+import("system.vars");
+import("system.result");
+import("CountryInfo_lib");
+
+//TODO: temporary testing code -> will be replaced with title-mechanic
+var isoCode = vars.get("$field.COUNTRY");
+var countryName = CountryUtils.getLatinNameByIso2(isoCode);
 result.string(countryName);
\ No newline at end of file
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 4a9c56b70ca903dbb235688eab74d40fb551961b..62353eb9b2c12fe028b9fd0b1d127256f115644a 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,37 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+    <entityActionField>
+      <name>openCalendar</name>
+    </entityActionField>
+    <entityActionField>
+      <name>openNewTasks</name>
+      <onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>openOverdueTasks</name>
+      <onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js</onActionProcess>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1dbd63270723442a80368afbf94557d6f692623
--- /dev/null
+++ b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
@@ -0,0 +1,6 @@
+import("system.db");
+import("system.neon");
+
+var taskIds = db.table("select TASKID from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER  = 'TaskStatus' and TITLE = 'new'", "Data_alias")
+
+neon.openContext("Task", "TaskFilter_view", taskIds, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b01817317225f10abbfd6d319685fa8132965a62
--- /dev/null
+++ b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.datetime");
+import("system.db");
+import("system.neon");
+import("Date_lib");
+import("Sql_lib");
+
+var overduetask = db.table(SqlCondition.begin()
+                                   .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                                   .buildSql("select TASKID from TASK", "1=2"), "Data_alias");
+
+neon.openContext("Task", "TaskFilter_view", overduetask, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index c7d45dc1020bfa7f888fd14518b862cc0108b205..212ff19be1cd95c75a03422a13372927db441c66 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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 0fd3993be38a98baa3e037462ff3ad04823e4076..876f651036d211d67853b5658c38574d98f06d21 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Objects</name>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Objects</name>
+      <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>
+      <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 4e0f3b7cf99bfe2a313b8f39815985af2e4a4b1d..78cbee09a0b4c7e088ab9d3942c2f9fecf04e9d9 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -66,7 +66,6 @@
     <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>
@@ -167,13 +166,13 @@
   <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>
+      <title>jdito</title>
+      <description></description>
       <recordFields>
         <element>UID.value</element>
         <element>ATTENDEESLENGTH.value</element>
diff --git a/entity/Appointment_entity/entityfields/attendees/valueProcess.js b/entity/Appointment_entity/entityfields/attendees/valueProcess.js
deleted file mode 100644
index bc78b4d9d3d55e3ce2a327d8c5e5fde3a0698eb6..0000000000000000000000000000000000000000
--- a/entity/Appointment_entity/entityfields/attendees/valueProcess.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-import("system.result");
-
-/**
- * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
- */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-{
-    var event = JSON.parse(vars.getString("$param.Entry_param"));
-
-    if(event[calendars.AFFECTEDUSERS])
-        result.string(event[calendars.AFFECTEDUSERS]);
-}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/status/dropDownProcess.js b/entity/Appointment_entity/entityfields/status/dropDownProcess.js
index 42a85014d1701b3016bb7513e10b8a9ca43b5c16..47902887f361fe18ae37574854e5bd2a0bffa20e 100644
--- a/entity/Appointment_entity/entityfields/status/dropDownProcess.js
+++ b/entity/Appointment_entity/entityfields/status/dropDownProcess.js
@@ -1,21 +1,11 @@
-import("system.result");
-import("system.translate");
-import("system.calendars");
-
-if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS )
-{
-    result.object([ 
-            [calendars.STATUS_CONFIRMED, translate.text("Confirmed")],
-            [calendars.STATUS_TENTATIVE, translate.text("Tentative")],
-            [calendars.STATUS_CANCELLED, translate.text("Cancelled")]
-          ]);
-}
-else 
-{
-    result.object( [ 
-            //[calendars.STATUS_BUSY, translate.text("Gebucht")],
-            [calendars.STATUS_TENTATIVE, translate.text("Tentative")],
-            [calendars.STATUS_OOF, translate.text("OutOfOffice")],
-            [calendars.STATUS_FREE, translate.text("Free")] 
-          ] );
-}
\ No newline at end of file
+import("system.result");
+import("system.translate");
+import("system.calendars");
+
+result.object([ 
+        [calendars.STATUS_CONFIRMED, translate.text("Confirmed")],
+        [calendars.STATUS_CANCELLED, translate.text("Cancelled")],
+        [calendars.STATUS_TENTATIVE, translate.text("Tentative")],
+        [calendars.STATUS_OOF, translate.text("OutOfOffice")],
+        [calendars.STATUS_FREE, translate.text("Free")] 
+      ]);
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/summary/valueProcess.js b/entity/Appointment_entity/entityfields/summary/valueProcess.js
index a4d1b36dc624e960a27effba219d86929cd19927..432475ace31148f4466c021837b49896e0a6fc45 100644
--- a/entity/Appointment_entity/entityfields/summary/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/summary/valueProcess.js
@@ -12,22 +12,4 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
 
     if(event[calendars.SUMMARY])
         result.string(event[calendars.SUMMARY]);
-}
-
-
-
-//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-//{
-//    var uiVal = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SUMMARY"));
-//    var paramVal = JSON.parse(vars.getString("$param.Entry_param"))[calendars.SUMMARY];
-//    
-//    logging.log("os: " + vars.get("$sys.operatingstate"));
-//    logging.log("rs: " + vars.get("$sys.recordstate"));
-//    logging.log("paramVal: " + paramVal);
-//    logging.log("uiVal: " + uiVal);
-//    
-//    if(uiVal === paramVal || !uiVal)
-//        result.string(paramVal);
-//    else if(uiVal && !uiVal.equals(paramVal))
-//        result.string(uiVal);
-//}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index ae84c4565054abc7f4bc589d1c1033627fd86d8a..624e6ab676bde0376df0cfdd60d90280cfd596aa 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -44,19 +44,7 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
     } 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([
         [
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
index 49d8f3beef61ff3c6aaeedf862c74f89a0620438..80fb7869b5f59190558797549e7717b73da53db4 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
@@ -7,6 +7,7 @@ if (vars.exists("$param.Entry_param"))
 {
     var entry = JSON.parse(vars.getString("$param.Entry_param"));
     var reccurenceid = entry[calendars.RECURRENCEID];
-    if (reccurenceid == undefined) reccurenceid = null;
+    if (reccurenceid == undefined) 
+        reccurenceid = null;
     calendars.removeEntryByUID(calendars.VEVENT, vars.get("$sys.user"), entry[calendars.ID], reccurenceid)
 }
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
index 5c063693c6fe59f12d0b9c64fb27fbbfdb91856f..bf585bd47bf5287e395d2fd79dc758015b905c43 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
@@ -1,293 +1,293 @@
-import("system.neon");
-import("system.calendars");
-import("system.vars");
-import("system.question");
-import("system.translate");
-import("system.text");
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.tools");
-
-var event = JSON.parse(vars.getString("$param.Entry_param"));
-
-event[calendars.TYPE] = calendars.VEVENT;
-event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.
-event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
-event[calendars.STATUS] = vars.getString("$field.STATUS");
-//event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
-event[calendars.LOCATION] = vars.get("$field.LOCATION");
-event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-event[calendars.DTSTART] = vars.get("$field.BEGIN");
-event[calendars.DTEND] = vars.get("$field.END");
-event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY"); 
-event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-if(vars.get("$field.RRULE"))
-    event[calendars.RRULE] = [vars.get("$field.RRULE")];
-if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
-{
-    event[calendars.HASREMINDER] = "true";
-    event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
-}
-var idstringarray = calendars.insert([event]);
-event[calendars.ID] = idstringarray[0];
-neon.setFieldValue("$field.UID", event[calendars.ID]);
-
-vars.set("$context.editmode", calendars.MODE_UPDATE);
-
-
-
-// Liefert die Benutzer zurück, auf die keine Schreibrechte bestehen
-function getReadOnlyUser()
-{
-    var writeable = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);	
-    var affectedusers = vars.get("$context.affectedusers");
-    var readonly = new Array();
-
-    for ( i = 0; i < affectedusers.length; i++)
-    {
-        var user = affectedusers[i][0];
-        if (!isWriteable(user, writeable))
-            readonly.push(affectedusers[i][3]);
-    }	
-    return readonly;	
-}
-
-// Liefert TRUE, wenn der Benutzer bei denen mit Schreibberechtigungen enthalten ist
-function isWriteable(user, writeable)
-{
-    for (var i = 0; i < writeable.length; i++)
-    {
-        if (writeable[i][0] == calendars.getCalendarUser(user))		
-            return true;
-    }	
-    return false;
-}
-
-// Berechnet das Ende der Recurrence
-function recurrencend(event)
-{
-    var rec_end = vars.getString("$field.rec_end");
-
-    // Automatische Erkennung, was gewollt ist
-    if (rec_end == "")
-    {
-        if (vars.get("$field.rec_end_count") != "")
-            rec_end = "Endet nach Anzahl Terminen";
-        else if (vars.get("$field.rec_end_date") != "")
-            rec_end = "Endet am";
-    }
-
-    if (rec_end == "" || rec_end == "Kein Enddatum")
-    {
-    // Nichts
-    }
-    else if (rec_end == "Endet nach Anzahl Terminen")
-    {
-        event[calendars.RRULE][0] += (";COUNT=" + vars.get("$field.rec_end_count"));
-    }
-    else if (rec_end == "Endet am")
-    {
-        var dat = vars.get("$field.rec_end_date");
-        var start = vars.get("$field.start_date");
-        var localTime = datetime.toDate(dat, translate.text("yyyyMMdd")) + datetime.toDate(start, "HHmmss");
-        var utcTime = datetime.toLong(localTime, "yyyyMMddHHmmss");
-        event[calendars.RRULE][0] += (";UNTIL=" + datetime.toDate(utcTime, "yyyyMMdd\'T\'HHmmss\'Z\'", "UTC"));
-    }
-}
-
-/**
- * Berechnet die Wiederholung
- *
- * @param event Das fertige Event. Hier die Reccurrence speichern
- */
-function calcrecurrence(event)
-{
-    var rec_type = vars.get("$field.rec_type");
-
-    if (rec_type == "")
-    {
-    // Nichts
-    }
-    else if (rec_type == "Keine")
-    {
-    }
-    else if (rec_type == "Täglich")
-    {
-        rec_daily(event);
-    }
-    else if (rec_type == "Wöchentlich")
-    {
-        rec_weekly(event);
-    }
-    else if (rec_type == "Monatlich")
-    {
-        rec_monthly(event);
-    }
-    else if (rec_type == "Jährlich")
-    {
-        rec_yearly(event);
-    }
-    else
-    {
-        question.showMessage("Internal (1) " + rec_type);
-    }
-}
-/***********************/
-function rec_yearly(event)
-{
-    var rec_year = vars.get("$field.rec_yearly");
-    var rec_yearly_month = vars.get("$field.rec_yearly_month");
-    var rec_yearly_day = vars.get("$field.rec_yearly_day");
-    var month;
-    var day;
-
-    if (rec_year == "")
-    {
-        if (rec_yearly_month != "" && rec_yearly_day != "")
-            rec_year = "Jeden # #";
-        else if (rec_yearly_month != "" && vars.get("$field.rec_yearly_day2") != "" && vars.get("$field.rec_yearly_number2") != "")
-            rec_year = "Am #. # im #";
-    }
-
-    if (rec_year == "" || (rec_yearly_month == "" && rec_yearly_day == "" ))
-    {
-        question.showMessage(translate.text("yearly series not specified"));
-    }
-    else if (rec_year == "Jeden # #")
-    {
-        month = rec_yearly_month;
-        day = rec_yearly_day;
-        event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTHDAY="+day+";BYMONTH="+month);
-    }
-    else if (rec_year == "Am #. # im #")
-    {
-        month = vars.get("$field.rec_yearly_month2");
-        day = vars.get("$field.rec_yearly_day2");
-        var number = vars.get("$field.rec_yearly_number2");
-        event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTH="+month+";BYDAY="+number+day);
-    }
-}
-/***********************/
-function rec_monthly(event)
-{
-    var rec_month = vars.get("$field.rec_month");
-    var rec_monthly_day = vars.get("$field.rec_monthly_day");
-    var rec_monthly_interval = vars.get("$field.rec_monthly_interval");
-    var day;
-    var interval;
-
-    if (rec_month == "")
-
-    {
-        if (rec_monthly_day != "" && rec_monthly_interval != "")
-            rec_month = "Am #. jedes #. Monat";
-        else if (vars.get("$field.rec_monthly_day2") != "" && vars.get("$field.rec_monthly_interval2") != "" && vars.get("$field.rec_monthly_weekday2") != "")
-            rec_month = "Am #. # jeden #. Monat";
-    }
-
-    if (rec_month == "" || (rec_monthly_day == "" && rec_monthly_interval != ""))
-    {
-        question.showMessage(translate.text("Ignore series"));
-    }
-    else if (rec_month == "Am #. jedes #. Monat")
-    {
-        day = rec_monthly_day;
-        interval = rec_monthly_interval;
-        event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYMONTHDAY=" + day);
-    }
-    else if(rec_month == "Am #. # jeden #. Monat")
-    {
-        day = vars.get("$field.rec_monthly_day2");
-        interval = vars.get("$field.rec_monthly_interval2");
-        var weekday = vars.get("$field.rec_monthly_weekday2");
-        event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYDAY=" + day + weekday);
-    }
-}
-/***********************/
-function rec_weekly(event)
-{
-
-    var rec_weekly_intervall = vars.get("$field.rec_weekly_intervall");
-    if (rec_weekly_intervall == "")
-        rec_weekly_intervall = "1";
-
-    var days = new Array();
-    var count = 0;
-    if (vars.get("$field.rec_weekly_mo") == "true")
-    {
-        days[count] = "MO";
-        count++;
-    }
-    if (vars.get("$field.rec_weekly_di") == "true")
-    {
-        days[count] = "TU";
-        count++;
-    }
-    if (vars.get("$field.rec_weekly_mi") == "true")
-    {
-        days[count] = "WE";
-        count++;
-    }
-    if (vars.get("$field.rec_weekly_do") == "true")
-    {
-        days[count] = "TH";
-        count++;
-    }
-    if (vars.get("$field.rec_weekly_fr") == "true")
-    {
-        days[count] = "FR";
-        count++;
-    }
-    if (vars.get("$field.rec_weekly_sa") == "true")
-    {
-        days[count] = "SA";
-        count++;
-    }
-    if (vars.get("$field.rec_weekly_so") == "true")
-    {
-        days[count] = "SU";
-        count++;
-    }
-    if (count > 0)
-    {
-        event[calendars.RRULE] = new Array("FREQ=WEEKLY;INTERVAL=" + rec_weekly_intervall + ";WKST=MO;BYDAY=");
-        for (var i = 0; i < count; i++)
-        {
-            event[calendars.RRULE][0] += days[i];
-            if (i+1 < count)
-            {
-                event[calendars.RRULE][0] += ",";
-            }
-        }
-    }
-}
-/***********************/
-function rec_daily(event)
-{
-    var rec_dailytype = vars.get("$field.rec_dailytype");
-    var rec_dailydays = vars.get("$field.rec_daily_days");
-    if (rec_dailytype == "")
-    {
-        if (rec_dailydays != "")
-            rec_dailytype = "Alle # Tage";
-    }
-
-    if (rec_dailytype == "" || rec_dailydays == "")
-    {
-        question.showMessage(translate.text("Ignore daily series"));
-    }
-    else if (rec_dailytype == "Alle # Tage")
-    {
-        event[calendars.RRULE] = new Array("FREQ=DAILY;INTERVAL=" + rec_dailydays);
-    }
-    else if (rec_dailytype == "Jeden Arbeitstag")
-    {
-        event[calendars.RRULE][0] = new Array("FREQ=WEEKLY;WKST=MO;BYDAY=MO,TU,WE,TH,FR");
-    }
-    else
-    {
-        question.showMessage(translate.text("Internal (2)") + " " + rec_dailytype);
-    }
+import("system.neon");
+import("system.calendars");
+import("system.vars");
+import("system.question");
+import("system.translate");
+import("system.text");
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.tools");
+
+var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+event[calendars.TYPE] = calendars.VEVENT;
+event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.
+event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
+event[calendars.STATUS] = vars.getString("$field.STATUS");
+event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
+event[calendars.LOCATION] = vars.get("$field.LOCATION");
+event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
+event[calendars.DTSTART] = vars.get("$field.BEGIN");
+event[calendars.DTEND] = vars.get("$field.END");
+event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
+event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY"); 
+event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
+if(vars.get("$field.RRULE"))
+    event[calendars.RRULE] = [vars.get("$field.RRULE")];
+if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
+{
+    event[calendars.HASREMINDER] = "true";
+    event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
+}
+var idstringarray = calendars.insert([event]);
+event[calendars.ID] = idstringarray[0];
+neon.setFieldValue("$field.UID", event[calendars.ID]);
+
+vars.set("$context.editmode", calendars.MODE_UPDATE);
+
+
+
+// Liefert die Benutzer zurück, auf die keine Schreibrechte bestehen
+function getReadOnlyUser()
+{
+    var writeable = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);	
+    var affectedusers = vars.get("$context.affectedusers");
+    var readonly = new Array();
+
+    for ( i = 0; i < affectedusers.length; i++)
+    {
+        var user = affectedusers[i][0];
+        if (!isWriteable(user, writeable))
+            readonly.push(affectedusers[i][3]);
+    }	
+    return readonly;	
+}
+
+// Liefert TRUE, wenn der Benutzer bei denen mit Schreibberechtigungen enthalten ist
+function isWriteable(user, writeable)
+{
+    for (var i = 0; i < writeable.length; i++)
+    {
+        if (writeable[i][0] == calendars.getCalendarUser(user))		
+            return true;
+    }	
+    return false;
+}
+
+// Berechnet das Ende der Recurrence
+function recurrencend(event)
+{
+    var rec_end = vars.getString("$field.rec_end");
+
+    // Automatische Erkennung, was gewollt ist
+    if (rec_end == "")
+    {
+        if (vars.get("$field.rec_end_count") != "")
+            rec_end = "Endet nach Anzahl Terminen";
+        else if (vars.get("$field.rec_end_date") != "")
+            rec_end = "Endet am";
+    }
+
+    if (rec_end == "" || rec_end == "Kein Enddatum")
+    {
+    // Nichts
+    }
+    else if (rec_end == "Endet nach Anzahl Terminen")
+    {
+        event[calendars.RRULE][0] += (";COUNT=" + vars.get("$field.rec_end_count"));
+    }
+    else if (rec_end == "Endet am")
+    {
+        var dat = vars.get("$field.rec_end_date");
+        var start = vars.get("$field.start_date");
+        var localTime = datetime.toDate(dat, translate.text("yyyyMMdd")) + datetime.toDate(start, "HHmmss");
+        var utcTime = datetime.toLong(localTime, "yyyyMMddHHmmss");
+        event[calendars.RRULE][0] += (";UNTIL=" + datetime.toDate(utcTime, "yyyyMMdd\'T\'HHmmss\'Z\'", "UTC"));
+    }
+}
+
+/**
+ * Berechnet die Wiederholung
+ *
+ * @param event Das fertige Event. Hier die Reccurrence speichern
+ */
+function calcrecurrence(event)
+{
+    var rec_type = vars.get("$field.rec_type");
+
+    if (rec_type == "")
+    {
+    // Nichts
+    }
+    else if (rec_type == "Keine")
+    {
+    }
+    else if (rec_type == "Täglich")
+    {
+        rec_daily(event);
+    }
+    else if (rec_type == "Wöchentlich")
+    {
+        rec_weekly(event);
+    }
+    else if (rec_type == "Monatlich")
+    {
+        rec_monthly(event);
+    }
+    else if (rec_type == "Jährlich")
+    {
+        rec_yearly(event);
+    }
+    else
+    {
+        question.showMessage("Internal (1) " + rec_type);
+    }
+}
+/***********************/
+function rec_yearly(event)
+{
+    var rec_year = vars.get("$field.rec_yearly");
+    var rec_yearly_month = vars.get("$field.rec_yearly_month");
+    var rec_yearly_day = vars.get("$field.rec_yearly_day");
+    var month;
+    var day;
+
+    if (rec_year == "")
+    {
+        if (rec_yearly_month != "" && rec_yearly_day != "")
+            rec_year = "Jeden # #";
+        else if (rec_yearly_month != "" && vars.get("$field.rec_yearly_day2") != "" && vars.get("$field.rec_yearly_number2") != "")
+            rec_year = "Am #. # im #";
+    }
+
+    if (rec_year == "" || (rec_yearly_month == "" && rec_yearly_day == "" ))
+    {
+        question.showMessage(translate.text("yearly series not specified"));
+    }
+    else if (rec_year == "Jeden # #")
+    {
+        month = rec_yearly_month;
+        day = rec_yearly_day;
+        event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTHDAY="+day+";BYMONTH="+month);
+    }
+    else if (rec_year == "Am #. # im #")
+    {
+        month = vars.get("$field.rec_yearly_month2");
+        day = vars.get("$field.rec_yearly_day2");
+        var number = vars.get("$field.rec_yearly_number2");
+        event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTH="+month+";BYDAY="+number+day);
+    }
+}
+/***********************/
+function rec_monthly(event)
+{
+    var rec_month = vars.get("$field.rec_month");
+    var rec_monthly_day = vars.get("$field.rec_monthly_day");
+    var rec_monthly_interval = vars.get("$field.rec_monthly_interval");
+    var day;
+    var interval;
+
+    if (rec_month == "")
+
+    {
+        if (rec_monthly_day != "" && rec_monthly_interval != "")
+            rec_month = "Am #. jedes #. Monat";
+        else if (vars.get("$field.rec_monthly_day2") != "" && vars.get("$field.rec_monthly_interval2") != "" && vars.get("$field.rec_monthly_weekday2") != "")
+            rec_month = "Am #. # jeden #. Monat";
+    }
+
+    if (rec_month == "" || (rec_monthly_day == "" && rec_monthly_interval != ""))
+    {
+        question.showMessage(translate.text("Ignore series"));
+    }
+    else if (rec_month == "Am #. jedes #. Monat")
+    {
+        day = rec_monthly_day;
+        interval = rec_monthly_interval;
+        event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYMONTHDAY=" + day);
+    }
+    else if(rec_month == "Am #. # jeden #. Monat")
+    {
+        day = vars.get("$field.rec_monthly_day2");
+        interval = vars.get("$field.rec_monthly_interval2");
+        var weekday = vars.get("$field.rec_monthly_weekday2");
+        event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYDAY=" + day + weekday);
+    }
+}
+/***********************/
+function rec_weekly(event)
+{
+
+    var rec_weekly_intervall = vars.get("$field.rec_weekly_intervall");
+    if (rec_weekly_intervall == "")
+        rec_weekly_intervall = "1";
+
+    var days = new Array();
+    var count = 0;
+    if (vars.get("$field.rec_weekly_mo") == "true")
+    {
+        days[count] = "MO";
+        count++;
+    }
+    if (vars.get("$field.rec_weekly_di") == "true")
+    {
+        days[count] = "TU";
+        count++;
+    }
+    if (vars.get("$field.rec_weekly_mi") == "true")
+    {
+        days[count] = "WE";
+        count++;
+    }
+    if (vars.get("$field.rec_weekly_do") == "true")
+    {
+        days[count] = "TH";
+        count++;
+    }
+    if (vars.get("$field.rec_weekly_fr") == "true")
+    {
+        days[count] = "FR";
+        count++;
+    }
+    if (vars.get("$field.rec_weekly_sa") == "true")
+    {
+        days[count] = "SA";
+        count++;
+    }
+    if (vars.get("$field.rec_weekly_so") == "true")
+    {
+        days[count] = "SU";
+        count++;
+    }
+    if (count > 0)
+    {
+        event[calendars.RRULE] = new Array("FREQ=WEEKLY;INTERVAL=" + rec_weekly_intervall + ";WKST=MO;BYDAY=");
+        for (var i = 0; i < count; i++)
+        {
+            event[calendars.RRULE][0] += days[i];
+            if (i+1 < count)
+            {
+                event[calendars.RRULE][0] += ",";
+            }
+        }
+    }
+}
+/***********************/
+function rec_daily(event)
+{
+    var rec_dailytype = vars.get("$field.rec_dailytype");
+    var rec_dailydays = vars.get("$field.rec_daily_days");
+    if (rec_dailytype == "")
+    {
+        if (rec_dailydays != "")
+            rec_dailytype = "Alle # Tage";
+    }
+
+    if (rec_dailytype == "" || rec_dailydays == "")
+    {
+        question.showMessage(translate.text("Ignore daily series"));
+    }
+    else if (rec_dailytype == "Alle # Tage")
+    {
+        event[calendars.RRULE] = new Array("FREQ=DAILY;INTERVAL=" + rec_dailydays);
+    }
+    else if (rec_dailytype == "Jeden Arbeitstag")
+    {
+        event[calendars.RRULE][0] = new Array("FREQ=WEEKLY;WKST=MO;BYDAY=MO,TU,WE,TH,FR");
+    }
+    else
+    {
+        question.showMessage(translate.text("Internal (2)") + " " + rec_dailytype);
+    }
 }
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 8d27d2ecd0df10545a6a86554ac967a6621b8447..be2b62ca85341e0a3bd18e88b147c8e34419be45 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,283 +1,311 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <mandatory v="false" />
-      <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>
-      <mandatory v="true" />
-      <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>
-      <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>
-        <entityParameter>
-          <name>FilteredAttributeIds_param</name>
-          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>edit</name>
-          <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>
-      <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>
-        <entityDependency>
-          <name>e520143e-c72f-46e3-9c27-752471af51ae</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>AttributeConditions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>GetTree_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>FilteredAttributes_param</name>
-          <triggerRecalculation v="true" />
-        </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" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>DisplaySimpleName_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>FilteredAttributeIds_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="false" />
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>IsNew_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>AB_ATTRIBUTE_ID</name>
+      <title>Attribute</title>
+      <consumer>SpecificAttribute</consumer>
+      <mandatory v="false" />
+      <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
+      <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>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+      <title>Value</title>
+      <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
+      <resolution>DAY</resolution>
+      <mandatory v="true" />
+      <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>
+      <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>
+        <entityParameter>
+          <name>FilteredAttributeIds_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionGroup>
+      <name>alter</name>
+      <children>
+        <entityActionField>
+          <name>edit</name>
+          <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>
+      <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>fd90bd15-d9c2-4eb6-9e7f-7669fded02f6</name>
+          <entityName>Competition_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e520143e-c72f-46e3-9c27-752471af51ae</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>AttributeConditions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>fc4a1e51-6bdb-46dd-9ffc-a45480051d28</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>GetTree_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeId_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>DisplaySimpleName_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>FilteredAttributeIds_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ShowEmpty_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/showempty_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityParameter>
+      <name>AttributeId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>IsNew_param</name>
+      <expose v="true" />
+    </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/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
index c4e7e75a5f0940a6865c1acd8e6efae7e0245c99..8dbda5e2706f46ff0cb0e708726967f425660d98 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || 
-    vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
-{
-    neon.setFieldValue("$field.VALUE", null);
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || 
+    vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
+{
+    neon.setFieldValue("$field.VALUE", "");
 }
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/valueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d275fe78758974383fb7699c954e3f72cbdf5c3e
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if (vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param") && !vars.get("$this.value"))
+    result.string(vars.get("$param.AttributeId_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
index b1cc777274096f37a232e24ddde98fcffd131ee0..aa6e8903ba7a47e108b893ef2da692305e44624e 100644
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -2,12 +2,17 @@ import("ObjectRelation_lib");
 import("system.neon");
 import("system.vars");
 
-if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
-{    
-    var selectedRows = vars.get("$sys.selection");
+if (vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows").length > 0)
+{
+    var row = vars.get("$sys.selectionRows")[0];
     var params = {
         "ObjectType_param" : vars.get("$param.ObjectType_param"),
-        "ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
+        "ObjectRowId_param" : vars.get("$param.ObjectRowId_param"),
+        "AttributeId_param" : row.AB_ATTRIBUTE_ID,
+        "DisplaySimpleName_param" : vars.get("$param.DisplaySimpleName_param"),
+        "FilteredAttributeIds_param" : vars.get("$param.FilteredAttributeIds_param"),
+        "IsNew_param" : row.UID[0] == "," // if first char is "," it is a newly generated UUID
     };
-    neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [selectedRows[0]], neon.OPERATINGSTATE_EDIT, params);
+    var operatingState = row.VALUE ? neon.OPERATINGSTATE_EDIT : neon.OPERATINGSTATE_NEW;    // V--- remove "," if it exists
+    neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [row.UID[0] == "," ? row.UID.substr(1) : row.UID], operatingState, params);
 }
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/showempty_param/documentation.adoc b/entity/AttributeRelation_entity/entityfields/showempty_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c7d2d56f811ea04b533dbd597af7835ba086d446
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/showempty_param/documentation.adoc
@@ -0,0 +1,2 @@
+"true" = true
+"false" = false
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4083a55a258849748a8219bdeded41ad39f0e141
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.DisplaySimpleName_param"))
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js
index be66a14335762d314daa7d4691f93c77affd8bf0..64be4b52607b0f0b5894408abf41e6563054949b 100644
--- a/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/uid/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("system.util");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("system.util");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string("," + util.getNewUUID()); // set "," to mark this as new generated UUID
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js b/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
index a5f19038208bd277da4f987e0bb81e157910a0fe..7fff32ea3e3cd6ec08ffa32a0060f011364f857a 100644
--- a/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
@@ -1,47 +1,48 @@
-import("system.translate");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-import("Sql_lib");
-
-var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
-var attrType = AttributeUtil.getAttributeType(attributeId);
-
-if (attrType == $AttributeTypes.COMBO)
-{
-    var valueSql = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
-        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
-        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
-        .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE", "1=2", "order by SORTING asc");
-    var valueList = db.table(valueSql);
-    
-    result.object(valueList);
-}
-else if (attrType == $AttributeTypes.BOOLEAN)
-{
-    result.object([
-        ["1", translate.text("Yes")],
-        ["0", translate.text("No")]
-    ]);
-}
-
-//TODO this is a workaround for keywords, when it's possible to use the consumer remove this
-else if (attrType == $AttributeTypes.KEYWORD)
-{
-    var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
-    attrKeywordSelect = SqlCondition.begin()
-        .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
-        .buildSql(attrKeywordSelect);
-    
-    var sql = SqlCondition.begin()
-        .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", db.cell(attrKeywordSelect))
-        .buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", "1=2", "order by SORTING asc");
-    var keywords = db.table(sql).map(function (row)
-    {
-        return [row[0], translate.text(row[1])];
-    });
-    
-    result.object(keywords);
-}
\ No newline at end of file
+import("system.translate");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Sql_lib");
+
+var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
+var attrType = AttributeUtil.getAttributeType(attributeId);
+
+if (attrType == $AttributeTypes.COMBO)
+{
+    var valueSql = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
+        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
+        .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
+        .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE", "1=2", "order by SORTING asc");
+    var valueList = db.table(valueSql);
+    result.object(valueList);
+}
+else if (attrType == $AttributeTypes.BOOLEAN)
+{
+    result.object([
+        ["1", translate.text("Yes")],
+        ["0", translate.text("No")]
+    ]);
+}
+
+//TODO this is a workaround for keywords, when it's possible to use the consumer remove this
+else if (attrType == $AttributeTypes.KEYWORD)
+{
+    var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
+    attrKeywordSelect = SqlCondition.begin()
+        .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
+        .buildSql(attrKeywordSelect);
+    
+    var sql = SqlCondition.begin()
+        .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", db.cell(attrKeywordSelect))
+        .buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", "1=2", "order by SORTING asc");
+    var keywords = db.table(sql).map(function (row)
+    {
+        return [row[0], translate.text(row[1])];
+    });
+    
+    result.object(keywords);
+}
+else
+    result.object(null)
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index d5f592b517612f606c0de4566b3b5e8f802bfe43..3804e14480140e44859b3a2f277dfe564eebece7 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.util");
 import("Util_lib");
 import("system.vars");
 import("system.result");
@@ -7,44 +8,73 @@ 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");
+
+//getTree: if true, the attribute groups are loaded as parents
 var getTree = vars.exists("$param.GetTree_param") && vars.getString("$param.GetTree_param") == "true";
+
+//showEmpty: if true, all selectable attributes are loaded as records, even if they don't have a attributeRelation
+var showEmpty = vars.exists("$param.ShowEmpty_param") && vars.getString("$param.ShowEmpty_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();
+var attributeRelationJoin = "join AB_ATTRIBUTERELATION on AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID";
+var sqlCondition = new SqlCondition();
+var subCondition = new SqlCondition();
 
 if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
 {
-    var idVals = vars.get("$local.idvalues");
-    var idCond = SqlCondition.begin();
+    let idVals = vars.get("$local.idvalues");
+    let idCond = new SqlCondition();
     idVals.forEach(function (id)
     {
-        idCond.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
-    });
-    attrCond.andSqlCondition(idCond);
+        this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
+    }, subCondition);
+    sqlCondition.andSqlCondition(subCondition);
     getTree = false;
 }
-else if (rowId)
+else if (showEmpty || rowId)
 {
-    attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
-    if (objectType != null)
-        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
-    
-    if (vars.exists("$param.FilteredAttributes_param") && vars.get("$param.FilteredAttributes_param"))
+    if (showEmpty)
     {
-        var filteredIds = JSON.parse(vars.getString("$param.FilteredAttributes_param"));
-        var filteredIdsCondition = new SqlCondition();
-
-        filteredIds.forEach(function(id) 
+        let idCond = new SqlCondition();
+        let possibleAttributes = AttributeUtil.getPossibleAttributes(objectType);
+        possibleAttributes.forEach(function (attributeId)
         {
-            this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
-        }, filteredIdsCondition);
+            this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", attributeId);
+        }, idCond);
+        sqlCondition.andSqlCondition(idCond);
+        
+        attributeRelationJoin = "left " + attributeRelationJoin;
+    }
+    if (rowId)
+    {
+        subCondition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
+        if (objectType != null)
+            subCondition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+        if (subCondition.isSet())
+            attributeRelationJoin += " and " + db.translateCondition(subCondition.build("1=1"));
+        // add condition to match all returned by joins (override default 1=2 of build)
+        sqlCondition.and("1=1");
+    }
+    if (vars.exists("$param.FilteredAttributeIds_param") && vars.getString("$param.FilteredAttributeIds_param"))
+    {
+        let filteredIds = JSON.parse(vars.getString("$param.FilteredAttributeIds_param"));
 
-        attrCond.andSqlCondition(filteredIdsCondition);
+        subCondition.clear();
+        let filteredIdChildren = AttributeUtil.getAllChildren(filteredIds);
+
+        filteredIds.concat(filteredIdChildren).forEach(function(id) 
+        {
+            this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+        }, subCondition);
+    
+        // return nothing if filteredAttributeIds is an empty array. (--> and 1=2)
+        sqlCondition.andSqlCondition(subCondition, "1=2");
     }
 }
+
+//these fields are always required
 var defaultFields = [
     "AB_ATTRIBUTERELATIONID",
     "AB_ATTRIBUTE.AB_ATTRIBUTEID", 
@@ -54,12 +84,15 @@ var defaultFields = [
     "AB_ATTRIBUTE.KEYWORD_CONTAINER", 
     "COMBOVAL.ATTRIBUTE_NAME"
 ];
+//these fields hold the attributeRelation value, depending on the attribute type
 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 attributeSql = sqlCondition.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+    + " from AB_ATTRIBUTE "
+    + attributeRelationJoin
+    + " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID" //for the view value of combobox attributes
+    , "1=2"
+);
 
-var attributeNameMap = {};
 var attributeValues = db.table(attributeSql).map(function (row) 
 {
     let attributeId = row[1];
@@ -73,29 +106,37 @@ var attributeValues = db.table(attributeSql).map(function (row)
     let viewValue;
     if (row[3].trim() == $AttributeTypes.COMBO)
         viewValue = row[6];
-    else
+    else 
         viewValue = AttributeTypeUtil.getAttributeViewValue(row[3].trim(), value, row[5]);
-
-    return [row[0], row[2], value, viewValue, attributeId, attributeName];
+    
+    //TODO: what should be the uid if showEmpty is true?
+    //                 V-- set "," to mark this as new generated UUID
+    return [row[0] || "," + util.getNewUUID(), row[2], value, viewValue, attributeId, attributeName];
 });
 
+
+var parentAttributes = [];
+var attributeObj = {}; //object of attribute ids to avoid duplicates
 if (getTree)
     _fetchAttributes(attributeValues.map(function (row) {return row[1]}));
 
-allAttributes = TreeUtils.sortArrayForTree(allAttributes, 0, 1).concat(attributeValues);
+allAttributes = TreeUtils.sortArrayForTree(parentAttributes, 0, 1).concat(attributeValues);
 
 result.object(allAttributes);
 
+/*
+ * recursive function that loads all superordinate attributes for the tree
+ */
 function _fetchAttributes (pAttributeIds)
 {
-    var condition = SqlCondition.begin();
+    var sqlCondition = SqlCondition.begin();
     var nextIds = [];
     pAttributeIds.forEach(function (id)
     {
         if (!(id in this))
-            condition.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+            sqlCondition.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
     }, attributeObj);
-    db.table(condition.buildSql(sqlSelect, "1=2"))
+    db.table(sqlCondition.buildSql(sqlSelect, "1=2"))
         .forEach(function (row)
             {
                 this[row[0]] = true;
@@ -103,8 +144,8 @@ function _fetchAttributes (pAttributeIds)
                     nextIds.push(row[1]);
                 else
                     row[1] = null;
-                allAttributes.push(row);
+                parentAttributes.push(row);
             }, attributeObj);
     if (nextIds.length)
         _fetchAttributes(nextIds);
-}
\ No newline at end of file
+}
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
index eac76c1b1c707289504fde6557435408d6cb6159..63578d8119921d9ac69a4a465ba9816654e5a2f2 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
@@ -1,10 +1,10 @@
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-import("system.db");
-
-if (vars.get("$field.AB_ATTRIBUTE_ID"))
-{
-    db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
-    neon.refresh();
-}
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+
+if (vars.get("$field.AB_ATTRIBUTE_ID") && vars.get("$field.VALUE"))
+{
+    db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
+}
+neon.refresh();
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
index 283a97a64487759a7e09425fa7256a6c4d8dbc50..783ef19d531a8fd29a553d7a1bdc7ba879c3a11d 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
@@ -1,30 +1,32 @@
-import("system.datetime");
-import("system.util");
-import("system.db");
-import("system.vars");
-import("Attribute_lib");
-
-var columns = [
-    "AB_ATTRIBUTERELATIONID",
-    "AB_ATTRIBUTE_ID",
-    "OBJECT_ROWID",
-    "OBJECT_TYPE",
-    "DATE_NEW",
-    "USER_NEW"
-];
-var values = [
-    vars.get("$field.UID"),
-    vars.get("$field.AB_ATTRIBUTE_ID"),
-    vars.get("$param.ObjectRowId_param"),
-    vars.get("$param.ObjectType_param"),
-    vars.get("$field.DATE_NEW"),
-    vars.get("$field.USER_NEW")
-];
-var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var valueField = AttributeTypeUtil.getDatabaseField(type);
-if (valueField)
-{
-    columns.push(valueField);
-    values.push(vars.get("$field.VALUE"));
-}
-db.insertData("AB_ATTRIBUTERELATION", columns, null, values);
+import("system.datetime");
+import("system.util");
+import("system.db");
+import("system.vars");
+import("Attribute_lib");
+
+var columns = [
+    "AB_ATTRIBUTERELATIONID",
+    "AB_ATTRIBUTE_ID",
+    "OBJECT_ROWID",
+    "OBJECT_TYPE",
+    "DATE_NEW",
+    "USER_NEW"
+];
+
+var uid = vars.get("$field.UID");
+var values = [
+    uid[0] == "," ? uid.substr(1) : uid, // if first char is "," it is a newly generated UUID
+    vars.get("$field.AB_ATTRIBUTE_ID"),
+    vars.get("$param.ObjectRowId_param"),
+    vars.get("$param.ObjectType_param"),
+    vars.get("$field.DATE_NEW"),
+    vars.get("$field.USER_NEW")
+];
+var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
+var valueField = AttributeTypeUtil.getDatabaseField(type);
+if (valueField)
+{
+    columns.push(valueField);
+    values.push(vars.get("$field.VALUE"));
+}
+db.insertData("AB_ATTRIBUTERELATION", columns, null, values);
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
index 9a1bb128fc0ede24a0f3b52240d38fb306f0824c..134286f939f016ce74d4a051c7ce3911b233db6b 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
@@ -1,29 +1,62 @@
-import("Sql_lib");
-import("system.util");
-import("system.db");
-import("system.vars");
-import("Attribute_lib");
-
-var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-
-var columns = [
-    "AB_ATTRIBUTE_ID",
-    "DATE_EDIT",
-    "USER_EDIT"
-];
-var values = [
-    vars.get("$field.AB_ATTRIBUTE_ID"),
-    vars.get("$field.DATE_EDIT"),
-    vars.get("$field.USER_EDIT")
-];
-
-var dbFields = AttributeTypeUtil.getAllDatabaseFields();
-dbFields.forEach(function (row)
-{
-    columns.push(row);
-    values.push(""); //set every field but the correct value field to null
-});
-values[AttributeTypeUtil.getTypeColumnIndex(type) + 3] = vars.get("$field.VALUE");
-
-db.updateData("AB_ATTRIBUTERELATION", columns, null, values, 
-    SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
\ No newline at end of file
+import("Sql_lib");
+import("system.util");
+import("system.db");
+import("system.vars");
+import("Attribute_lib");
+
+var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
+var columns, values;
+
+// if first char is "," it is a newly generated UUID
+if (vars.get("$field.UID")[0] != "," && !(vars.exists("$param.IsNew_param") && vars.getString("$param.IsNew_param") == "true"))
+{
+    columns = [
+        "AB_ATTRIBUTE_ID",
+        "DATE_EDIT",
+        "USER_EDIT"
+    ];
+    values = [
+        vars.get("$field.AB_ATTRIBUTE_ID"),
+        vars.get("$field.DATE_EDIT"),
+        vars.get("$field.USER_EDIT")
+    ];
+
+    var dbFields = AttributeTypeUtil.getAllDatabaseFields();
+    dbFields.forEach(function (row)
+    {
+        columns.push(row);
+        values.push(""); //set every field but the correct value field to null
+    });
+    values[AttributeTypeUtil.getTypeColumnIndex(type) + 3] = vars.get("$field.VALUE");
+
+    db.updateData("AB_ATTRIBUTERELATION", columns, null, values, 
+        SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
+}
+else
+{
+    columns = [
+        "AB_ATTRIBUTERELATIONID",
+        "AB_ATTRIBUTE_ID",
+        "OBJECT_ROWID",
+        "OBJECT_TYPE",
+        "DATE_NEW",
+        "USER_NEW"
+    ];
+    
+    var uid = vars.get("$field.UID");
+    values = [
+        uid[0] == "," ? uid.substr(1) : uid, // if first char is "," it is a newly generated UUID
+        vars.get("$field.AB_ATTRIBUTE_ID"),
+        vars.get("$param.ObjectRowId_param"),
+        vars.get("$param.ObjectType_param"),
+        vars.get("$sys.date"),
+        vars.get("$sys.user")
+    ];
+    let valueField = AttributeTypeUtil.getDatabaseField(type);
+    if (valueField)
+    {
+        columns.push(valueField);
+        values.push(vars.get("$field.VALUE"));
+    }
+    db.insertData("AB_ATTRIBUTERELATION", columns, null, values);
+}
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 4122a456d9a41b34948536ecd701e3667abee331..7c7555009ed72a8c41bcded3c2021257cd6bc738 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,145 +1,145 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js b/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
index ee42105a132434f2c9dd6423e79700b26a560e10..75a6896220cdbe2bc6e61acee13bd616e8493252 100644
--- a/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
+++ b/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
@@ -1,15 +1,16 @@
-import("system.result");
-
-result.object([
-    "Organisation",
-    "Person",
-    "Contract",
-    "Product",
-    "Activity",
-    "Offer",
-    "Order",
-    "Employee",
-    "Salesproject",
-    "Campaign",
-    "DocumentTemplate"
+import("system.result");
+
+result.object([
+    "Organisation",
+    "Person",
+    "Contract",
+    "Product",
+    "Activity",
+    "Offer",
+    "Order",
+    "Employee",
+    "Salesproject",
+    "Campaign",
+    "DocumentTemplate",
+    "Task"
 ]);
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js b/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
index cfec392b7024d4f7c6113dfc840fb39aa8b6e96f..96735194f37f6ce825c6d1ad41109100193ae56f 100644
--- a/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
+++ b/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
@@ -1,13 +1,15 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-import("Entity_lib");
-
-var maxCount = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MAX_COUNT"));
-
-if (maxCount)
-{
-    maxCount = Number(maxCount);
-    if (maxCount <= 0 || maxCount != Math.floor(maxCount)) //when specified, max count must can't be negative, zero or not an integer
-        result.string(false);
-}
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Entity_lib");
+
+var maxCount = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MAX_COUNT"));
+
+if (maxCount)
+{
+    maxCount = Number(maxCount);
+    if (maxCount <= 0)
+        result.string(translate.text("Maximal count must be one or higher"));
+    else if (maxCount != Math.floor(maxCount))
+        result.string(translate.text("Maximal count has to be a whole number"));
+}
diff --git a/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js b/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js
index 36ddf1f1fdf60592f1f46cec7c9983495ccb9e6c..2f28221a1b6275fe7bf3dc84a2fe25b49f54f1c7 100644
--- a/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js
+++ b/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js
@@ -1,13 +1,13 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-import("Entity_lib");
-
-var minCount = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MIN_COUNT"));
-
-if (minCount)
-{
-    minCount = Number(minCount);
-    if (minCount < 0 || minCount != Math.floor(minCount)) //when specified, max count must can't be negative or not an integer
-        result.string(false);
-}
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Entity_lib");
+
+var minCount = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MIN_COUNT"));
+
+if (minCount)
+{
+    minCount = Number(minCount);
+    if (minCount < 0 || minCount != Math.floor(minCount)) //when specified, max count must can't be negative or not an integer
+        result.string(translate.text("Minimal count must be a positive whole number"));
+}
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 88efab7867d8ca9872f21cad7eb4f105a10099f9..6626c128e61aa8cab61c1b1e9c80ab078aedf0f5 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,343 +1,343 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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="false" />
-      <mandatoryProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/mandatoryProcess.js</mandatoryProcess>
-      <state>READONLY</state>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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="true" />
-          <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>
-      <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>
-          <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>
-      <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>
-      <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>
-    <entityParameter>
-      <name>AttributeTypeState_param</name>
-      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributetypestate_param/valueProcess.js</valueProcess>
-      <expose v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <isFilterable v="true" />
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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="false" />
+      <mandatoryProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/mandatoryProcess.js</mandatoryProcess>
+      <state>READONLY</state>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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="true" />
+          <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>
+      <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>
+          <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>
+      <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>
+      <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>
+    <entityParameter>
+      <name>AttributeTypeState_param</name>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributetypestate_param/valueProcess.js</valueProcess>
+      <expose v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isFilterable v="true" />
+      <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/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 6943fd238ed57ca13ea2965a89d708a06a07cf7d..07f1feb61f65e6c284ced7ec8ef5911ae7b7d397 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -48,14 +48,23 @@ else if (getGroups) //if getGroups == true, it is the lookup for selecting the s
 }
 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"))
+    var filteredAttributes = null;
+    
+    if (vars.exists("$param.FilteredAttributeIds_param") && vars.getString("$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("','") + "')");
+
+    if (ids.length > 0)
+        condition.and("SELF.AB_ATTRIBUTEID in ('" + ids.join("','") + "')");
+    else if (filteredAttributes != null) // do not return anything, if parameter is there but an empty array
+        condition.and("1=2");
+
+        
 } 
 else if (parentType)
 {
@@ -70,10 +79,11 @@ else if (parentType)
 }
 
 //when there are filters selected, add them to the conditon
-if (vars.exists("$local.userfilter") && vars.get("$local.userfilter"))
+if (vars.exists("$local.filter") && vars.get("$local.filter"))
 {
-    var filter = vars.get("$local.userfilter");
-    condition.andSqlCondition(JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE", uidTableAlias));
+    var filter = vars.get("$local.filter");
+    if (filter.filter)
+        condition.andSqlCondition(JditoFilterUtils.getSqlCondition(filter.filter, "AB_ATTRIBUTE", uidTableAlias));
 }
 
 var attributes = db.table(condition.buildSql(sqlSelect, "1=1", sqlOrder));
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index b910cd2472c59f9679610c2e444cd225a829437e..bc8a6bf18eb76769dad10d117df66119ced3374a 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,132 +1,132 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>CampaignAddParticipants_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Add participants to Campaign</title>
-  <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>Campaigns</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignStepConsumer</name>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>CampaignAddParticipants_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Add participants to Campaign</title>
+  <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>Campaigns</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignStepConsumer</name>
+      <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>
+      <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/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
index 831476ba403437a7daf461addecbe7f25adbd6a2..34147650e0d817d4b6948d420b5f59169c399c1f 100644
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
@@ -1,81 +1,73 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
-import("system.util");
-import("Campaign_lib");
-
-
-logging.log("CampaignAddPs jdito oninsert -> ");
-
-var campaignId     = vars.getString("$field.CAMPAIGN_ID");
-var newCampaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID");
-var participants   = JSON.parse(vars.getString("$param.campaignParticipants_param"));
-
-var isUpdate = vars.get("$field.isUpdate");
-logging.log("onInsert isUpdate -> " + isUpdate);
-var colNamesCampaignParticipantLog = CampaignUtils.getParticipantLogInsertColumnNames();
-
-var cols = [];
-
-if(isUpdate == "true")
-{
-    cols = [ "CAMPAIGNSTEP_ID",
-              "USER_EDIT",
-              "DATE_EDIT"
-            ];
-}
-else
-{
-    cols = [ "CAMPAIGNPARTICIPANTID"
-    ,"CONTACT_ID"
-    ,"CAMPAIGN_ID"
-    ,"CAMPAIGNSTEP_ID"
-    ,"USER_NEW"
-    ,"DATE_NEW"
-    ];
-}
-
-var statementArray = [];
-var logArray = [];
-logging.log("isUpdate -> " + isUpdate);
-for (participant in participants)
-{
-    var campaignParticipantLogId = util.getNewUUID();
-    if(isUpdate == "true")
-    {
-        let updatedValues = [newCampaignStepId,
-                        vars.get("$sys.user"),
-                        vars.get("$sys.date")];
-        
-        let condition = "CAMPAIGNPARTICIPANTID = '" + participants[participant] + "'";
-        logging.log("condition -> " + condition);
-        let valsCampaignParticipantLog = new Array(participants[participant], campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
-        
-        statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, updatedValues, condition]);
-        logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
-    }
-    else
-    {
-        let campaignParticipantId = util.getNewUUID();
-    
-        var valsCampaignParticipant = [ campaignParticipantId
-        , participants[participant]
-        , campaignId
-        , newCampaignStepId
-        , vars.get("$sys.user")
-        , vars.get("$sys.date")
-        ];
-
-        let valsCampaignParticipantLog = new Array(campaignParticipantId, campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
-
-        statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, valsCampaignParticipant]);
-        logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
-    }
-}
-
-if(isUpdate == "true")
-    db.updates(statementArray)
-else
-    db.inserts(statementArray);
-
+import("system.vars");
+import("system.db");
+import("system.util");
+import("Campaign_lib");
+
+var newCampaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID");
+var participants   = JSON.parse(vars.getString("$param.campaignParticipants_param"));
+
+var isUpdate = vars.get("$field.isUpdate");
+var colNamesCampaignParticipantLog = CampaignUtils.getParticipantLogInsertColumnNames();
+
+var cols = [];
+
+if(isUpdate == "true")
+{
+    cols = [ "CAMPAIGNSTEP_ID",
+              "USER_EDIT",
+              "DATE_EDIT"
+            ];
+}
+else
+{
+    cols = [ "CAMPAIGNPARTICIPANTID"
+    ,"CONTACT_ID"
+    ,"CAMPAIGN_ID"
+    ,"CAMPAIGNSTEP_ID"
+    ,"USER_NEW"
+    ,"DATE_NEW"
+    ];
+}
+
+var statementArray = [];
+var logArray = [];
+for (participant in participants)
+{
+    var campaignParticipantLogId = util.getNewUUID();
+    if(isUpdate == "true")
+    {
+        let updatedValues = [newCampaignStepId,
+                        vars.get("$sys.user"),
+                        vars.get("$sys.date")];
+        
+        let condition = "CAMPAIGNPARTICIPANTID = '" + participants[participant] + "'";
+        let valsCampaignParticipantLog = new Array(participants[participant], campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
+        
+        statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, updatedValues, condition]);
+        logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
+    }
+    else
+    {
+        let campaignParticipantId = util.getNewUUID();
+    
+        var valsCampaignParticipant = [ campaignParticipantId
+        , participants[participant]
+        , campaignId
+        , newCampaignStepId
+        , vars.get("$sys.user")
+        , vars.get("$sys.date")
+        ];
+
+        let valsCampaignParticipantLog = new Array(campaignParticipantId, campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
+
+        statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, valsCampaignParticipant]);
+        logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
+    }
+}
+
+if(isUpdate == "true")
+    db.updates(statementArray)
+else
+    db.inserts(statementArray);
+
 db.inserts(logArray);
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 894ac1e19542e96e60ec7114ba51870d050145f6..fa53fe187f67ca97d5889c5170841b1d1e9fc01f 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,110 +1,110 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>CampaignAnalysis_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>CampaignAnalysisProvider</name>
-      <dependencies>
-        <entityDependency>
-          <name>bd130613-f0e4-4591-8035-2c2491b08c50</name>
-          <entityName>Campaign_entity</entityName>
-          <fieldName>CampaignAnalysisConsumer</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>DateEnd_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>DateStart_param</name>
-          <expose v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>CampaignId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>VariableCosts</name>
-      <title>Variable costs</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/variablecosts/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>FixCosts</name>
-      <title>Fix costs</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/fixcosts/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>TotalCosts</name>
-      <title>Total costs</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/totalcosts/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CostsPerParticipant</name>
-      <title>Per participant</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/costsperparticipant/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>ParticipantCount</name>
-      <title>Participants</title>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/participantcount/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>RemainingRuntime</name>
-      <title>Remaining Runtime</title>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/remainingruntime/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>StepCount</name>
-      <title>Steps</title>
-      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/stepcount/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>DateStart_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>DateEnd_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>
-      </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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>CampaignAnalysis_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>CampaignAnalysisProvider</name>
+      <dependencies>
+        <entityDependency>
+          <name>bd130613-f0e4-4591-8035-2c2491b08c50</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>CampaignAnalysisConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DateEnd_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>DateStart_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>CampaignId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>VariableCosts</name>
+      <title>Variable costs</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/variablecosts/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>FixCosts</name>
+      <title>Fix costs</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/fixcosts/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TotalCosts</name>
+      <title>Total costs</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/totalcosts/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CostsPerParticipant</name>
+      <title>Per participant</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/costsperparticipant/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>ParticipantCount</name>
+      <title>Participants</title>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/participantcount/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>RemainingRuntime</name>
+      <title>Remaining Runtime</title>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/remainingruntime/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>StepCount</name>
+      <title>Steps</title>
+      <valueProcess>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/stepcount/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>DateStart_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>DateEnd_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>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/CampaignAnalysis_entity/entityfields/costsperparticipant/valueProcess.js b/entity/CampaignAnalysis_entity/entityfields/costsperparticipant/valueProcess.js
index 81ff72936b429b44c1abbab7c2042494ee81c1b3..ccd043074d5d151f5226b40cc450c4e510e13657 100644
--- a/entity/CampaignAnalysis_entity/entityfields/costsperparticipant/valueProcess.js
+++ b/entity/CampaignAnalysis_entity/entityfields/costsperparticipant/valueProcess.js
@@ -1,7 +1,4 @@
-import("system.logging");
 import("system.result");
 import("system.vars");
 
-logging.log(parseFloat(vars.getString("$field.TotalCosts")))
-logging.log(parseInt(vars.get("$field.ParticipantCount")))
 result.string(parseFloat(vars.getString("$field.TotalCosts")) / parseInt(vars.get("$field.ParticipantCount")));
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/entityfields/remainingruntime/valueProcess.js b/entity/CampaignAnalysis_entity/entityfields/remainingruntime/valueProcess.js
index c192c54243cfbf9352f12123d470e865a700f515..ea4ff36878e8b5f9fdc5a1e5f3412f5d1e6cb193 100644
--- a/entity/CampaignAnalysis_entity/entityfields/remainingruntime/valueProcess.js
+++ b/entity/CampaignAnalysis_entity/entityfields/remainingruntime/valueProcess.js
@@ -1,6 +1,5 @@
 import("Date_lib");
 import("system.datetime");
-import("system.logging");
 import("system.vars");
 import("system.result");
 
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 95770904f654e8de0063ac4c0ddf2fbf40cb3a4c..8984c285025ea2d4fb0567b46e4b6736ebf86402 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,55 +1,55 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 c5a3fec72fd1d9fdb0bb25964ed9e32740b035e3..d9a2ce1fd50e6d4be30dbb0dce3ef70407d0300f 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>Campaigns</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignStep_entity</entityName>
-        <fieldName>CampaignSteps</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordCampaignManagementCostCategory</name>
-      <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>
-          <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>Campaigns</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignStep_entity</entityName>
+        <fieldName>CampaignSteps</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>campaignId_param</name>
+          <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordCampaignManagementCostCategory</name>
+      <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>
+          <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 8128f0a850f05f40cefb1c9fc380be3e6075efac..ab3bc0e79fc9266dd397861c10edc3ea80194b06 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>CampaignParticipantChart_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>ParticipantChart</name>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>CampaignParticipantChart_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>ParticipantChart</name>
+      <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/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index ee138893d9379a2a47972376aa762ef5b8c36f59..5dcd2a8ffaf74935eaa7214ee4b6200911d5b518 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,239 +1,242 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>Campaigns</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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <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>
-          <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>CampaignParticipant_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Participant</title>
+  <siblings>
+    <element>CampaignAddParticipants_entity</element>
+  </siblings>
+  <afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState>
+  <titlePlural>Participants</titlePlural>
+  <recordContainer>ParticipantsDbRecordContainer</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>CampaignParticipantsProvider</name>
+      <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>
+      <groupable v="true" />
+      <mandatory 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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>Campaigns</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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <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>
+          <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/campaign_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
index 2b4f523926b9ec4c9690d04b39c57a218cd7d63a..ef4b32c6c5801121bfac2c42c138c3b10ee5d2d9 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
@@ -1,7 +1,6 @@
-import("system.neon");
-import("system.logging");
-import("Campaign_lib");
-import("system.vars");
-
-var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
+import("system.neon");
+import("Campaign_lib");
+import("system.vars");
+
+var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
 neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js b/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js
index 5937a308883298d47b5e2feac75c30b1975f61aa..2e504d63e3b5a3f71b54b072798b3ad09c50984b 100644
--- a/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,6 +1,5 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-import("Contact_lib");
-
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
 result.string(ContactUtils.getContextByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js
index 0a6d659c6ce9833e431b4da628a05a11dcf65dd7..7a0567f685002323c521639e56667e945aa30d91 100644
--- a/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js
@@ -1,7 +1,5 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-logging.log("$param.ContactId_param -> " + vars.get("$param.ContactId_param"));
-if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+import("system.result");
+import("system.vars");
+
+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/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
index 5c0b77f8819d8c7ff522a3d6b911cd45bc6c54ce..990e188be561f4bb2b8ea73b668b16b25a65e5ab 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
@@ -1,14 +1,8 @@
-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/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
index 4711d4f3131afab1a3be94a265cfeea89650caf1..a9971811a54d5b707ba3b11b10f93682ff0ca93a 100644
--- a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
+++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
@@ -1,19 +1,18 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-var resultValue;
-if(vars.get("$param.CampaignId_param") != null && vars.get("$param.CampaignId_param") != "")
-{
-    resultValue = "CAMPAIGN_ID = '" + vars.get("$param.CampaignId_param") + "'";
-    
-    if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
-        resultValue += " AND CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-    
-    result.string(resultValue);
-}
-else if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
-    {
-        resultValue = "CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-        result.string(resultValue);
+import("system.result");
+import("system.vars");
+
+var resultValue;
+if(vars.get("$param.CampaignId_param") != null && vars.get("$param.CampaignId_param") != "")
+{
+    resultValue = "CAMPAIGN_ID = '" + vars.get("$param.CampaignId_param") + "'";
+    
+    if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
+        resultValue += " AND CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
+    
+    result.string(resultValue);
+}
+else if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
+    {
+        resultValue = "CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
+        result.string(resultValue);
     }
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 4f8be6f71cf5d11a019ff93676e643aae4da8afc..000100c0d6ab5a8301ba868675729d165f9f2ca5 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -281,7 +281,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Task_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
+        <fieldName>Tasks</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -298,7 +298,7 @@
       <name>newActivity</name>
       <title>New activity</title>
       <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
+      <iconId>VAADIN:HOURGLASS</iconId>
       <tooltip>New activity</tooltip>
       <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
     </entityActionField>
diff --git a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
index 5319bbb142e8984030083d196715c0c8571d57af..b91c3634ae7fa3229e120ed364433b3f7787b276 100644
--- a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-//For creation of new Step in CampaignMainView
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+//For creation of new Step in CampaignMainView
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
     result.string(vars.get("$param.campaignId_param"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js
index 1925acf1cecf4965abceda892b622a1b017c71df..3c2f1c06fcaf51951f47bcf15233d0571e35ea6f 100644
--- a/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js
@@ -1,6 +1,4 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-logging.log("CS_entity_CPCOnsumer_CSId_param: field.CAMPAIGNSTEPID ->" + vars.getString("$field.CAMPAIGNSTEPID"));
+import("system.result");
+import("system.vars");
+
 result.string(vars.getString("$field.CAMPAIGNSTEPID"));
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index b80eeadccf017debd5874d7211f7ab153f595162..7866082ab397d3cfa3a6d234682575cffe3a5d89 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,450 +1,451 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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" />
-    </entityField>
-    <entityField>
-      <name>NAME</name>
-      <title>Name</title>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>DATE_START</name>
-      <title>Start</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.YYYY</outputFormat>
-      <inputFormat>dd.MM.YYYY</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_END</name>
-      <title>End</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.YYYY</outputFormat>
-      <inputFormat>dd.MM.YYYY</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_end/valueProcess.js</valueProcess>
-    </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>
-      <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>
-      <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>Campaigns</name>
-      <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_entity</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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignCosts</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignCost_entity</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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignCost_entity</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>
-      <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>
-      <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>
-      <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>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>CampaignCostsChart</name>
-      <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>
-      <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>
-      <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>
-      <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>
-    <entityActionField>
-      <name>newCampaignStep</name>
-      <title>New step</title>
-      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
-      <iconId>NEON:GROUP_APPOINTMENT</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>CampaignAnalysisConsumer</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CampaignAnalysis_entity</entityName>
-        <fieldName>CampaignAnalysisProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>CampaignId_param</name>
-          <title></title>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/campaignid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>DateEnd_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/dateend_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>DateStart_param</name>
-          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/datestart_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+  <iconId>VAADIN:GROUP</iconId>
+  <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" />
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DATE_START</name>
+      <title>Start</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.YYYY</outputFormat>
+      <inputFormat>dd.MM.YYYY</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_start/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_END</name>
+      <title>End</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.YYYY</outputFormat>
+      <inputFormat>dd.MM.YYYY</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/date_end/valueProcess.js</valueProcess>
+    </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>
+      <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>
+      <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>Campaigns</name>
+      <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_entity</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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignCosts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignCost_entity</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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignCost_entity</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>
+      <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>
+      <title>Tasks</title>
+      <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Campaign_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>CampaignCostsChart</name>
+      <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>
+      <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>
+      <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>
+      <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>
+    <entityActionField>
+      <name>newCampaignStep</name>
+      <title>New step</title>
+      <onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
+      <iconId>NEON:GROUP_APPOINTMENT</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>CampaignAnalysisConsumer</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CampaignAnalysis_entity</entityName>
+        <fieldName>CampaignAnalysisProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>CampaignId_param</name>
+          <title></title>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/campaignid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DateEnd_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/dateend_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DateStart_param</name>
+          <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/datestart_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/remainingruntime/valueProcess.js b/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js
index 5764de796a52fb09f739c71f03f25e2f64c78b1a..f8e3c2a6b08b0cb958eda2019deee866cbd158bb 100644
--- a/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/remainingruntime/valueProcess.js
@@ -1,6 +1,5 @@
 import("Date_lib");
 import("system.datetime");
-import("system.logging");
 import("system.vars");
 import("system.result");
 
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 93124b690bbda207a1299f213ea0167fdf5cfb64..48a89e78e1848a7d7ea4ec6549800305ea89e945 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -4,12 +4,8 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:LIST_OL</icon>
   <title>Classification</title>
-  <grantView v="true" />
-  <grantCreate v="false" />
-  <grantUpdate v="false" />
-  <grantDelete v="false" />
+  <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
-  <usePermissions v="true" />
   <titlePlural>Classifications</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
@@ -22,14 +18,69 @@
       <consumer>KeywordClassificationTypes</consumer>
       <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js</displayValueProcess>
     </entityField>
-    <entityConsumer>
-      <name>ClassificationsAdmin</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Classification_entity</entityName>
-        <fieldName>ClassificationsAdministration</fieldName>
-      </dependency>
-    </entityConsumer>
+    <entityField>
+      <name>CLASSIFICATIONID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONSCORE_ID</name>
+      <title>Selection</title>
+      <consumer>ClassificationScores</consumer>
+      <searchable v="false" />
+      <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_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>
+    <entityField>
+      <name>CLASSIFICATIONTYPEID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONGROUP</name>
+      <contentType>TEXT</contentType>
+      <groupable v="true" />
+      <mandatoryProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
+      <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+      <searchable v="false" />
+      <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATIONTYPE_ID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js</valueProcess>
+    </entityField>
     <entityConsumer>
       <name>KeywordClassificationTypes</name>
       <dependency>
@@ -44,14 +95,68 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>ClassificationScores</name>
+      <state>EDITABLE</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ClassificationScore_entity</entityName>
+        <fieldName>ClassificationScores</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ClassificationGroup_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ClassificationTypeId_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ClassificationType_param</name>
+          <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CLASSIFICATIONTYPE</name>
+      <title>Usage</title>
+      <consumer>KeywordClassificationTypes</consumer>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <searchable v="true" />
+      <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SCORETYPE</name>
+      <title>Scoretype</title>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isFilterable v="true" />
+      <isRequireContainerFiltering v="true" />
       <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
       <recordFields>
         <element>UID.value</element>
+        <element>CLASSIFICATIONID.value</element>
+        <element>CLASSIFICATIONGROUP.value</element>
+        <element>CLASSIFICATIONSCORE_ID.value</element>
+        <element>CLASSIFICATIONTYPEID.value</element>
+        <element>CLASSIFICATIONTYPE_ID.value</element>
+        <element>OBJECT_TYPE.value</element>
+        <element>OBJECT_ROWID.value</element>
+        <element>SCORETYPE.value</element>
+        <element>CLASSIFICATIONTYPE.value</element>
       </recordFields>
     </jDitoRecordContainer>
   </recordContainers>
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5717eabb76417046c488939aadcfa7beb915dcd
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b20aec8464c2cf6ef40ac4cca818b4a99105a6f6
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js
@@ -0,0 +1,12 @@
+import("Classification_lib");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    var classificationType = vars.get("$field.CLASSIFICATIONTYPE")
+    if (classificationType)
+        result.object(ClassificationUtils.getAllGroups(classificationType, true));
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7bbc5aa02d8beaf00c4458e4297646209f00ad91
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js
@@ -0,0 +1,5 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+result.object(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationgroup/onValidation.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
similarity index 85%
rename from entity/Classification_entity/entityfields/classificationgroup/onValidation.js
rename to entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
index 92e2b5ca5600d35b28d68c43b20a43f97f5aefc3..54c0a302da1fbc5e4e536a7ffd0f80778cc1986c 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/onValidation.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js
@@ -5,7 +5,7 @@ import("system.vars");
 import("Classification_lib");
 import("Entity_lib");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
     var newGroup = ProcessHandlingUtils.getOnValidationValue();
     
diff --git a/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
similarity index 56%
rename from entity/Classification_entity/entityfields/classificationgroup/titleProcess.js
rename to entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
index 69092d7e4eb7d0499152f2b6c7f91cc0d3352e2b..de080516afe4fe1620bf99bbd2dd36fe97d7e62a 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js
@@ -3,7 +3,7 @@ import("system.translate");
 import("system.vars");
 import("system.result");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.IsAdminMode_param") && vars.exists("$param.IsAdminMode_param") == "1") 
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
 {
     result.string(translate.text("Group"));
 }
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4b352e1b6d58a78c7d1d9a1d8c6cc20df770045
--- /dev/null
+++ b/entity/ClassificationAdmin_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/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7865e4544cd6eaba5d15e15937bffca31e2675fa
--- /dev/null
+++ b/entity/ClassificationAdmin_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/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..199c2e918d4673239e59167d4b95f64bbe9a3331
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONGROUP"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d3275a8eaa916bbbb9604617cb2fb5385bc01cfe
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPE"))
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b11d099579d9bf35111e31b13a41336731c28540
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e56601c615178505648345adeb253d9b3dea9e77
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtype/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/entityfields/classificationtype/stateProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bcc88cc57c128d8971d6880133fb2584129a802e
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bccd5eb7fbb2311971da0e6ae2ed3b56ed21268
--- /dev/null
+++ b/entity/ClassificationAdmin_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/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3886bb2dbefafdfd50c83b824fe2c1efd190f31e
--- /dev/null
+++ b/entity/ClassificationAdmin_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("$sys.recordstate") == neon.OPERATINGSTATE_NEW) && !vars.get("$this.value"))
+{
+    result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16c47d8b58490ac63829673a531ffce4e6896745
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    var newId = util.getNewUUID();
+    result.string(newId);
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d15a596ff1090502ac8cd6afd63e12893ce05625
--- /dev/null
+++ b/entity/ClassificationAdmin_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/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b532aa65a135891c68363e05f02e3420967f409a
--- /dev/null
+++ b/entity/ClassificationAdmin_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/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5717eabb76417046c488939aadcfa7beb915dcd
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/grantDeleteProcess.js b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a0202d0b06e410bc42a2aa04aef955c32e8c6e5
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/grantDeleteProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+result.object(parseInt(db.cell(SqlCondition.begin()
+                        .andPrepare("CLASSIFICATION.CLASSIFICATIONTYPE_ID", vars.get("$field.CLASSIFICATIONTYPEID"))
+                        .buildSql("select count(*) from CLASSIFICATION", "1=2"))) <= 0);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
index 04f641a1be6f91691b20d0f11cfe4edc4a818fc3..ce320096bfa92f4c1ea28d16935cc21f2886749a 100644
--- a/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,49 @@
-import("system.result");
+import("JditoFilter_lib");
+import("Classification_lib");
+import("system.vars");
+import("Sql_lib");
 import("system.db");
+import("system.result");
+
+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 (vars.exists("$local.filter") && vars.get("$local.filter"))
+{
+    var filter = vars.get("$local.filter");
+    if (filter.filter)
+        cond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter.filter, "CLASSIFICATION", undefined, {
+             CLASSIFICATIONTYPE : "CLASSIFICATIONTYPE.CLASSIFICATIONTYPE"
+        })));
+}
 
-result.object([[""]]);
\ No newline at end of file
+result.object(db.table(cond.buildSql("select case when CLASSIFICATIONID is not null then 'C,' || CLASSIFICATIONID else 'T,' || CLASSIFICATIONTYPEID end, CLASSIFICATIONID, CLASSIFICATIONGROUP, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE from CLASSIFICATION \n\
+                right join CLASSIFICATIONTYPE on " + db.translateCondition(SqlCondition.begin()
+                    .and("CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID")
+                    .andPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
+                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").build()), "1=1", "order by CLASSIFICATIONGROUP asc"))
+                );
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/onDelete.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
similarity index 100%
rename from entity/Classification_entity/recordcontainers/jdito/onDelete.js
rename to entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
diff --git a/entity/Classification_entity/recordcontainers/jdito/onInsert.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
similarity index 100%
rename from entity/Classification_entity/recordcontainers/jdito/onInsert.js
rename to entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..5670bb7047472418457c8b8bee5aee74dd215a4c
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,54 @@
+import("Classification_lib");
+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);
+}
+
+// update classificationgroup-name and scoretype-name if they were changed
+changed.forEach(function(change) 
+{
+    switch (change)
+    {
+        case "CLASSIFICATIONGROUP.value":
+            var oldGroupName = ClassificationUtils.getGroupFromDb(vars.get("$field.CLASSIFICATIONTYPEID"));
+            var newGroupName = vars.get("$field.CLASSIFICATIONGROUP");
+
+            ClassificationUtils.changeGroupName(oldGroupName, newGroupName, vars.get("$field.CLASSIFICATIONTYPE"))
+        case "SCORETYPE.value":
+            var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
+            var newScoreName = vars.get("$field.SCORETYPE");
+
+            ClassificationUtils.changeScoreName(newScoreName, classificationTypeId);
+    }
+})
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 44615c3d326002f49f544f6a9a46d1cb1c662c47..e299b4b560e9249ad1bb854468aed7ddd9d40c37 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -40,14 +40,6 @@
     </entityField>
     <entityProvider>
       <name>ClassificationScores</name>
-      <dependencies>
-        <entityDependency>
-          <name>85ff242d-a743-413f-8112-6d589baa30de</name>
-          <entityName>Classification_entity</entityName>
-          <fieldName>ClassificationScores</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
       <children>
         <entityParameter>
           <name>ClassificationGroup_param</name>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 8a8420f8dd4fdaa41fb8226668245139781f5d96..6a8ce7d434c8cbb60e41959932da27c958f6def1 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,48 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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
index 254f9da9e84e6f52131ff154f74a837092ae5d9f..7bc6976a58db9b987ee7130d9886f3d71a082560 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -3,7 +3,8 @@
   <name>Classification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Classification</title>
-  <grantDeleteProcess>%aditoprj%/entity/Classification_entity/grantDeleteProcess.js</grantDeleteProcess>
+  <grantCreate v="false" />
+  <grantDelete v="false" />
   <afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
   <titlePlural>Classifications</titlePlural>
   <recordContainer>jdito</recordContainer>
@@ -14,7 +15,6 @@
     <entityField>
       <name>CLASSIFICATIONID</name>
       <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>CLASSIFICATIONSCORE_ID</name>
@@ -52,14 +52,6 @@
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
-      <children>
-        <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>
@@ -68,15 +60,13 @@
     </entityField>
     <entityField>
       <name>CLASSIFICATIONGROUP</name>
+      <title>Group name</title>
       <contentType>TEXT</contentType>
+      <groupable v="true" />
       <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
-      <dropDownProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
       <textInputAllowed v="true" />
       <searchable v="false" />
-      <groupable v="true" />
-      <titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
       <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>CLASSIFICATIONTYPE_ID</name>
@@ -99,8 +89,6 @@
     </entityField>
     <entityConsumer>
       <name>ClassificationScores</name>
-      <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>ClassificationScore_entity</entityName>
@@ -121,45 +109,17 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityActionField>
-      <name>edit</name>
-      <onActionProcess>%aditoprj%/entity/Classification_entity/entityfields/edit/onActionProcess.js</onActionProcess>
-    </entityActionField>
     <entityField>
       <name>CLASSIFICATIONTYPE</name>
       <title>Usage</title>
       <consumer>KeywordClassificationTypes</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <searchable v="true" />
-      <groupable v="true" />
       <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
     </entityField>
-    <entityProvider>
-      <name>ClassificationsAdministration</name>
-      <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>
-      </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>
@@ -200,9 +160,7 @@
       <isFilterable v="true" />
       <isRequireContainerFiltering v="true" />
       <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>
diff --git a/entity/Classification_entity/contentProcess.js b/entity/Classification_entity/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb0a011684fcc7b40aefaaac225bd985aa83c0ec
--- /dev/null
+++ b/entity/Classification_entity/contentProcess.js
@@ -0,0 +1,19 @@
+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/Classification_entity/entityfields/classificationgroup/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
index 3d98527e13ffc12e3f5bee62f5810fede3a51ffb..6a123b0685848a1f5907a935cc1a4440f1f04546 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js
@@ -1,26 +1,17 @@
-import("system.db");
-import("system.vars");
-import("system.result");
+import("Classification_lib");
 import("system.translate");
-import("Sql_lib");
-import("Classification_lib")
+import("system.result");
+import("system.vars");
 
-if (vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
-{
-    result.string(translate.text(vars.get("$this.value")));
-}
-else
+if (vars.getString("$field.CLASSIFICATIONGROUP"))
 {
-    if (vars.getString("$field.CLASSIFICATIONGROUP"))
-    {
-        var score = JSON.parse(vars.getString("$field.SCORE_RESULTS"))[vars.getString("$field.CLASSIFICATIONGROUP")];
+    var score = JSON.parse(vars.getString("$field.SCORE_RESULTS"))[vars.getString("$field.CLASSIFICATIONGROUP")];
 
-        if (!score)
-            score = 0;
-        else
-            score = parseInt(score);
+    if (!score)
+        score = 0;
+    else
+        score = parseInt(score);
 
-        result.string(translate.text(vars.get("$this.value")) + ": " + score + " " + translate.text("points") + " = " + ClassificationUtils.mapToClass(score));
+    result.string(translate.text(vars.get("$this.value")) + ": " + score + " " + translate.text("points") + " = " + ClassificationUtils.mapToClass(score));
 
-    }
 }
diff --git a/entity/Classification_entity/entityfields/classificationgroup/dropDownProcess.js b/entity/Classification_entity/entityfields/classificationgroup/dropDownProcess.js
deleted file mode 100644
index 455cfc292bc5fe32b0cf1ad7bef2b704999517dc..0000000000000000000000000000000000000000
--- a/entity/Classification_entity/entityfields/classificationgroup/dropDownProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("Classification_lib");
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.result");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.IsAdminMode_param") && vars.get("$param.IsAdminMode_param") == "1")
-{
-     // use param if available or current selectionRows
-    var classificationType =  vars.get("$field.CLASSIFICATIONTYPE")
-    if (classificationType)
-        result.object(ClassificationUtils.getAllGroups(classificationType, true));
-}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js b/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js
index 2fff19b7702bb8390724ad175031c22a0b7d1df9..7bbc5aa02d8beaf00c4458e4297646209f00ad91 100644
--- a/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js
+++ b/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js
@@ -2,4 +2,4 @@ import("system.neon");
 import("system.result");
 import("system.vars");
 
-result.object(vars.get("$param.IsAdminMode_param") == 1 && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT));
\ No newline at end of file
+result.object(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/edit/onActionProcess.js b/entity/Classification_entity/entityfields/edit/onActionProcess.js
deleted file mode 100644
index 8d018fd74f148d59d904106aacd47f1877ad01d5..0000000000000000000000000000000000000000
--- a/entity/Classification_entity/entityfields/edit/onActionProcess.js
+++ /dev/null
@@ -1,23 +0,0 @@
-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/points/valueProcess.js b/entity/Classification_entity/entityfields/points/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b74382810fde5dda8a728acd2e9c6ce0b1709bf
--- /dev/null
+++ b/entity/Classification_entity/entityfields/points/valueProcess.js
@@ -0,0 +1,4 @@
+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/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js b/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5632992f1eb801942517498616c86a95f49b737
--- /dev/null
+++ b/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/classid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.UID"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js b/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..098d87cfa55579898b8da11975f3fb345672247f
--- /dev/null
+++ b/entity/Classification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file
diff --git a/entity/Classification_entity/grantDeleteProcess.js b/entity/Classification_entity/grantDeleteProcess.js
deleted file mode 100644
index 9a1336d5cf503c64baa7cd083855545265a12901..0000000000000000000000000000000000000000
--- a/entity/Classification_entity/grantDeleteProcess.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.db");
-import("system.vars");
-import("Sql_lib");
-
-/*logging.log(db.cell(SqlCondition.begin()
-                        .andPrepare("CLASSIFICATION.CLASSIFICATIONTYPE_ID", vars.get("$field.CLASSIFICATIONTYPEID"))
-                        .buildSql("select count(*) from CLASSIFICATION", "1=2")))
-/*result.object(parseInt(db.cell(SqlCondition.begin()
-                        .andPrepare("CLASSIFICATION.CLASSIFICATIONTYPE_ID", vars.get("$field.CLASSIFICATIONTYPEID"))
-                        .buildSql("select count(*) from CLASSIFICATION", "1=2"))) <= 0);*/
-
-//{
-    /*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();
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
index 0fe1bb3c8113eb67c1d54c1cdf56c0cd11f73f3f..a1d32e641ea1dc629a46cb0ff9c6684834a8d10d 100644
--- a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -5,15 +5,7 @@ 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 scores = JSON.stringify(ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
 
 
 
@@ -41,28 +33,27 @@ var cond = SqlCondition.begin()
 
 if (!classificationId)
 {
-    cond.andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId);
-    
-    if(!admin)
-        cond.andSqlCondition(SqlCondition.begin().orPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
+    cond.andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
+        .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"))
+        .andSqlCondition(SqlCondition.begin().orPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param")
+                                                     .or("CLASSIFICATION.OBJECT_ROWID is null"));
 }
 
-if (vars.exists("$local.userfilter") && vars.get("$local.userfilter"))
+if (vars.exists("$local.filter") && vars.get("$local.filter"))
 {
-    var filter = vars.get("$local.userfilter");
-    cond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "CLASSIFICATION", undefined, {
-         CLASSIFICATIONTYPE : "CLASSIFICATIONTYPE.CLASSIFICATIONTYPE"
-    })));
+    var filter = vars.get("$local.filter");
+    if (filter.filter)
+        cond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter.filter, "CLASSIFICATION", undefined, {
+             CLASSIFICATIONTYPE : "CLASSIFICATIONTYPE.CLASSIFICATIONTYPE"
+        })));
 }
 
 result.object(db.table(cond.buildSql("select case when CLASSIFICATIONID is not null then 'C,' || CLASSIFICATIONID else 'T,' || CLASSIFICATIONTYPEID end, CLASSIFICATIONID, CLASSIFICATIONGROUP, CLASSIFICATIONSCORE_ID, CLASSIFICATIONTYPEID, CLASSIFICATIONTYPE_ID, OBJECT_TYPE, OBJECT_ROWID, SCORETYPE, CLASSIFICATIONTYPE.CLASSIFICATIONTYPE from CLASSIFICATION \n\
                 right join CLASSIFICATIONTYPE on " + db.translateCondition(SqlCondition.begin()
                     .and("CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPEID")
                     .andPrepareVars("CLASSIFICATION.OBJECT_TYPE", "$param.ObjectType_param")
-                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").build()), (admin ? "1=1" : "1=2"), "order by CLASSIFICATIONGROUP asc"))
+                    .andPrepareVars("CLASSIFICATION.OBJECT_ROWID", "$param.ObjectRowid_param").build()), "1=2", "order by CLASSIFICATIONGROUP asc"))
                 .map(function(pRow)
                 {
                     pRow.push(scores);
diff --git a/entity/Classification_entity/recordcontainers/jdito/onUpdate.js b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
index 3bd1eec53459f57a6efc73fb26a8c10d38dd4467..97a12f0cbc5dae32c32cb6f903e7755c3cbd878d 100644
--- a/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
@@ -33,26 +33,4 @@ else if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
     ]);
     
     neon.setFieldValue("$field.CLASSIFICATIONID", newId);
-}
-
-// update classificationgroup-name and scoretype-name if they were changed (only in admin)
-if (vars.exists("$param.IsAdminMode_param") && vars.exists("$param.IsAdminMode_param") == "1")
-{
-    changed.forEach(function(change) 
-    {
-        switch (change)
-        {
-            case "CLASSIFICATIONGROUP.value":
-                var oldGroupName = ClassificationUtils.getGroupFromDb(vars.get("$field.CLASSIFICATIONTYPEID"));
-                var newGroupName = vars.get("$field.CLASSIFICATIONGROUP");
-                
-                ClassificationUtils.changeGroupName(oldGroupName, newGroupName, vars.get("$field.CLASSIFICATIONTYPE"))
-            case "SCORETYPE.value":
-                var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
-                var newScoreName = vars.get("$field.SCORETYPE");
-                
-                ClassificationUtils.changeScoreName(newScoreName, classificationTypeId);
-        }
-    })
-    
 }
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 5a569fc9c247faf05170b2158378c53b04d81164..d3e7baff6d9e288dd6174794809630100368ed47 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,284 +1,284 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <fromClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <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>5f6cd42e-34d5-4a1c-b9f0-8c87bf914f22</name>
-          <tableName>COMMUNICATION</tableName>
-          <primaryKey>COMMUNICATIONID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>fd493a1b-3ff1-4e7e-8d21-0f9f28824e9e</name>
-          <tableName>AB_KEYWORD_ENTRY</tableName>
-          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <fromClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <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>5f6cd42e-34d5-4a1c-b9f0-8c87bf914f22</name>
+          <tableName>COMMUNICATION</tableName>
+          <primaryKey>COMMUNICATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>fd493a1b-3ff1-4e7e-8d21-0f9f28824e9e</name>
+          <tableName>AB_KEYWORD_ENTRY</tableName>
+          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </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/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/Competition_entity/Competition_entity.aod
similarity index 53%
rename from entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
rename to entity/Competition_entity/Competition_entity.aod
index 0a2e073cd784c865909b388b171b370d5da3c967..b7fac12ff2dc0f640dbf12513dd1c5e83ac32d5b 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,336 +1,399 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Competition_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Competition</title>
+  <titlePlural>Competition</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/Competition_entity/entityfields/reason/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>COMPETITIONID</name>
+      <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/competitionid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Competition_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+      <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Competition_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>State</title>
+      <consumer>KeywordStates</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Competition_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>WithPersonIdFilter</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Organisations</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>WithAttribute</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <title></title>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordWonLost</name>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_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/Competition_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordPricePolitics</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordWeaknesses</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStrenghts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPhases</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordStates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <state>DISABLED</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>FilteredAttributes_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <consumer>Contexts</consumer>
+      <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/object_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Competition_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Contexts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>Context</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Objects</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>Links</name>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>be977304-6623-42eb-a8bd-80ef43831204</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Competitions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>f9598278-9933-4976-85be-5db9c213bf6f</name>
+          <tableName>COMPETITION</tableName>
+          <primaryKey>COMPETITIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>d82df2c1-f8e7-4b78-b9d6-905ca653061c</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_CANCELLED.value</name>
+          <recordfield>COMPETITION.DATE_CANCELLED</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>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>COMPETITION.REASON</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>COMPETITION.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>COMPETITION.STATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REASON.displayValue</name>
+          <expression>%aditoprj%/entity/Competition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.displayValue</name>
+          <expression>%aditoprj%/entity/Competition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Competition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+          <recordfield>COMPETITION.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>COMPETITION.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.value</name>
+          <recordfield>COMPETITION.PHASE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.displayValue</name>
+          <expression>%aditoprj%/entity/Competition_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COMPETITIONID.value</name>
+          <recordfield>COMPETITION.COMPETITIONID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectMember_entity/conditionProcess.js b/entity/Competition_entity/conditionProcess.js
similarity index 70%
rename from entity/SalesprojectMember_entity/conditionProcess.js
rename to entity/Competition_entity/conditionProcess.js
index bfd5554266b3eafe24dfbfcaba9c62957b4b6edb..06351bcd091229f24464069f37205e1f35a7c5ee 100644
--- a/entity/SalesprojectMember_entity/conditionProcess.js
+++ b/entity/Competition_entity/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.result");
 import("Sql_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_MEMBER.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("COMPETITION.OBJECT_ROWID", "$param.ObjectRowId_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/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js b/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
similarity index 97%
rename from entity/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
rename to entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
index ed5935fc124e63ff268a7e65d5efceab70ac456e..cda204045d2aba9ae974e0ce2200ba0cc6c852c0 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
+++ b/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
@@ -1,2 +1,2 @@
-import("system.result");
+import("system.result");
 result.string(true);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js b/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
rename to entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Competition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
rename to entity/Competition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Competition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
rename to entity/Competition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/salesproject_competitionid/valueProcess.js b/entity/Competition_entity/entityfields/competitionid/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/salesproject_competitionid/valueProcess.js
rename to entity/Competition_entity/entityfields/competitionid/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/date_edit/valueProcess.js b/entity/Competition_entity/entityfields/date_edit/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/date_edit/valueProcess.js
rename to entity/Competition_entity/entityfields/date_edit/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/date_new/valueProcess.js b/entity/Competition_entity/entityfields/date_new/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/date_new/valueProcess.js
rename to entity/Competition_entity/entityfields/date_new/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js b/entity/Competition_entity/entityfields/image/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js
rename to entity/Competition_entity/entityfields/image/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordphase/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordphases/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordprice_politics/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordpricepolitics/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
similarity index 58%
rename from entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
index 038f4a4295e2517b9326f918abfcd73b80ef03f5..1f1bf71aaf2db72c68e3191375bc308b1425a82c 100644
--- a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
+++ b/entity/Competition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.salesprojectMemberRole());
+result.string($KeywordRegistry.CompetitionState());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
similarity index 56%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
index 542db3e9e7ca6cd30cc2d00f8144e106e0dca2c3..520831dd08dc4cfdc01ad2894afebbc10ae421bd 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
+++ b/entity/Competition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.salesprojectCompetitionState());
\ No newline at end of file
+result.string($KeywordRegistry.CompetitionState());
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordstrenght/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordstrenghts/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordweakness/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordweaknesses/children/containername_param/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc b/entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc
rename to entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js b/entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js
rename to entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js
diff --git a/entity/Competition_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Competition_entity/entityfields/object_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b080bceea92c146a676b0f33cc7cb87d4e86b9d
--- /dev/null
+++ b/entity/Competition_entity/entityfields/object_rowid/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
+}
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/object_rowid/linkedContextProcess.js b/entity/Competition_entity/entityfields/object_rowid/linkedContextProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d868fe097f20bc5d880af358b27fdea7a2c86063
--- /dev/null
+++ b/entity/Competition_entity/entityfields/object_rowid/linkedContextProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getContextName(vars.get("$field.OBJECT_TYPE")))
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/object_rowid/valueProcess.js b/entity/Competition_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09d845d6f59f097036ad418f74975808ec568bb6
--- /dev/null
+++ b/entity/Competition_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
+    result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/object_type/displayValueProcess.js b/entity/Competition_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2965221e0b08ec642696f69eb7ed11d3ceb692cd
--- /dev/null
+++ b/entity/Competition_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
+}
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/object_type/valueProcess.js b/entity/Competition_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..61217a860a68a18029aaea234356d5bd53065727
--- /dev/null
+++ b/entity/Competition_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+    
+if(vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
+    result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/Competition_entity/entityfields/objects/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb16711d793d92bca8f72231ad9c0f745c064d
--- /dev/null
+++ b/entity/Competition_entity/entityfields/objects/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js b/entity/Competition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd3a5ec911059c8c9d275a5a4719a4e7513186ee
--- /dev/null
+++ b/entity/Competition_entity/entityfields/organisations/children/attributeid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("AttributeRegistry_basic");
+import("system.result");
+
+// Target Group (Zielgruppe)
+result.string($AttributeRegistry.targetGroup());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js b/entity/Competition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38eab4999db6394a013ac8116ec215d75c678806
--- /dev/null
+++ b/entity/Competition_entity/entityfields/organisations/children/attributekeyid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("AttributeRegistry_basic");
+import("system.result");
+
+// Competitor
+result.string($AttributeRegistry.targetGroup$competitior());
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js b/entity/Competition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..440d1dc3e611f86acd3a0720a9937ffec4d18675
--- /dev/null
+++ b/entity/Competition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+result.object(db.array(db.COLUMN, SqlCondition.begin()
+                                .andPrepare("COMPETITION.OBJECT_TYPE", vars.get("$field.OBJECT_TYPE"))
+                                .andPrepare("COMPETITION.OBJECT_ROWID", vars.get("$field.OBJECT_ROWID"))
+                                .buildSql("select CONTACT_ID from COMPETITION", "1=2")));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js b/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
similarity index 97%
rename from entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
rename to entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
index 47b950fc1ae42270522a57fb9feab4355ec2f8e6..407c679050ac9ed59599f80b339bf2c64b9e1fb2 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
+++ b/entity/Competition_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
+import("system.result");
+import("KeywordRegistry_basic");
+
 result.string($KeywordRegistry.organisationType$competitor());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js b/entity/Competition_entity/entityfields/phase/displayValueProcess.js
similarity index 97%
rename from entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
rename to entity/Competition_entity/entityfields/phase/displayValueProcess.js
index dda454b255debb87bb53efee72c90198cc1bb97e..55842533e0deab8914134336146ba8c1c722bf56 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/phase/displayValueProcess.js
+++ b/entity/Competition_entity/entityfields/phase/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js b/entity/Competition_entity/entityfields/reason/displayValueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/reason/displayValueProcess.js
rename to entity/Competition_entity/entityfields/reason/displayValueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js b/entity/Competition_entity/entityfields/status/displayValueProcess.js
similarity index 97%
rename from entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
rename to entity/Competition_entity/entityfields/status/displayValueProcess.js
index 9dd81c4237d60af093509d8e53ab69cd12dc7fc2..fbea558b6977bded361339b3e117dca75fc0a52e 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Competition_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATUS")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.get("$field.STATUS")));
diff --git a/entity/SalesprojectCompetition_entity/entityfields/user_edit/valueProcess.js b/entity/Competition_entity/entityfields/user_edit/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/user_edit/valueProcess.js
rename to entity/Competition_entity/entityfields/user_edit/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/entityfields/user_new/valueProcess.js b/entity/Competition_entity/entityfields/user_new/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/user_new/valueProcess.js
rename to entity/Competition_entity/entityfields/user_new/valueProcess.js
diff --git a/entity/SalesprojectCompetition_entity/fromClauseProcess.js b/entity/Competition_entity/fromClauseProcess.js
similarity index 50%
rename from entity/SalesprojectCompetition_entity/fromClauseProcess.js
rename to entity/Competition_entity/fromClauseProcess.js
index 5fa89155c0c694bb2ae1ccc1f14c5188e094885b..93e25f58bf5e95ba49314fa1cd20000066dac054 100644
--- a/entity/SalesprojectCompetition_entity/fromClauseProcess.js
+++ b/entity/Competition_entity/fromClauseProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 
-result.string("SALESPROJECT_COMPETITION left join CONTACT on (CONTACT.CONTACTID = SALESPROJECT_COMPETITION.CONTACT_ID) "
+result.string("COMPETITION left join CONTACT on (CONTACT.CONTACTID = COMPETITION.CONTACT_ID) "
             + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID)");
\ No newline at end of file
diff --git a/entity/Competition_entity/recordcontainers/db/conditionProcess.js b/entity/Competition_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..36a6c0309824b2784d53f43c171dd189b2ef7f5b
--- /dev/null
+++ b/entity/Competition_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,11 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = new SqlCondition();
+cond.andPrepareVars("COMPETITION.OBJECT_ROWID", "$param.ObjectRowId_param"),
+cond.andPrepareVars("COMPETITION.OBJECT_TYPE", "$param.ObjectType_param");
+
+//TODO: use a preparedCondition when available #1030812 #1034026
+
+result.string(db.translateCondition(cond.build("1 = 1")));
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js b/entity/Competition_entity/recordcontainers/db/fromClauseProcess.js
similarity index 50%
rename from entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js
rename to entity/Competition_entity/recordcontainers/db/fromClauseProcess.js
index 24a551280c717e489950414ef81eee16c3f3217d..0384058046ec3037b95e40f9517af1f0949550e8 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Competition_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 
-result.string("SALESPROJECT_COMPETITION "
-            + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = SALESPROJECT_COMPETITION.CONTACT_ID)");
\ No newline at end of file
+result.string("COMPETITION "
+            + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = COMPETITION.CONTACT_ID)");
\ No newline at end of file
diff --git a/entity/Competition_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..33554680cccd2c3d363443686457c41e0c1c5729
--- /dev/null
+++ b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
similarity index 74%
rename from entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
rename to entity/Competition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
index 37acff54f1f087b8466c73fd57cc063cb586b587..3894a404e41bb4b2304ef617278b28990508bbcc 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
+++ b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT_COMPETITION.PHASE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "COMPETITION.PHASE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
similarity index 74%
rename from entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
rename to entity/Competition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
index a2590bfa96fa9edd3731fa755fea15389de5dfac..bcd63431cb33c5f998e787ae57b30663efc9a37f 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
+++ b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESPROJECT_FORECAST.GROUPCODE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWonLost(), "COMPETITION.REASON");
 result.string(sql);
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
similarity index 73%
rename from entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
rename to entity/Competition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 588db217f864d270398ee0f75c43b0acc6d78b80..9f640f09b3b4b2a0940f32b14300ab86a3b73b32 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
+++ b/entity/Competition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWonLost(), "SALESPROJECT_COMPETITION.REASON");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.CompetitionState(), "COMPETITION.STATUS");
 result.string(sql);
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 7d99d538ff0b2e46afd27c6943d8d9b8d5d1da6f..c88cd972e0bc93b2bfe5d1b122dbe78f27c2ab1c 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,299 +1,299 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityProvider>
-      <name>PersonsContactsExceptOwn</name>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>PersonsContactsExceptOwn</name>
+      <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>
+      <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 0500eeaac603713c1df483690f4f35fd45981fa1..90c638545b2a19d9db5334f8aa75ace13ae5a865 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,116 +1,134 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <dependencies>
+        <entityDependency>
+          <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
+          <entityName>ObjectRelationType_entity</entityName>
+          <fieldName>Contexts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>209539e0-15ad-47eb-9175-a3aaa5af13fc</name>
+          <entityName>Forecast_entity</entityName>
+          <fieldName>Contexts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8183e19e-c8cc-45d8-9763-417eaeffb940</name>
+          <entityName>Competition_entity</entityName>
+          <fieldName>Contexts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4543a0ae-7bd2-4c70-8eaf-d4f32e014173</name>
+          <entityName>Member_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>
+      <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>
+      <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/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js b/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js
index e48be1dbc1467adf67d6a78c7c0674fae7364eea..fce318dabae96ead6e4051776ccb55d98bebec1a 100644
--- a/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js
+++ b/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js
@@ -1,2 +1,2 @@
 import("system.result");
-result.object(["Task", "Activity"]);
\ No newline at end of file
+result.object(["Task", "Activity", "Forecast", "Offer"]);
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js b/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js
index e48be1dbc1467adf67d6a78c7c0674fae7364eea..32756d0f3a1de5f864c921cb32147ab10e5bd3cf 100644
--- a/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js
+++ b/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js
@@ -1,2 +1,2 @@
 import("system.result");
-result.object(["Task", "Activity"]);
\ No newline at end of file
+result.object(["Task", "Activity", "Forecast"]);
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index cd20d708eb35b159535e0d7ccd961819980894b7..05cf6e5f21e0b6c7826aa775719e4d1cbca7eb83 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,484 +1,481 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>Contract_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
-  <title>Contract</title>
-  <contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
-  <afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
-  <onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:FILE_TEXT</iconId>
-  <titlePlural>Contracts</titlePlural>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityField>
-      <name>CONTRACTCODE</name>
-      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/documentation.adoc</documentation>
-      <title>Contract number</title>
-      <mandatory v="true" />
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode/valueProcess.js</valueProcess>
-      <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/onValidation.js</onValidation>
-    </entityField>
-    <entityField>
-      <name>CONTRACTDUE</name>
-      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/documentation.adoc</documentation>
-      <title>Next due date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-    </entityField>
-    <entityField>
-      <name>CONTRACTEND</name>
-      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractend/documentation.adoc</documentation>
-      <title>Contract expiry date</title>
-      <contentType>DATE</contentType>
-      <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>
-    </entityField>
-    <entityField>
-      <name>CONTRACTID</name>
-      <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractid/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTRACTSTART</name>
-      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/documentation.adoc</documentation>
-      <title>Contract start date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-      <outputFormat>dd.MM.yyyy</outputFormat>
-      <inputFormat>dd.MM.yyyy</inputFormat>
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstart/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
-    </entityField>
-    <entityField>
-      <name>CONTRACTSTATUS</name>
-      <title>${CONTRACT_STATUS}</title>
-      <consumer>ContractStates</consumer>
-      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTRACTTYPE</name>
-      <title>Type of contract</title>
-      <consumer>ContractTypes</consumer>
-      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>PAYMENT</name>
-      <title>Payment method</title>
-      <consumer>ContractPayments</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CONTACT_ID</name>
-      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contact_id/documentation.adoc</documentation>
-      <title>Connection</title>
-      <consumer>AnyContacts</consumer>
-      <linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
-      <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>REMARK</name>
-      <title>Description</title>
-      <contentType>LONG_TEXT</contentType>
-    </entityField>
-    <entityProvider>
-      <name>Contracts</name>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Contracts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>Contracts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityParameter>
-      <name>ContactId_param</name>
-      <expose v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityFieldGroup>
-      <name>CONTRACTCODE_DISPLAY_fieldGroup</name>
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js</valueProcess>
-      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/documentation.adoc</documentation>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>CONTRACTTYPE</element>
-        <element>CONTRACTCODE</element>
-      </fields>
-    </entityFieldGroup>
-    <entityConsumer>
-      <name>Activities</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Activity_entity</entityName>
-        <fieldName>LinkedObjects</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectId_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>AnyContacts</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityProvider>
-      <name>#PROVIDER</name>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>7d8f586a-3ee0-47e8-b328-3b624cf4abfa</name>
-          <entityName>Object_entity</entityName>
-          <fieldName>Contracts</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityField>
-      <name>CONTACT_ORG_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>CONTACT_PERSON_ID</name>
-      <searchable v="false" />
-    </entityField>
-    <entityConsumer>
-      <name>Documents</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>AssignmentName_param</name>
-          <triggerRecalculation v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <stateProcess>%aditoprj%/entity/Contract_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/Contract_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>AssignmentTable_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContractPayments</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContractStates</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContractTypes</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newActivity</name>
-      <title>New activity</title>
-      <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
-      <iconId>NEON:HISTORY</iconId>
-      <tooltip>New activity</tooltip>
-      <tooltipProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityConsumer>
-      <name>Attributes</name>
-      <onValidation>%aditoprj%/entity/Contract_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/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>AttributeTree</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>TreeProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Tasks</name>
-      <stateProcess>%aditoprj%/entity/Contract_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/Contract_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>RowId_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>PresetLinks_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityActionField>
-      <name>newTask</name>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>LogHistoryConsumer</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>tablenames_param</name>
-          <valueProcess>%aditoprj%/entity/Contract_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/Contract_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
-      <conditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>78925203-f1c5-4e7e-9424-1a23500c655d</name>
-          <tableName>CONTRACT</tableName>
-          <primaryKey>CONTRACTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>9ba7de4b-999c-44cc-95ee-0dbdcc35bf0f</name>
-          <tableName>ORGANISATION</tableName>
-          <primaryKey>ORGANISATIONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
-          <tableName>PERSON</tableName>
-          <primaryKey>PERSONID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>CONTRACTCODE.value</name>
-          <recordfield>CONTRACT.CONTRACTCODE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTDUE.value</name>
-          <recordfield>CONTRACT.CONTRACTDUE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTEND.value</name>
-          <recordfield>CONTRACT.CONTRACTEND</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTID.value</name>
-          <recordfield>CONTRACT.CONTRACTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTSTART.value</name>
-          <recordfield>CONTRACT.CONTRACTSTART</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTSTATUS.value</name>
-          <recordfield>CONTRACT.CONTRACTSTATUS</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTTYPE.value</name>
-          <recordfield>CONTRACT.CONTRACTTYPE</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PAYMENT.value</name>
-          <recordfield>CONTRACT.PAYMENT</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REMARK.value</name>
-          <recordfield>CONTRACT.REMARK</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_ID.value</name>
-          <recordfield>CONTRACT.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>PERSON_FIRSTNAME.value</name>
-          <recordfield>PERSON.FIRSTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PERSON_LASTNAME.value</name>
-          <recordfield>PERSON.LASTNAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PAYMENT.displayValue</name>
-          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTSTATUS.displayValue</name>
-          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTRACTTYPE.displayValue</name>
-          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Contract_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
+  <title>Contract</title>
+  <contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
+  <iconId>VAADIN:FILE_TEXT</iconId>
+  <titlePlural>Contracts</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityField>
+      <name>CONTRACTCODE</name>
+      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/documentation.adoc</documentation>
+      <title>Contract number</title>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>CONTRACTDUE</name>
+      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/documentation.adoc</documentation>
+      <title>Next due date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+    </entityField>
+    <entityField>
+      <name>CONTRACTEND</name>
+      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractend/documentation.adoc</documentation>
+      <title>Contract expiry date</title>
+      <contentType>DATE</contentType>
+      <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>
+    </entityField>
+    <entityField>
+      <name>CONTRACTID</name>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTRACTSTART</name>
+      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/documentation.adoc</documentation>
+      <title>Contract start date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstart/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>CONTRACTSTATUS</name>
+      <title>${CONTRACT_STATUS}</title>
+      <consumer>ContractStates</consumer>
+      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTRACTTYPE</name>
+      <title>Type of contract</title>
+      <consumer>ContractTypes</consumer>
+      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>PAYMENT</name>
+      <title>Payment method</title>
+      <consumer>ContractPayments</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contact_id/documentation.adoc</documentation>
+      <title>Connection</title>
+      <consumer>AnyContacts</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>REMARK</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityProvider>
+      <name>Contracts</name>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Contracts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Contracts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityFieldGroup>
+      <name>CONTRACTCODE_DISPLAY_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js</valueProcess>
+      <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/documentation.adoc</documentation>
+      <description>FIELDGROUP</description>
+      <fields>
+        <element>CONTRACTTYPE</element>
+        <element>CONTRACTCODE</element>
+      </fields>
+    </entityFieldGroup>
+    <entityConsumer>
+      <name>Activities</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AnyContacts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7d8f586a-3ee0-47e8-b328-3b624cf4abfa</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Contracts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CONTACT_ORG_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>CONTACT_PERSON_ID</name>
+      <searchable v="false" />
+    </entityField>
+    <entityConsumer>
+      <name>Documents</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+          <triggerRecalculation v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <stateProcess>%aditoprj%/entity/Contract_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/Contract_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContractPayments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContractStates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContractTypes</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity</name>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityConsumer>
+      <name>Attributes</name>
+      <onValidation>%aditoprj%/entity/Contract_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/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttributeTree</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newTask</name>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/Contract_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/Contract_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>78925203-f1c5-4e7e-9424-1a23500c655d</name>
+          <tableName>CONTRACT</tableName>
+          <primaryKey>CONTRACTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>9ba7de4b-999c-44cc-95ee-0dbdcc35bf0f</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CONTRACTCODE.value</name>
+          <recordfield>CONTRACT.CONTRACTCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTDUE.value</name>
+          <recordfield>CONTRACT.CONTRACTDUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTEND.value</name>
+          <recordfield>CONTRACT.CONTRACTEND</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTID.value</name>
+          <recordfield>CONTRACT.CONTRACTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTSTART.value</name>
+          <recordfield>CONTRACT.CONTRACTSTART</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTSTATUS.value</name>
+          <recordfield>CONTRACT.CONTRACTSTATUS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTTYPE.value</name>
+          <recordfield>CONTRACT.CONTRACTTYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PAYMENT.value</name>
+          <recordfield>CONTRACT.PAYMENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REMARK.value</name>
+          <recordfield>CONTRACT.REMARK</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>CONTRACT.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>PERSON_FIRSTNAME.value</name>
+          <recordfield>PERSON.FIRSTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_LASTNAME.value</name>
+          <recordfield>PERSON.LASTNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PAYMENT.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTSTATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTTYPE.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 7ccb88350a0cc781bebf40c76160fde5f80a678e..de41895e77da2acd91df22d3a57adfa85b3d621b 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 f6437559671db9838406c6d9c511bee0dd7fb929..c7a2f5216328a0d88dba719a5548140c4caf3b4e 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,163 +1,163 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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 3e2d8477c6612d3d731d3724009ec2ae44cc4e85..f4743d36af4e14bce0acdbe5f3203a784682ee6a 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,75 +1,75 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 14b29130e1812a715a3fdbb87c8d2779fa20f9e4..b5751c4d703293c01d3298e0ab9304592672e102 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,313 +1,317 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordDocumentTemplateType</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <onDBDelete>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>DocumentTemplates</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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordDocumentTemplateType</name>
+      <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>
+      <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>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>
+      <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>
+      <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>
+      <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>
+      <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>DocumentTemplateTexHeader</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>67f64ed9-bc92-41ba-a040-671a12b7a5f3</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>DocumentTemplateTexFooter</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>57f408e3-aeb7-4006-a20d-287dae1f0922</name>
+          <entityName>Mail_entity</entityName>
+          <fieldName>DocumentTemplates</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>
+      <onDBDelete>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <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/htmltext/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
deleted file mode 100644
index 8c4366f8e2737ea22a34dde9987a93a44b7e6fc9..0000000000000000000000000000000000000000
--- a/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("Document_lib");
-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
deleted file mode 100644
index e9a47cbe002f4596972df65dbb7708b8aa3fc17f..0000000000000000000000000000000000000000
--- a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("Document_lib");
-import("system.util");
-import("system.db");
-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/recordcontainers/db/onDBInsert.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
index 7c1f848e222a55bd225f88f236593391f33991ba..0d8f6fe0d4cb076ba62b68fbb9738d9c2ee77039 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -15,11 +15,6 @@ 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";
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
index 6f1b4b78d0896454293828f1250160c9261cfa7e..df234535f20d98c2ebfd7b18111fe4f7db44bc1d 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
@@ -14,11 +14,6 @@ if(bindataUpload != "")
     bindata = bindataUpload;
     filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
 }
-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";
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 72d558cfed4c584aa8a830d74da0b8cac0fda5b7..dfa241bdddb0fda9f3cc26a34cd0c7b85fb474f1 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,308 +1,308 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>File</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>
-          <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>Description</title>
-      <contentType>LONG_TEXT</contentType>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>KEYWORD</name>
-      <title>Keyword</title>
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/icon/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>IS_MAIN_DOCUMENT</name>
-      <title>Main document</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>
-      <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:DOWNLOAD</iconId>
-    </entityActionField>
-    <entityProvider>
-      <name>Documents</name>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>File</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>
+          <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>Description</title>
+      <contentType>LONG_TEXT</contentType>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>KEYWORD</name>
+      <title>Keyword</title>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IS_MAIN_DOCUMENT</name>
+      <title>Main document</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>
+      <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:DOWNLOAD</iconId>
+    </entityActionField>
+    <entityProvider>
+      <name>Documents</name>
+      <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>
+      <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
index d681318619470d0f1dc818a390f69ce2c57dbe85..e4e5aa2bf7054cda4e39c6cc9032bf73e5a28c81 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,69 +1,69 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>DocumentTemplates</consumer>
+      <linkedContext>DocumentTemplate</linkedContext>
+    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplates</name>
+      <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>
+      <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/recordcontainers/jdito/onInsert.js b/entity/Email_entity/recordcontainers/jdito/onInsert.js
index f838dfce9ecf292a6fa77e741074e5cd60beae8f..857bf055dd9ef564ac8a107327423919f10b0bcc 100644
--- a/entity/Email_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Email_entity/recordcontainers/jdito/onInsert.js
@@ -2,4 +2,4 @@ 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
+EmailUtils.openMailTemplate(vars.get("$field.RECIPIENT"), EmployeeUtils.getCurrentContactId(), vars.get("$field.DOCUMENT_TEMPLATE"), vars.get("$param.ContactId_param"));
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index b5be66125ef6b89914201bad1242c889fc6efff7..09fa188cf53db85de07156796bddef0a838931c2 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,59 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 007bb9031db42e3d2f6e9a72c0f5049d81038eca..bc69db9b8adad40442595fdb5f9ec2b5ee43a92d 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,292 +1,305 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <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>
-      <searchable v="false" />
-    </entityField>
-    <entityConsumer>
-      <name>EmployeeRoles</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <isFilterable v="true" />
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <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>
+      <searchable v="false" />
+    </entityField>
+    <entityConsumer>
+      <name>EmployeeRoles</name>
+      <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>
+      <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>
+      <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>
+      <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>
+        <entityDependency>
+          <name>1affaf42-1889-42d8-802a-730a83b79cc4</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ContactEditors</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>24d41887-29f4-4a3d-9a0b-063adb6603dc</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ContactRequestors</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>
+      <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>
+      <isFilterable v="true" />
+      <isSortable v="true" />
+      <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/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 396f35d1cb3918228f74c8685a93cf5a5c162a23..532462fd9108431686574a06601758644f397e11 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("Attribute_lib");
 import("system.vars");
 import("system.result");
@@ -36,12 +35,30 @@ users = users.map(function (user)
     ];
 });
 
-var filter = vars.exists("$local.userfilter") && vars.get("$local.userfilter"); 
+var filter = vars.get("$local.filter"); 
 
 //TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
-users = JditoFilterUtils.filterRecords(["UID", "TITLE", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "", "DESCRIPTION", "CONTACT_ID", "", "DEPARTMENT"], users, filter);
+users = JditoFilterUtils.filterRecords(["UID", "TITLE", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "", "DESCRIPTION", "CONTACT_ID", "", "DEPARTMENT"], users, filter.filter);
 
+var order = vars.get("$local.order");
+var columnOrder = {
+    "TITLE.value" : 1,
+    "ISACTIVE.value" : 2,
+    "FIRSTNAME.value" : 3,
+    "LASTNAME.value" : 4
+};
+var sortOrder = [];
+for (let field in order)
+{
+    if (field in columnOrder)
+    {
+        sortOrder.push(columnOrder[field]);
+        sortOrder.push(order[field] == "DOWN");
+    }
+}
+if (!sortOrder.length) //sort by login by default
+    sortOrder = [1, false];
 
-ArrayUtils.sort2d(users, 1, true, false); //sort by login (not username)
+ArrayUtils.sortMulti(users, sortOrder);
 
 result.object(users);
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8bf3ee5a9b40ab579250fcc56a46c6edca4a93da
--- /dev/null
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -0,0 +1,177 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Forecast_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/Forecast_entity/entityfields/date_start/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>GROUPCODE</name>
+      <title>Product</title>
+      <consumer>KeywordProductGroupcodes</consumer>
+      <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Info</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>FORECASTID</name>
+      <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/forecastid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+      <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+    </entityField>
+    <entityField>
+      <name>VOLUME</name>
+      <titleProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/titleProcess.js</titleProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordProductGroupcodes</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <consumer>Contexts</consumer>
+      <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Objects</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contexts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>Context</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>Links</name>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>42f3a486-1fcd-46b7-8282-e55b1c7ac965</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Forecasts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Forecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>920ae11e-ae44-400f-9df0-fa879131a05c</name>
+          <tableName>FORECAST</tableName>
+          <primaryKey>FORECASTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_START.value</name>
+          <recordfield>FORECAST.DATE_START</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODE.value</name>
+          <recordfield>FORECAST.GROUPCODE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>FORECAST.INFO</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>FORECAST.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VOLUME.value</name>
+          <recordfield>FORECAST.VOLUME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPCODE.displayValue</name>
+          <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+          <recordfield>FORECAST.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.displayValue</name>
+          <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>FORECAST.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FORECASTID.value</name>
+          <recordfield>FORECAST.FORECASTID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js b/entity/Forecast_entity/conditionProcess.js
similarity index 70%
rename from entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
rename to entity/Forecast_entity/conditionProcess.js
index bfd5554266b3eafe24dfbfcaba9c62957b4b6edb..7b8308bce5ffb288b17e60b3990202a175977090 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Forecast_entity/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.result");
 import("Sql_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_MEMBER.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("FORECAST.OBJECT_ROWID", "$param.ForecastId_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/SalesprojectForecast_entity/entityfields/date_edit/valueProcess.js b/entity/Forecast_entity/entityfields/date_edit/valueProcess.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/date_edit/valueProcess.js
rename to entity/Forecast_entity/entityfields/date_edit/valueProcess.js
diff --git a/entity/SalesprojectForecast_entity/entityfields/date_new/valueProcess.js b/entity/Forecast_entity/entityfields/date_new/valueProcess.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/date_new/valueProcess.js
rename to entity/Forecast_entity/entityfields/date_new/valueProcess.js
diff --git a/entity/Forecast_entity/entityfields/date_start/valueProcess.js b/entity/Forecast_entity/entityfields/date_start/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f7576b74fcf4e58d5a6e9b1098994ba76e9b3ef1
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/date_start/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+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/SalesprojectForecast_entity/entityfields/salesproject_forecastid/valueProcess.js b/entity/Forecast_entity/entityfields/forecastid/valueProcess.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/salesproject_forecastid/valueProcess.js
rename to entity/Forecast_entity/entityfields/forecastid/valueProcess.js
diff --git a/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js b/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js
similarity index 97%
rename from entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
rename to entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js
index aa76ca3c491c56e830b9ad158bf584d23c8e680a..b969a4ff0bee37ef3e8d525de185396c440adf25 100644
--- a/entity/SalesprojectForecast_entity/entityfields/groupcode/displayValueProcess.js
+++ b/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODE")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), vars.get("$field.GROUPCODE")));
diff --git a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js b/entity/Forecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
rename to entity/Forecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js
diff --git a/entity/Forecast_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Forecast_entity/entityfields/object_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b080bceea92c146a676b0f33cc7cb87d4e86b9d
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/object_rowid/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
+}
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js b/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d868fe097f20bc5d880af358b27fdea7a2c86063
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getContextName(vars.get("$field.OBJECT_TYPE")))
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js b/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09d845d6f59f097036ad418f74975808ec568bb6
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
+    result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js b/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2965221e0b08ec642696f69eb7ed11d3ceb692cd
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
+}
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/object_type/valueProcess.js b/entity/Forecast_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..61217a860a68a18029aaea234356d5bd53065727
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+    
+if(vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
+    result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/Forecast_entity/entityfields/objects/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb16711d793d92bca8f72231ad9c0f745c064d
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/objects/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/entityfields/salesprojectforecastdatestart/code.js b/entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/salesprojectforecastdatestart/code.js
rename to entity/Forecast_entity/entityfields/salesprojectforecastdatestart/code.js
diff --git a/entity/SalesprojectForecast_entity/entityfields/user_edit/valueProcess.js b/entity/Forecast_entity/entityfields/user_edit/valueProcess.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/user_edit/valueProcess.js
rename to entity/Forecast_entity/entityfields/user_edit/valueProcess.js
diff --git a/entity/SalesprojectForecast_entity/entityfields/user_new/valueProcess.js b/entity/Forecast_entity/entityfields/user_new/valueProcess.js
similarity index 100%
rename from entity/SalesprojectForecast_entity/entityfields/user_new/valueProcess.js
rename to entity/Forecast_entity/entityfields/user_new/valueProcess.js
diff --git a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js b/entity/Forecast_entity/entityfields/volume/titleProcess.js
similarity index 98%
rename from entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
rename to entity/Forecast_entity/entityfields/volume/titleProcess.js
index 2f7e4592c80cd966c399f5a8b8bab59257d92337..f7b76c335483a7410366d5c56db6ae8ba7917091 100644
--- a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
+++ b/entity/Forecast_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-import("system.translate");
-
+import("system.result");
+import("system.translate");
+
 result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
diff --git a/entity/Forecast_entity/recordcontainers/db/conditionProcess.js b/entity/Forecast_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a3abdf7666d4f15283c18383211a20e7272055ee
--- /dev/null
+++ b/entity/Forecast_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = SqlCondition.begin()
+                       .andPrepareVars("FORECAST.OBJECT_ROWID", "$param.ObjectRowId_param")
+                       .andPrepareVars("FORECAST.OBJECT_TYPE", "$param.ObjectType_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/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
similarity index 70%
rename from entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
rename to entity/Forecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
index 2461e0e69ccb33edd16d0eaec38b789cbce99bae..e70d6b14e1f84309e16cfd5927091272f25beec8 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectCompetitionState(), "SALESPROJECT_COMPETITION.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "FORECAST.GROUPCODE");
 result.string(sql);
diff --git a/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..33554680cccd2c3d363443686457c41e0c1c5729
--- /dev/null
+++ b/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index f3d631f4edca0ab39a7a263a1bb127dfa002ab02..96e9c514d45261a13f14d65ca91fe1f2eadcd820 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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 339a6b539a96547bf1cf0735423072651e5dadf9..6b7221e86b53e52204d3baeed9de40b2684030f5 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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 2953bf104f9c5b6261d6cf77722220231060323b..357d2869de73620ba9632af6f648f8149cf9e5be 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,164 +1,164 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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 e9ac08d80eb613546f2a443424747334c44f04c6..351b8e62e9d7a0421ef1a6c4b6cd2f8234c2e7eb 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,129 +1,129 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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 6250f6b9ff9f6ed29fb4fda245c991b629416314..aa26551f378a66f0f8627850828462d9b7c58885 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,512 +1,512 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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_entity</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>
-        <entityDependency>
-          <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
-          <entityName>Classification_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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>Forecast_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>Member_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>Competition_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>Competition_entity</entityName>
+          <fieldName>KeywordWeaknesses</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
+          <entityName>Competition_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>Competition_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>Competition_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_entity</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>
+        <entityDependency>
+          <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
+          <entityName>Classification_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>
+      <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>
+      <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 5858b0c80db2bb45827cffbb85cdd385b21f155b..827791bbeb5bd3e53d5b81e6e8e42ce2baa9ab9b 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,116 +1,116 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-        <entityDependency>
-          <name>156f3abb-eef3-41a0-8bfa-aa888fe587df</name>
-          <entityName>Salutation_entity</entityName>
-          <fieldName>KeywordLanguages</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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+        <entityDependency>
+          <name>156f3abb-eef3-41a0-8bfa-aa888fe587df</name>
+          <entityName>Salutation_entity</entityName>
+          <fieldName>KeywordLanguages</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 683371f9425688d87bcfcbdd0313c6d2dc0b43ad..8a8d1cac28e178f955e33887ae613e556269004b 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,124 +1,137 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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" />
-      <isFilterable v="true" />
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>LogHistory_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Log</title>
+  <grantDelete v="false" />
+  <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>
+      <groupable v="true" />
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <title>User</title>
+      <groupable v="true" />
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+      <mandatory v="true" />
+    </entityField>
+    <entityProvider>
+      <name>LogHistoryProvider</name>
+      <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>
+    <entityActionGroup>
+      <name>Reloading_actionGroup</name>
+      <children>
+        <entityActionField>
+          <name>ReloadEntires_action</name>
+          <title>Search for new Entries</title>
+          <onActionProcess>%aditoprj%/entity/LogHistory_entity/entityfields/reloading_actiongroup/children/reloadentires_action/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:REFRESH</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isPageable v="false" />
+      <isFilterable v="true" />
+      <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/entityfields/reloading_actiongroup/children/reloadentires_action/onActionProcess.js b/entity/LogHistory_entity/entityfields/reloading_actiongroup/children/reloadentires_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..859ea6ca00cc4430746641e87e886e9c0bfa073c
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/reloading_actiongroup/children/reloadentires_action/onActionProcess.js
@@ -0,0 +1,2 @@
+import("system.neon");
+neon.refresh();
\ No newline at end of file
diff --git a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
index 7713541125bbb959381eef133508e9c7ce821cb9..0491ec44c721775ce0918ac9ec049b0d06d6f222 100644
--- a/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js
@@ -30,10 +30,11 @@ var tableNameCond = _getTableNameCondition();
 recordCond.andSqlCondition(tableNameCond);
 
 //user defined filter
-if (vars.exists("$local.userfilter") && vars.get("$local.userfilter"))
+if (vars.exists("$local.filter") && vars.get("$local.filter"))
 {
-    var filter = vars.get("$local.userfilter");
-    recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_LOGHISTORY")));
+    var filter = vars.get("$local.filter");
+    if (filter.filter)
+    recordCond.andSqlCondition((JditoFilterUtils.getSqlCondition(filter.filter, "AB_LOGHISTORY")));
 }
 
 var dataQuery = recordCond.buildSql("select AB_LOGHISTORY.DATE_NEW, AB_LOGHISTORY.USER_NEW, AB_LOGHISTORY.DESCRIPTION \n\
diff --git a/entity/Mail_entity/Mail_entity.aod b/entity/Mail_entity/Mail_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b986ba28239d31687deb82cbac971b52f7c13cd4
--- /dev/null
+++ b/entity/Mail_entity/Mail_entity.aod
@@ -0,0 +1,36 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Mail_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>DOCUMENT_TEMPLATE</name>
+      <consumer>DocumentTemplates</consumer>
+      <linkedContext>DocumentTemplate</linkedContext>
+    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <recordFields>
+        <element>UID.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/Member_entity/Member_entity.aod
similarity index 59%
rename from entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
rename to entity/Member_entity/Member_entity.aod
index bb2af03ba14a592ec5acf76e995e105a20964373..8d043c5a8a818881be86beb2e66263dcad2f3007 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,294 +1,356 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Member_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>${SALESPROJECT_MEMBER}</title>
+  <iconId>VAADIN:FILE_SOUND</iconId>
+  <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>OBJECT_ROWID</name>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Member_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+      <valueProcess>%aditoprj%/entity/Member_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>MEMBERID</name>
+      <valueProcess>%aditoprj%/entity/Member_entity/entityfields/memberid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ROLE</name>
+      <title>Role</title>
+      <consumer>KeywordMemberRoles</consumer>
+      <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contact</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Member_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/Member_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/Member_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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contacts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordMemberRoles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>TARGETCONTEXT</name>
+      <valueProcess>%aditoprj%/entity/Member_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>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <consumer>Contexts</consumer>
+      <valueProcess>%aditoprj%/entity/Member_entity/entityfields/object_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Objects</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Member_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contexts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>Context</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>Links</name>
+      <targetContextField>TARGETCONTEXT</targetContextField>
+      <targetIdField>CONTACT_ID</targetIdField>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>df6a9a25-f787-41f6-877b-c8e3cbbdc6be</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Members</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Member_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DECIDER</name>
+      <title>Decision maker</title>
+      <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/Member_entity/entityfields/decider/dropDownProcess.js</dropDownProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/Member_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Member_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>dc8d3e38-dd0c-49e1-8665-695e5fd61025</name>
+          <tableName>ORGANISATION</tableName>
+          <primaryKey>ORGANISATIONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>85c0ae33-0713-4413-aaef-6b0c39b70973</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>2ee2e445-6b7f-4d22-9a83-1b175ad0acc9</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>3d675008-56dc-4c91-90c9-7664dccddbb4</name>
+          <tableName>MEMBER</tableName>
+          <primaryKey>MEMBERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </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>MEMBER.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ROLE.value</name>
+          <recordfield>MEMBER.ROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RELATIONSHIP.value</name>
+          <recordfield>MEMBER.RELATIONSHIP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_RELATIONSHIP.value</name>
+          <recordfield>CONTACT.RELATIONSHIP</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECT_ROLE.displayValue</name>
+          <expression>%aditoprj%/entity/Member_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>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+          <recordfield>MEMBER.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>MEMBER.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MEMBERID.value</name>
+          <recordfield>MEMBER.MEMBERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ROLE.value</name>
+          <recordfield>MEMBER.ROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.displayValue</name>
+          <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DECIDER.value</name>
+          <recordfield>MEMBER.DECIDER</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js b/entity/Member_entity/conditionProcess.js
similarity index 61%
rename from entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
rename to entity/Member_entity/conditionProcess.js
index 647c25565dad24ef03a9efcfd30688ff06124f4f..e0f35ab06bb292e7e57bc2b43d44d96612dcfb55 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Member_entity/conditionProcess.js
@@ -3,7 +3,8 @@ import("system.result");
 import("Sql_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("MEMBER.OBJECT_ROWID", "$param.ObjectRowId_param")
+cond.andPrepareVars("MEMBER.OBJECT_TYPE", "$param.ObjectType_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/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js b/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
similarity index 59%
rename from entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
rename to entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
index 4f34874adf02c713ef4bf91664e10b946644c639..ff7a12d77a6468fc07aae82c486c7b575391d236 100644
--- a/entity/SalesprojectMember_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
+++ b/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
@@ -4,6 +4,6 @@ import("system.db");
 import("Sql_lib");
 
 result.object(db.array(db.COLUMN, SqlCondition.begin()
-                                .andPrepare("SALESPROJECT_MEMBER.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
-                                .buildSql("select CONTACT_ID from SALESPROJECT_MEMBER", "1=2")));
+                                .andPrepare("MEMBER.OBJECT_ROWID", vars.get("$field.OBJECT_ROWID"))
+                                .buildSql("select CONTACT_ID from MEMBER", "1=2")));
                      
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js b/entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js
rename to entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js b/entity/Member_entity/entityfields/date_edit/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js
rename to entity/Member_entity/entityfields/date_edit/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js b/entity/Member_entity/entityfields/date_new/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js
rename to entity/Member_entity/entityfields/date_new/valueProcess.js
diff --git a/entity/Member_entity/entityfields/decider/dropDownProcess.js b/entity/Member_entity/entityfields/decider/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b90ec712682ce323a43aa4bdb7a98ed4d68c2f8
--- /dev/null
+++ b/entity/Member_entity/entityfields/decider/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+     [true, translate.text("Yes")]
+    ,[false, translate.text("No")]
+]);
diff --git a/entity/Member_entity/entityfields/icon/valueProcess.js b/entity/Member_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..05a9a85fd7d0f67869b1d86d8c6a9f5a5a1bbeec
--- /dev/null
+++ b/entity/Member_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var role = vars.get("$field.ROLE");
+var isIntern = false, icon;
+if(role)
+{
+    var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(role, $KeywordRegistry.MemberRole())
+    if(keywordAttributes != null)
+    isIntern = keywordAttributes.Intern;
+}
+
+if(isIntern)
+    result.string("VAADIN:STAR");
+else result.string("VAADIN:AIRPLANE");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js b/entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
similarity index 56%
rename from entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
rename to entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
index d86b5c3b6fb28f749eead8761de6aa4f6266d817..f20e0079a619c5d9f637f91901c51bdbc946b754 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
+++ b/entity/Member_entity/entityfields/keywordmemberroles/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.salesprojectCompetitionState());
+result.string($KeywordRegistry.MemberRole());
diff --git a/entity/SalesprojectMember_entity/entityfields/salesproject_memberid/valueProcess.js b/entity/Member_entity/entityfields/memberid/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/salesproject_memberid/valueProcess.js
rename to entity/Member_entity/entityfields/memberid/valueProcess.js
diff --git a/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b080bceea92c146a676b0f33cc7cb87d4e86b9d
--- /dev/null
+++ b/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
+}
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/object_rowid/linkedContextProcess.js b/entity/Member_entity/entityfields/object_rowid/linkedContextProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d868fe097f20bc5d880af358b27fdea7a2c86063
--- /dev/null
+++ b/entity/Member_entity/entityfields/object_rowid/linkedContextProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getContextName(vars.get("$field.OBJECT_TYPE")))
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/object_rowid/valueProcess.js b/entity/Member_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09d845d6f59f097036ad418f74975808ec568bb6
--- /dev/null
+++ b/entity/Member_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
+    result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/object_type/displayValueProcess.js b/entity/Member_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2965221e0b08ec642696f69eb7ed11d3ceb692cd
--- /dev/null
+++ b/entity/Member_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
+}
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/object_type/valueProcess.js b/entity/Member_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..61217a860a68a18029aaea234356d5bd53065727
--- /dev/null
+++ b/entity/Member_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+    
+if(vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
+    result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/Member_entity/entityfields/objects/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb16711d793d92bca8f72231ad9c0f745c064d
--- /dev/null
+++ b/entity/Member_entity/entityfields/objects/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/pers_full_name/fieldIdProcess.js b/entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/pers_full_name/fieldIdProcess.js
rename to entity/Member_entity/entityfields/pers_full_name/fieldIdProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js b/entity/Member_entity/entityfields/person_full_name/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/person_full_name/valueProcess.js
rename to entity/Member_entity/entityfields/person_full_name/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js b/entity/Member_entity/entityfields/relationship/displayValueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
rename to entity/Member_entity/entityfields/relationship/displayValueProcess.js
diff --git a/entity/Member_entity/entityfields/role/displayValueProcess.js b/entity/Member_entity/entityfields/role/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbdef4d21bb53e36e3bc3b9f9757470915f57d4c
--- /dev/null
+++ b/entity/Member_entity/entityfields/role/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.MemberRole(), vars.get("$field.ROLE")));
diff --git a/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js b/entity/Member_entity/entityfields/targetcontext/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
rename to entity/Member_entity/entityfields/targetcontext/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js b/entity/Member_entity/entityfields/user_edit/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js
rename to entity/Member_entity/entityfields/user_edit/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js b/entity/Member_entity/entityfields/user_new/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js
rename to entity/Member_entity/entityfields/user_new/valueProcess.js
diff --git a/entity/SalesprojectMember_entity/fromClauseProcess.js b/entity/Member_entity/fromClauseProcess.js
similarity index 65%
rename from entity/SalesprojectMember_entity/fromClauseProcess.js
rename to entity/Member_entity/fromClauseProcess.js
index 93d4323cf0c7708166ac4707bf3a7f023d0e9451..edff7462ed28f71c7e85a667f69468eacf1e5af9 100644
--- a/entity/SalesprojectMember_entity/fromClauseProcess.js
+++ b/entity/Member_entity/fromClauseProcess.js
@@ -1,5 +1,5 @@
 import("system.result");
 
-result.string("SALESPROJECT_MEMBER join CONTACT on (CONTACT.CONTACTID = SALESPROJECT_MEMBER.CONTACT_ID) "
+result.string("MEMBER join CONTACT on (CONTACT.CONTACTID = MEMBER.CONTACT_ID) "
             + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
             + "left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/conditionProcess.js b/entity/Member_entity/recordcontainers/db/conditionProcess.js
similarity index 61%
rename from entity/SalesprojectForecast_entity/conditionProcess.js
rename to entity/Member_entity/recordcontainers/db/conditionProcess.js
index 647c25565dad24ef03a9efcfd30688ff06124f4f..e0f35ab06bb292e7e57bc2b43d44d96612dcfb55 100644
--- a/entity/SalesprojectForecast_entity/conditionProcess.js
+++ b/entity/Member_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,8 @@ import("system.result");
 import("Sql_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_FORECAST.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("MEMBER.OBJECT_ROWID", "$param.ObjectRowId_param")
+cond.andPrepareVars("MEMBER.OBJECT_TYPE", "$param.ObjectType_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/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js b/entity/Member_entity/recordcontainers/db/fromClauseProcess.js
similarity index 65%
rename from entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js
rename to entity/Member_entity/recordcontainers/db/fromClauseProcess.js
index 93d4323cf0c7708166ac4707bf3a7f023d0e9451..edff7462ed28f71c7e85a667f69468eacf1e5af9 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Member_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,5 +1,5 @@
 import("system.result");
 
-result.string("SALESPROJECT_MEMBER join CONTACT on (CONTACT.CONTACTID = SALESPROJECT_MEMBER.CONTACT_ID) "
+result.string("MEMBER join CONTACT on (CONTACT.CONTACTID = MEMBER.CONTACT_ID) "
             + "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
             + "left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)");
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
rename to entity/Member_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
diff --git a/entity/Member_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..33554680cccd2c3d363443686457c41e0c1c5729
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
similarity index 70%
rename from entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
rename to entity/Member_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
index 18c379f40354d3845c0987ffe926f7e9f0631476..4e07d5e1138b5fac8da6fedca2efe17c54727ec4 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
+++ b/entity/Member_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectMemberRole(), "SALESPROJECT_MEMBER.SALESPROJECT_ROLE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.MemberRole(), "MEMBER.ROLE");
 result.string(sql);
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 8d4dd6c8b3e88a7a826ec91685dd54615317b913..88302a006668e18e146e2eefd11e4202b07fac67 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,92 +1,92 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
index 38f04797f950a529ec578661fe0799238e67b9c5..c3d1948fc0f63ce91316285cc1f08f00e04a657e 100644
--- a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -136,7 +136,7 @@ function augmentData (pDataRow, pType) {
     pDataRow.splice(1, 0, pType);
     
     // Insert icon
-    pDataRow.splice(6, 0, pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "NEON:HISTORY": null);
+    pDataRow.splice(6, 0, pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "VAADIN:HOURGLASS_END": null);
     
     return pDataRow;
 }
\ No newline at end of file
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index c7fb7c75087bf2d8c881de739dba6a09bbd27135..21ab0b57cbd5ed02a5edf2647a6933a6fce198d5 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,241 +1,241 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <colorProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/colorProcess.js</colorProcess>
-      <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>
-          <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>
-          <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>
-          <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>
-      <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
-    </entityActionField>
-    <entityField>
-      <name>RESOLVEDPRIORITY</name>
-      <title>priority</title>
-      <textInputAllowed v="false" />
-    </entityField>
-  </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>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
-          <tableName>ASYS_NOTIFICATIONS</tableName>
-          <primaryKey>ID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</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>
-        <dbRecordFieldMapping>
-          <name>CALCULATEDPRIORITY.value</name>
-          <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RESOLVEDPRIORITY.value</name>
-          <recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <colorProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/colorProcess.js</colorProcess>
+      <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>
+          <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>
+          <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>
+          <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>
+      <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityField>
+      <name>RESOLVEDPRIORITY</name>
+      <title>priority</title>
+      <textInputAllowed v="false" />
+    </entityField>
+  </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>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
+          <tableName>ASYS_NOTIFICATIONS</tableName>
+          <primaryKey>ID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</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>
+        <dbRecordFieldMapping>
+          <name>CALCULATEDPRIORITY.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RESOLVEDPRIORITY.value</name>
+          <recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Notification_entity/entityfields/icon/colorProcess.js b/entity/Notification_entity/entityfields/icon/colorProcess.js
index 129bacab499ca6dc5ed540a1ec8805593b9fb492..89d4759e4bbb11d87ae8826063e73d97be17ef5d 100644
--- a/entity/Notification_entity/entityfields/icon/colorProcess.js
+++ b/entity/Notification_entity/entityfields/icon/colorProcess.js
@@ -1,6 +1,5 @@
 import("system.neon");
 import("system.vars");
-import("system.logging");
 import("system.result");
 import("system.notification");
 import("Notification_lib");
@@ -14,8 +13,6 @@ var resolvedPrio = vars.get("$field.RESOLVEDPRIORITY");
 
 if(resolvedPrio != null && resolvedPrio != "")
 {
-//    logging.log("resolvedPrio: " + resolvedPrio);
-
     switch(resolvedPrio)
     {
         case "LOW":
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 31c4696a975db671b75a327c5d1a779cf99a9aee..9dfe6d4c57ca707fc01962ebfdc41f8abd270fba 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,152 +1,152 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>Context</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityActionField>
-      <name>removeUsage</name>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>Context</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityActionField>
+      <name>removeUsage</name>
+      <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 dbf112391caf156e441dcaf6998dd38b9aa4e872..28c0346f335af0dfbf7058256009a0795495bf61 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,208 +1,208 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-          <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>
-          <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>
-      <isFilterable v="true" />
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+          <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>
+          <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>
+      <isFilterable v="true" />
+      <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/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index d94c0ac96e703f7a0495ba13066eac844918954a..e0c3a1bd09477346dc46790bf2d0cde7e34b8699 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -33,11 +33,12 @@ if (uidParam)
 }
 else
 {
-    var filter = vars.get("$local.userfilter")
+    var filter = vars.get("$local.filter")
     var selectedRelationType = null;
 
-    if (filter)
+    if (filter && filter.filter)
     {
+        filter = filter.filter;
         if (filter.childs.length > 0)
         {
             selectedRelationType = filter.childs[0].value;
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 98d979637e10dc731fd7e794ed9ad7187178eacb..2a5bcd1a989a21127d3f813c6e32c93213d095a3 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,177 +1,213 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+        <entityDependency>
+          <name>40bf3a74-2335-4925-9490-1404fa7c81f6</name>
+          <entityName>Forecast_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>f6bb8beb-dbcb-4871-9c50-d2399d569fdb</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>8834387f-acf8-4d9f-80ec-45425622a3dd</name>
+          <entityName>Competition_entity</entityName>
+          <fieldName>Objects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>349f13ea-8b4c-4cc0-987c-ae1717855bc1</name>
+          <entityName>Member_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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
       <children>
         <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ExcludedObjectIds_param</name>
-          <expose v="false" />
+          <name>ExcludedContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Organisations</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Persons</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Offers</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Offer_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Orders</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Order_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Products</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Contracts</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Contract_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Salesprojects</name>
-      <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>
-      <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>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Persons</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
       <children>
         <entityParameter>
-          <name>ExcludedObjectIds_param</name>
-          <expose v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <expose v="true" />
-          <triggerRecalculation v="true" />
-          <mandatory v="true" />
+          <name>ExcludedContactIds_param</name>
+          <valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>Campaigns</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Campaign_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>CampaignSteps</name>
-      <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>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Orders</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Order_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Products</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contracts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contract_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Salesprojects</name>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Campaign_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>CampaignSteps</name>
+      <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/entityfields/organisations/children/excludedcontactids_param/valueProcess.js b/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c5bba8e3b6fddb019149b80621761500e8514de
--- /dev/null
+++ b/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+
+if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
+{
+    result.string(vars.get("$param.ExcludedObjectIds_param"))
+}
\ No newline at end of file
diff --git a/entity/Object_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/Object_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c5bba8e3b6fddb019149b80621761500e8514de
--- /dev/null
+++ b/entity/Object_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+
+if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
+{
+    result.string(vars.get("$param.ExcludedObjectIds_param"))
+}
\ No newline at end of file
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 23bd71b57278945a999bef861602850936dc5b10..932e731251c23666c267719d92e6cef41b191f71 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -4,6 +4,9 @@ import("system.result");
 import("Context_lib");
 
 
+// NOTE THAT THIS ENTITY USES THE TARGET_CONSUMER_PROCESSES OF THE PROVIDERS
+// --> THIS PROCESS WON'T NOT BE EXECUTED IN SOME CASES.
+
 if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
 {
     var excludedIds = [];
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index b11ac32a98b5416aa69a183614d0f7ff0d317a9f..f590f09647a72172346e12a860986813e79e60f7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,876 +1,989 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <contentType>NUMBER</contentType>
-      <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>Sales Project</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>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>IMAGE</name>
-      <contentType>IMAGE</contentType>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>HEADER</name>
-      <title>Header</title>
-      <contentType>LONG_TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Offeritems</name>
-      <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>
-      <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>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>TotalGross</name>
-      <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
-      <title>Total gross</title>
-      <contentType>NUMBER</contentType>
-      <inputFormat>#,##0.00</inputFormat>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityParameter>
-      <name>SalesprojectId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityProvider>
-      <name>SalesprojectOffers</name>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Documents</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <title>Create receipt</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:DOLLAR</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Languages</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordProbabilities</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>Delivery specification</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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>ChoosenTEXHeader</name>
-      <title>Choose Header</title>
-      <consumer>DocumentTemplateTex</consumer>
-    </entityField>
-    <entityConsumer>
-      <name>DocumentTemplateTex</name>
-      <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>
-      <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>
-    <entityField>
-      <name>FOOTER</name>
-      <title>Footer</title>
-      <contentType>LONG_TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/footer/valueProcess.js</valueProcess>
-    </entityField>
-    <entityParameter>
-      <name>OfferFooter_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityField>
-      <name>ChoosenTEXFooter</name>
-      <title>Choose Footer</title>
-      <consumer>DocumentTemplateTex</consumer>
-    </entityField>
-  </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>681f6893-d11a-430c-a8ca-87215054d86f</name>
-          <tableName>OFFER</tableName>
-          <primaryKey>OFFERID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-        <linkInformation>
-          <name>acdf69f0-c6ad-431a-90c7-5bd0b3dc3d8e</name>
-          <tableName>CONTACT</tableName>
-          <primaryKey>CONTACTID</primaryKey>
-          <isUIDTable v="false" />
-          <readonly v="true" />
-        </linkInformation>
-        <linkInformation>
-          <name>b129928e-886e-4482-99da-463135008fef</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>
-        <dbRecordFieldMapping>
-          <name>FOOTER.value</name>
-          <recordfield>OFFER.FOOTER</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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Offer_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
+  <title>Offer</title>
+  <siblings>
+    <element>Offeritem_entity</element>
+  </siblings>
+  <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>
+      <contentType>NUMBER</contentType>
+      <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>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>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>IMAGE</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>HEADER</name>
+      <title>Header text</title>
+      <contentType>LONG_TEXT</contentType>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Offeritems</name>
+      <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>
+      <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>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TotalGross</name>
+      <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
+      <title>Total gross</title>
+      <contentType>NUMBER</contentType>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <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>
+      <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>
+    <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>
+      <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>
+      <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>
+      <title>Create receipt</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:DOLLAR</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Languages</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordProbabilities</name>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityProvider>
+      <name>ContactOffers</name>
+      <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="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferLanguage_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferCode_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferAddress_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferCurrency_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferDeliveryTerm_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferHeader_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferOriginal_Id_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferPaymentTerm_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferVersnr_param</name>
+          <expose v="false" />
+        </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>
+      <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>Delivery specification</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>
+      <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>
+      <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>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <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>
+      <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>ChoosenTEXHeader</name>
+      <title>Choose Header</title>
+      <consumer>DocumentTemplateTexHeader</consumer>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+      <consumer>Objects</consumer>
+      <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+      <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
+      <state>AUTO</state>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <consumer>Contexts</consumer>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Objects</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Object_entity</entityName>
+        <fieldName>AllObjects</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Contexts</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>Links</name>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Offers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>OfferDeliveryTerm_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferCode_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferOriginal_Id_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferAddress_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferCurrency_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferHeader_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferLanguage_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferPaymentTerm_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OfferVersnr_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>chooseTEXHeader</name>
+      <consumer>DocumentTemplateTex</consumer>    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplateTexHeader</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DocumentTemplateTypeClassification_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>LogHistoryConsumer</name>
+      <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>
+    <entityField>
+      <name>FOOTER</name>
+      <title>Footer text</title>
+      <contentType>LONG_TEXT</contentType>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/footer/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>OfferFooter_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>ChoosenTEXFooter</name>
+      <title>Choose Footer</title>
+      <consumer>DocumentTemplateTexFooter</consumer>
+    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplateTexFooter</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DocumentTemplateTypeClassification_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_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>681f6893-d11a-430c-a8ca-87215054d86f</name>
+          <tableName>OFFER</tableName>
+          <primaryKey>OFFERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>acdf69f0-c6ad-431a-90c7-5bd0b3dc3d8e</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>b129928e-886e-4482-99da-463135008fef</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>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>OBJECT_ROWID.value</name>
+          <recordfield>OFFER.OBJECT_ROWID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>FOOTER.value</name>
+          <recordfield>OFFER.FOOTER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+          <recordfield>OFFER.OBJECT_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT_ROWID.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Offer_entity/conditionProcess.js b/entity/Offer_entity/conditionProcess.js
index 46b77172c421062e7a3ca794200ae6c992f04147..30a86e4e5f568fd555a1a52ded71f3ab23481034 100644
--- a/entity/Offer_entity/conditionProcess.js
+++ b/entity/Offer_entity/conditionProcess.js
@@ -3,7 +3,7 @@ import("system.result");
 import("Sql_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("OFFER.OBJECT_ROWID", "$param.SalesprojectId_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/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js b/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
index e4c6c134df6be187331e47d8c2c4d5a9871b7c2b..62ef8073d2fb11127e9fc09b03210d79bf325dea 100644
--- a/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js
@@ -10,9 +10,9 @@ if (contactId)
     links.push([ContactUtils.getContextByContactId(contactId), contactId]);
 }
 
-if (vars.get("$field.SALESPROJECT_ID"))
+if (vars.get("$field.OBJECT_ROWID"))
 {
-    links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+    links.push(["Salesproject", vars.get("$field.OBJECT_ROWID")]);
 }
 
 result.object(links);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
index 3165252cb4ab4b2eae1dda0fdd17c10bd9b4a83b..eecb29ab0dc13c1d69af8cf28578deb153d74bb8 100644
--- a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -6,11 +6,13 @@ var contactId = vars.getString("$field.CONTACT_ID");
 var currency = vars.getString("$field.CURRENCY");
 var language = vars.getString("$field.LANGUAGE");
 var header = vars.getString("$field.HEADER");
+var footer = vars.getString("$field.FOOTER");
 var offerId = vars.getString("$field.OFFERID");
 var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
 var paymentTerm = vars.getString("$field.PAYMENTTERMS");
-var salesprojectId = vars.getString("$field.SALESPROJECT_ID");
+var salesprojectId = vars.getString("$field.OBJECT_ROWID");
 
 
-OfferUtils.copyOffer(offerId, contactId, language, currency, header, deliveryTerm, paymentTerm, salesprojectId);
+
+OfferUtils.copyOffer(offerId, contactId, language, currency, header, footer, deliveryTerm, paymentTerm, salesprojectId);
     
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js
rename to entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js
diff --git a/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js
similarity index 58%
rename from entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js
rename to entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js
index 9358b57687a079539606124e88b74f15c7e3ac72..d3f6a17941f06ea5d53411ddd0dd9a674705bfa5 100644
--- a/entity/Classification_entity/entityfields/classifications/children/isadminmode_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js
@@ -1,3 +1,2 @@
-import("system.result");
-
-result.string(0);
\ No newline at end of file
+import("system.result");
+result.string(4);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..361c9a219045f0f73c9d32749357157e8501d650
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("TEX");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js
rename to entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js
diff --git a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
index 4be677edd52ad21e51db57a867790397f1fe35bc..23d3bc451da2f70dc6cee11a676336b362f53da3 100644
--- a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
@@ -10,9 +10,9 @@ if (contactId)
     links.push([ContactUtils.getContextByContactId(contactId), contactId]);
 }
 
-if (vars.get("$field.SALESPROJECT_ID"))
+if (vars.get("$field.OBJECT_ROWID"))
 {
-    links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+    links.push(["Salesproject", vars.get("$field.OBJECT_ROWID")]);
 }
 
 ActivityUtils.createNewActivity(vars.getString("$field.OFFERID"), links);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index 5919abc67af5cb343614a7708e4e34fd6fe774f8..5087acef8c931156ad1abf76fd4d118e992c0769 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -4,7 +4,7 @@ import("Offer_lib");
 
 var params = {
     "ContactId_param" : vars.get("$field.CONTACT_ID"),
-    "SalesprojectId_param" : vars.get("$field.SALESPROJECT_ID"),
+    "SalesprojectId_param" : vars.get("$field.OBJECT_ROWID"),
     "OfferLanguage_param" : vars.get("$field.LANGUAGE"),
     "OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
     "OfferCode_param" : vars.get("$field.OFFERCODE"),
diff --git a/entity/Offer_entity/entityfields/neworder/onActionProcess.js b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
index 844372309437195d52fcdb07c5c0dc4b4e56ab6d..dce051360b6f16b9ac6d5c2e9dab793eb6f02aa8 100644
--- a/entity/Offer_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
@@ -3,7 +3,7 @@ import("system.neon");
 import("Offer_lib");
 
 var contactId = vars.getString("$field.CONTACT_ID");
-var salesprojectId = vars.getString("$field.SALESPROJECT_ID");
+var salesprojectId = vars.getString("$field.OBJECT_ROWID");
 var currency = vars.getString("$field.CURRENCY");
 var language = vars.getString("$field.LANGUAGE");
 var header = vars.getString("$field.HEADER");
diff --git a/entity/Offer_entity/entityfields/newtask/onActionProcess.js b/entity/Offer_entity/entityfields/newtask/onActionProcess.js
index f0165851eda69a6c3a0187d29f05c133b4118ed3..3c4a6d95beb2c814463cae5cc46eee8f2a2856d5 100644
--- a/entity/Offer_entity/entityfields/newtask/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newtask/onActionProcess.js
@@ -10,9 +10,9 @@ if (contactId)
     links.push([ContactUtils.getContextByContactId(contactId), contactId]);
 }
 
-if (vars.get("$field.SALESPROJECT_ID"))
+if (vars.get("$field.OBJECT_ROWID"))
 {
-    links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+    links.push(["Salesproject", vars.get("$field.OBJECT_ROWID")]);
 }
 
 TaskUtils.createNewTask(vars.get("$field.OFFERID"), links);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b080bceea92c146a676b0f33cc7cb87d4e86b9d
--- /dev/null
+++ b/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js b/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16ec65d1ea4a170df58c97d817ea469ca19cd19a
--- /dev/null
+++ b/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getContextName(vars.get("$field.OBJECT_TYPE")))
diff --git a/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js b/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Offer_entity/entityfields/object_rowid/stateProcess.js b/entity/Offer_entity/entityfields/object_rowid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Offer_entity/entityfields/object_rowid/valueProcess.js b/entity/Offer_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09d845d6f59f097036ad418f74975808ec568bb6
--- /dev/null
+++ b/entity/Offer_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
+    result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/object_type/displayValueProcess.js b/entity/Offer_entity/entityfields/object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..84a769a5e16744aa1035437dd54720f8d9f0e320
--- /dev/null
+++ b/entity/Offer_entity/entityfields/object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
+    result.string("");
+} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+    result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
+}
diff --git a/entity/Offer_entity/entityfields/object_type/valueProcess.js b/entity/Offer_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..18543dfe49df8c16f06d8dacbb0a1e34d97dfb42
--- /dev/null
+++ b/entity/Offer_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Context_lib")
+
+if(vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
+    result.string(vars.get("$param.ObjectType_param"));
+else result.string(ContextUtils.getCurrentContextId())
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js b/entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js
deleted file mode 100644
index 65afbf6e950eebef0268138074bc97f00869eb0a..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/salesproject_id/displayValueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Salesproject_lib");
-
-result.string(Salesproject.getSalesProjectTitleById(vars.getString("$field.SALESPROJECT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
deleted file mode 100644
index 3bd7da35b29fe62a814c8f4562736441d1b99708..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Contact_lib");
-
-var type = ContactUtils.getContactType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
-
-result.string(type != 2);
-
-
diff --git a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
deleted file mode 100644
index 1b35d9149a31ff3bebe48f47d48c54f55315e375..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Entity_lib");
-
-switch (vars.get("$sys.recordstate")) 
-{
-    case neon.OPERATINGSTATE_NEW:
-        //only EDITABLE if $field.CONTACT_ID is set
-        if(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID")))
-            result.object(neon.COMPONENTSTATE_EDITABLE);
-        else
-            result.object(neon.COMPONENTSTATE_READONLY);
-    break;
-    default:
-        result.object(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesproject_id/valueProcess.js b/entity/Offer_entity/entityfields/salesproject_id/valueProcess.js
deleted file mode 100644
index 447b6962106b02b100555df3b988ac90b4528192..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/salesproject_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.SalesprojectId_param")) 
-{
-    result.string(vars.get("$param.SalesprojectId_param"));
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
deleted file mode 100644
index f2c342bc94674b7899c756a441619cddb1769980..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Entity_lib");
-
-result.string(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ORG_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js b/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
index e4c6c134df6be187331e47d8c2c4d5a9871b7c2b..62ef8073d2fb11127e9fc09b03210d79bf325dea 100644
--- a/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js
@@ -10,9 +10,9 @@ if (contactId)
     links.push([ContactUtils.getContextByContactId(contactId), contactId]);
 }
 
-if (vars.get("$field.SALESPROJECT_ID"))
+if (vars.get("$field.OBJECT_ROWID"))
 {
-    links.push(["Salesproject", vars.get("$field.SALESPROJECT_ID")]);
+    links.push(["Salesproject", vars.get("$field.OBJECT_ROWID")]);
 }
 
 result.object(links);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/conditionProcess.js b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
index 58347450b6f13af8e510f022630d36b1dfac80ea..4538e37b37538159dabb6e7c037e5ba15e88fef3 100644
--- a/entity/Offer_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
@@ -3,7 +3,8 @@ import("system.result");
 import("Sql_lib");
 
 var cond = new SqlCondition();
-cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("OFFER.OBJECT_ROWID", "$param.ObjectRowId_param");
+cond.andPrepareVars("OFFER.OBJECT_TYPE", "$param.ObjectType_param");
 cond.andPrepareVars("OFFER.CONTACT_ID", "$param.ContactId_param");
 
 //TODO: use a preparedCondition when available #1030812 #1034026
diff --git a/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js b/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
index 73ea32201ab969db8600af5c66bcafa1ad5523f6..1fd88578ab3b01fffc36b918f8a9ceb951a4f5bd 100644
--- a/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 
 result.string("OFFER left join CONTACT on CONTACTID = CONTACT_ID \n\
-left join SALESPROJECT on SALESPROJECTID = SALESPROJECT_ID");
\ No newline at end of file
+left join SALESPROJECT on SALESPROJECTID = OBJECT_ROWID");
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..33554680cccd2c3d363443686457c41e0c1c5729
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index a81218acd092abed06ab5e9eed99aa8de35b75cb..3b7d2a541f3abf00f45e04bd53b3bf231566b44b 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,330 +1,330 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
-    </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</title>
-      <contentType>NUMBER</contentType>
-      <inputFormat>0.00</inputFormat>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
-    </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>
-      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
-    </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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+    </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</title>
+      <contentType>NUMBER</contentType>
+      <inputFormat>0.00</inputFormat>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+    </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>
+      <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
+    </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>
+      <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>
+      <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>
+      <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>
+      <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/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index f50e9fe6c351332f74f795e8e95d023a95b1e541..90711ff502b9f74f6e43ab5b6a66b9fcda13a255 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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 48eb88f8b453e1bbc5f9f4a7678b8b2763c30b5e..65ae3ca85b9efcfa61a1c0fde7a63b059a98a402 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,601 +1,601 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
-    </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>
-      <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>
-      <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>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <valueProcess></valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>TotalGross</name>
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/totalgross/documentation.adoc</documentation>
-      <title>Total gross</title>
-      <contentType>NUMBER</contentType>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
-    </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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Documents</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+    </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>
+      <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>
+      <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>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <valueProcess></valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TotalGross</name>
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/totalgross/documentation.adoc</documentation>
+      <title>Total gross</title>
+      <contentType>NUMBER</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
+    </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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AnyContact_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</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>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <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>
+      <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>
+      <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/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 9895020df92b61214b47e7513735146b497b599b..c2041c3a42673fb491dae0f92211fed223b26e1e 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,321 +1,321 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-    </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>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#,##0.00</outputFormat>
-      <inputFormat>#,##0.00</inputFormat>
-      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
-    </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>
-      <contentType>NUMBER</contentType>
-      <outputFormat>#</outputFormat>
-      <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</title>
-      <contentType>NUMBER</contentType>
-      <outputFormat>0.00 %</outputFormat>
-      <inputFormat>0.00</inputFormat>
-      <state>AUTO</state>
-      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
-    </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>
-      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+    </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>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+    </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>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#</outputFormat>
+      <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</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>0.00 %</outputFormat>
+      <inputFormat>0.00</inputFormat>
+      <state>AUTO</state>
+      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+    </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>
+      <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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 60ebe959935f8a73a33fd896c5b4de336c11043b..2000bc95fce6409ecbfa966fefec988bbbbe51f6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,940 +1,962 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-        <entityDependency>
-          <name>c79dd08b-8f62-4514-836b-2e176460000c</name>
-          <entityName>Productprice_entity</entityName>
-          <fieldName>OrganisationConditions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityConsumer>
-      <name>Documents</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Countries_Entity</entityName>
-        <fieldName>ISO2Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPricePolitics</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-          <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>
-      <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>
-    <entityConsumer>
-      <name>AttributeConditions</name>
-      <onValidation>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/onValidation.js</onValidation>
-      <dependency>
-        <name>dependency</name>
-        <entityName>AttributeRelation_entity</entityName>
-        <fieldName>AttributeRelations</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/objectrowid_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/objecttype_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>FilteredAttributes_param</name>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>DisplaySimpleName_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/displaysimplename_param/valueProcess.js</valueProcess>
-          <triggerRecalculation v="true" />
-        </entityParameter>
-        <entityParameter>
-          <name>FilteredAttributeIds_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/filteredattributeids_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="true" />
+          <triggerRecalculation 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>
+      <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>
+      <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>
+      <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>
+      <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>
+        <entityDependency>
+          <name>c79dd08b-8f62-4514-836b-2e176460000c</name>
+          <entityName>Productprice_entity</entityName>
+          <fieldName>OrganisationConditions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>49db6b8b-c27d-4e52-b456-ad48405cc246</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityConsumer>
+      <name>Documents</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <actionOrder v="0" />
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>orgReport</name>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Countries_Entity</entityName>
+        <fieldName>ISO2Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPricePolitics</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <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>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+        <entityDependency>
+          <name>748a3083-89c2-41b4-a233-3fd5364396e9</name>
+          <entityName>Competition_entity</entityName>
+          <fieldName>Organisation</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>
+      <dependencies>
+        <entityDependency>
+          <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
+          <entityName>Competition_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>
+      <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>
+          <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>
+      <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>
+    <entityConsumer>
+      <name>AttributeConditions</name>
+      <onValidation>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/objectrowid_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/objecttype_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/displaysimplename_param/valueProcess.js</valueProcess>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilteredAttributeIds_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/filteredattributeids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </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/attributeconditions/children/filteredattributeids_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributeconditions/children/filteredattributeids_param/valueProcess.js
index f83f7dbc8f88c3410600abc34923de6dbefd0121..3737edfd4f34c95584f333c27e432d760a83f19f 100644
--- a/entity/Organisation_entity/entityfields/attributeconditions/children/filteredattributeids_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/attributeconditions/children/filteredattributeids_param/valueProcess.js
@@ -1,5 +1,3 @@
-import("system.logging");
-import("system.db");
-import("system.result");
-
-result.object(db.table("select AB_ATTRIBUTEID from ADITO.AB_ATTRIBUTE where ATTRIBUTE_PARENT_ID = 'ab545654-1fce-4993-b763-0ec469781302'"));
\ No newline at end of file
+import("system.result");
+
+result.object(["ab545654-1fce-4993-b763-0ec469781302"]);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/attributeconditions/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributeconditions/children/objectrowid_param/valueProcess.js
index 843f2af2a341f31f577c7eb1ae71d7a93f801e54..bcfda44fe71eac93b3f8c11cc0c85a496f2cd51c 100644
--- a/entity/Organisation_entity/entityfields/attributeconditions/children/objectrowid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/attributeconditions/children/objectrowid_param/valueProcess.js
@@ -1,7 +1,4 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-
-logging.log(vars.get("$field.ORGANISATIONID").toSource())
-
+import("system.vars");
+import("system.result");
+
 result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index d3add1631dc0991edef9a4793f589e23e15a3945..74fc985e17acacdee7a2d607a52e24e541e39467 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,171 +1,185 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>PermissionDetail_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Permission Detail</title>
-  <contentTitleProcess>%aditoprj%/entity/PermissionDetail_entity/contentTitleProcess.js</contentTitleProcess>
-  <iconIdProcess>%aditoprj%/entity/PermissionDetail_entity/iconIdProcess.js</iconIdProcess>
-  <recordContainer>jDito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>CONDITION</name>
-      <title>Condition</title>
-    </entityField>
-    <entityField>
-      <name>ACTION</name>
-      <title>Action</title>
-      <mandatory v="true" />
-      <searchable v="false" />
-    </entityField>
-    <entityField>
-      <name>ROLE</name>
-      <title>Role</title>
-      <consumer>Roles</consumer>
-      <linkedContext>Role</linkedContext>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>ENTITY</name>
-      <title>Entity</title>
-      <consumer>MetaData</consumer>
-      <linkedContext>PermissionMetaData</linkedContext>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>FIELD</name>
-      <title>Field</title>
-      <groupable v="true" />
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <title>PermissionId</title>
-    </entityField>
-    <entityField>
-      <name>ICON</name>
-    </entityField>
-    <entityField>
-      <name>ACCESSTYPE</name>
-      <title>Access type</title>
-      <consumer>KeywordAccessType</consumer>
-      <mandatory v="true" />
-      <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>CONDTYPE</name>
-      <title>Condition Type</title>
-      <consumer>KeywordConditionType</consumer>
-      <mandatory v="true" />
-      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>PARENT</name>
-      <title>Parent</title>
-    </entityField>
-    <entityProvider>
-      <name>Permissions</name>
-      <recordContainer>jDito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
-          <entityName>Role_entity</entityName>
-          <fieldName>Permissions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>cc0e9a4d-5d82-4407-bc4e-698dcfae5c86</name>
-          <entityName>PermissionMetaData_entity</entityName>
-          <fieldName>PermissionDetails</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>RoleTitle_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>Roles</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Role_entity</entityName>
-        <fieldName>Roles</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MetaData</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionMetaData_entity</entityName>
-        <fieldName>MetaData</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>EntityTitle_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityConsumer>
-      <name>KeywordConditionType</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordAccessType</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordaccesstype/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jDito</name>
-      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ENTITY.value</element>
-        <element>ROLE.value</element>
-        <element>FIELD.value</element>
-        <element>CONDITION.value</element>
-        <element>ACTION.value</element>
-        <element>ACCESSTYPE.value</element>
-        <element>CONDTYPE.value</element>
-        <element>PARENT.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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>PermissionDetail_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Permission Detail</title>
+  <contentTitleProcess>%aditoprj%/entity/PermissionDetail_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconIdProcess>%aditoprj%/entity/PermissionDetail_entity/iconIdProcess.js</iconIdProcess>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CONDITION</name>
+      <title>Condition</title>
+      <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condition/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>ACTION</name>
+      <title>Action</title>
+      <mandatory v="true" />
+      <searchable v="false" />
+    </entityField>
+    <entityField>
+      <name>ROLE</name>
+      <title>Role</title>
+      <consumer>Roles</consumer>
+      <groupable v="true" />
+      <linkedContext>Role</linkedContext>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ENTITY</name>
+      <title>Entity</title>
+      <consumer>MetaData</consumer>
+      <groupable v="true" />
+      <linkedContext>PermissionMetaData</linkedContext>
+      <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>FIELD</name>
+      <title>Field</title>
+      <groupable v="true" />
+      <dropDownProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/field/dropDownProcess.js</dropDownProcess>
+      <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/field/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <title>PermissionId</title>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+    </entityField>
+    <entityField>
+      <name>ACCESSTYPE</name>
+      <title>Access type</title>
+      <consumer>KeywordAccessType</consumer>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONDTYPE</name>
+      <title>Condition Type</title>
+      <consumer>KeywordConditionType</consumer>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+      <title>Parent</title>
+    </entityField>
+    <entityProvider>
+      <name>Permissions</name>
+      <recordContainer>jDito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
+          <entityName>Role_entity</entityName>
+          <fieldName>Permissions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>cc0e9a4d-5d82-4407-bc4e-698dcfae5c86</name>
+          <entityName>PermissionMetaData_entity</entityName>
+          <fieldName>PermissionDetails</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>RoleTitle_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>Roles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Role_entity</entityName>
+        <fieldName>Roles</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MetaData</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>PermissionMetaData_entity</entityName>
+        <fieldName>MetaData</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>EntityName_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>EntityTitle_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordConditionType</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordAccessType</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordaccesstype/children/containername_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFields>
+        <element>UID.value</element>
+        <element>ENTITY.value</element>
+        <element>ROLE.value</element>
+        <element>FIELD.value</element>
+        <element>CONDITION.value</element>
+        <element>ACTION.value</element>
+        <element>ACCESSTYPE.value</element>
+        <element>CONDTYPE.value</element>
+        <element>PARENT.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/PermissionDetail_entity/contentTitleProcess.js b/entity/PermissionDetail_entity/contentTitleProcess.js
index 919f3af72fbe6a28950232c8685f18327d137eb3..1b29142dccd50320336eadddd1e9b80ff2f598a7 100644
--- a/entity/PermissionDetail_entity/contentTitleProcess.js
+++ b/entity/PermissionDetail_entity/contentTitleProcess.js
@@ -1,3 +1,4 @@
+import("system.project");
 import("system.vars");
 import("system.result");
 
@@ -15,7 +16,7 @@ switch (vars.get("$field.ACCESSTYPE")) {
         res += "Record";
         break;
     case "F":
-        res += vars.get("$field.FIELD");
+        res += "Field '" + vars.get("$field.FIELD") + "'";
         break;
     default:
         res += "Permission";
diff --git a/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js b/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js
index c24340acec17af395c991dfafe87f1d3cd8cbc1c..9ebb27717c2196d90572d511b8ee039611dd5ae5 100644
--- a/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js
@@ -1,18 +1,22 @@
-import("system.vars");
-import("system.result");
-import("Permission_lib");
-
-var field = vars.get("$field.FIELD");
-var role = vars.get("$field.ROLE");
-var entity = vars.get("$field.ENTITY");
-var rootPermSet = PermissionUtil.getRootPermissionSet(role, entity);
-
-if (rootPermSet == "") {
-    result.string("E");
-} else {
-    result.string("R");
-} 
-
-if (field != undefined && field != null && field != "") {
-    result.string("F");
-}
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("Permission_lib");
+
+var field = vars.get("$field.FIELD");
+var role = vars.get("$field.ROLE");
+var entity = vars.get("$field.ENTITY");
+var permId = vars.get("$field.UID");
+var rootPermSet = PermissionUtil.getRootPermissionSet(role, entity);
+var rootPerm = PermissionUtil.getDefaultPermission(rootPermSet);
+
+if (rootPermSet == "") {
+    result.string("E");
+} else if (rootPerm == permId) {
+    result.string("E");
+} else {
+    result.string("R");
+} 
+
+if (field != undefined && field != null && field != "") {
+    result.string("F");
+}
diff --git a/entity/PermissionDetail_entity/entityfields/condition/stateProcess.js b/entity/PermissionDetail_entity/entityfields/condition/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6b4510443313add8e02e610d18165a834e48bd1
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/condition/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$field.ACCESSTYPE") == "E") {
+    result.string(neon.COMPONENTSTATE_DISABLED);
+} else {
+    result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
index b5c67bb76030695f7ec60962534bdfb3d4722d29..53baf282d795b1bc98ffc8ddacae993fdaa4dbec 100644
--- a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js
@@ -1,18 +1,17 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var keywordContainer = "PermissionCondType";
-var keywordEntrys = KeywordUtils.getEntryNamesByContainer(keywordContainer);
-var condType = vars.get("$field.CONDTYPE");
-
-switch (condType) {
-    case "true":
-        result.string(keywordEntrys[0]);
-        break;
-    case "false":
-        result.string(keywordEntrys[1]);
-        break;    
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var keywordContainer = "PermissionCondType";
+var keywordEntrys = KeywordUtils.getEntryNamesByContainer(keywordContainer);
+var condType = vars.get("$field.CONDTYPE");
+
+switch (condType) {
+    case "true":
+        result.string(keywordEntrys[0]);
+        break;
+    case "false":
+        result.string(keywordEntrys[1]);
+        break;    
 }
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js b/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab53c1064a98c7ea344ba50a3466fba3e2ee683a
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("true");
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js b/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..943bb0881702bf7d6a70344f64c3d99834e6834b
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+var entityTitle = vars.get("$param.EntityTitle_param");
+
+if (entityTitle != undefined && entityTitle != null && entityTitle != "") {
+    result.string(neon.COMPONENTSTATE_READONLY);
+} else {
+    result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/field/dropDownProcess.js b/entity/PermissionDetail_entity/entityfields/field/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..123b0887b475ce6f8f0395511b849638dfd658cf
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/field/dropDownProcess.js
@@ -0,0 +1,23 @@
+import("system.result");
+import("system.vars");
+import("system.project");
+
+var entityTitle = vars.get("$field.ENTITY");
+if (entityTitle != undefined && entityTitle != null && entityTitle != "") {
+    var entityStructure = project.getEntityStructure(entityTitle);
+    var res = [];
+
+    for (var field in entityStructure.fields) { 
+        field = entityStructure.fields[field];
+        if (field.usePermissions == true) {
+            var name = field.name;
+            var title = field.title;
+            if (title != undefined && title != null && title != "") {
+                res.push([title, title]);
+            } else {
+                res.push([name, name]);
+            }
+        }
+    }
+    result.object(res);
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/field/stateProcess.js b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6485674e6b472b05c3ff21dfc2d1279c1a10e93
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/field/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Permission_lib");
+
+var role = vars.get("$field.ROLE");
+var entity = vars.get("$field.ENTITY");
+
+rootPermSet = PermissionUtil.getRootPermissionSet(role, entity);
+
+if (rootPermSet == "") {
+    result.string(neon.COMPONENTSTATE_DISABLED);
+} else {
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/role/stateProcess.js b/entity/PermissionDetail_entity/entityfields/role/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f5fec84a8c27d08002a0d7e50ab9aa4839078944
--- /dev/null
+++ b/entity/PermissionDetail_entity/entityfields/role/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+var roleTitle = vars.get("$param.RoleTitle_param");
+
+if (roleTitle != undefined && roleTitle != null && roleTitle != "") {
+    result.string(neon.COMPONENTSTATE_READONLY);
+} else {
+    result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
index 00ceec30b99adb85ec545626479bc0e26c49fbca..0f3e4521b074db52928320220a301a82f1720abd 100644
--- a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js
@@ -1,15 +1,14 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var recordstate = vars.get("$sys.recordstate");
-var role = "";
-
-if(vars.exists("$param.RoleTitle_param") && (recordstate == neon.OPERATINGSTATE_NEW)) {
-    role = vars.get("$param.RoleTitle_param");
-} else {
-    role = vars.get("$field.ROLE");
-}
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var recordstate = vars.get("$sys.recordstate");
+var role = "";
+
+if(vars.exists("$param.RoleTitle_param") && (recordstate == neon.OPERATINGSTATE_NEW)) {
+    role = vars.get("$param.RoleTitle_param");
+} else {
+    role = vars.get("$field.ROLE");
+}
+
 result.string(role);
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
index 4e61ef73b7e33ba304a6d8f30ca098ee7236c014..1203a47cf8b53e75dbd494e42b21e53af3f109a7 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js
@@ -1,90 +1,89 @@
-import("Permission_lib");
-import("system.logging");
-import("system.neon");
-import("system.util");
-import("system.db");
-import("system.vars");
-import("Permission_lib");
-import("Entity_lib");
-
-var table, cols, vals;
-var alias = "_____SYSTEMALIAS";
-var sqlExt = "";
-var permissionid = util.getNewUUID();
-var role = vars.get("$field.ROLE");
-var entity = vars.get("$field.ENTITY");
-var field = vars.get("$field.FIELD");
-var accesstype = vars.get("$field.ACCESSTYPE").trim();
-var condtype = vars.get("$field.CONDTYPE").trim();
-var condition = vars.get("$field.CONDITION");
-var action = vars.get("$field.ACTION");
-
-if (checkInput([role, entity, accesstype, condtype, action])) {
-    if (checkInput([field]))
-        sqlExt += " and FIELD_ID = '" + field + "'";
-    else if (action.includes("view") || action.includes("create"))
-        sqlExt += " and ACCESSTYPE = 'E'";
-    else 
-        sqlExt += " and ACCESSTYPE = 'R'";
-
-    var sqlStr = "select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET where ENTITY_ID = '" + entity + "' and ROLE_ID = '" + role + "'" + sqlExt;
-    var permissionsetid = db.cell(sqlStr, alias);
-    
-    if (permissionsetid == "") {
-        // no fitting permissionset found - insert new permissionset
-        var rootpermissionset;
-        if (accesstype == "E") {
-            rootpermissionset = "";
-        } else {
-            rootpermissionset = PermissionUtil.getRootPermissionSet(role, entity);
-        }
-        permissionsetid = PermissionUtil.insertNewPermissionSet(rootpermissionset, entity, role, field, accesstype)
-    }
-
-    // check if a new permissions is needed or an existing one can be used
-    var existingPermId = permExists(role, entity, field, accesstype, condtype, condition);
-    if (existingPermId != "") {
-        // update
-        permissionid = existingPermId;
-    } else {
-        // permission doesnt exist -> insert new permission
-        // new permissionid is needed to link actions to the permission in the next step
-        permissionid = PermissionUtil.insertNewPermission(permissionsetid, condition, condtype)
-    }
-    
-    // insert new permissionaction    
-    var actionNew = action.split(",");
-    for each (let permaction in actionNew) {
-        PermissionUtil.insertNewPermissionAction(permissionid, permaction);
-    }
-}
-
-// checks input array if each element is a valid input, returns true if valid, otherwise false
-function checkInput(pInputArr) {
-    for each (var input in pInputArr) {
-        if (input == undefined || input == null || input == "")
-            return false;
-    }
-    return true;
-}
-
-// returns permissionid of the permission with fitting parameters, otherwise returns empty string
-function permExists(pRole, pEntity, pField, pAccesstype, pCondtype, pCondition) {
-    var sqlStr = "";
-    var sqlExt = "";
-    
-    if (checkInput([pCondition])) {
-        sqlExt += " and COND = '" + pCondition + "'";
-    }
-    
-    if (checkInput([pField])) {
-        sqlExt += " and FIELD_ID = '" + pField + "'";
-    }
-    
-    sqlStr = "select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSIONSET"
-    + " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID"
-    + " where ENTITY_ID = '" + pEntity + "' and ROLE_ID = '" + pRole + "'"
-    + " and ACCESSTYPE = '" + pAccesstype + "' and CONDTYPE = '" + pCondtype + "'" + sqlExt;
-    var permId = db.cell(sqlStr, alias);
-    return permId;
+import("Permission_lib");
+import("system.neon");
+import("system.util");
+import("system.db");
+import("system.vars");
+import("Permission_lib");
+import("Entity_lib");
+
+var table, cols, vals;
+var alias = "_____SYSTEMALIAS";
+var sqlExt = "";
+var permissionid = util.getNewUUID();
+var role = vars.get("$field.ROLE");
+var entity = vars.get("$field.ENTITY");
+var field = vars.get("$field.FIELD");
+var accesstype = vars.get("$field.ACCESSTYPE").trim();
+var condtype = vars.get("$field.CONDTYPE").trim();
+var condition = vars.get("$field.CONDITION");
+var action = vars.get("$field.ACTION");
+
+if (checkInput([role, entity, accesstype, condtype, action])) {
+    if (checkInput([field]))
+        sqlExt += " and FIELD_ID = '" + field + "'";
+    else if (action.includes("view") || action.includes("create"))
+        sqlExt += " and ACCESSTYPE = 'E'";
+    else 
+        sqlExt += " and ACCESSTYPE = 'R'";
+
+    var sqlStr = "select ASYS_PERMISSIONSETID from ASYS_PERMISSIONSET where ENTITY_ID = '" + entity + "' and ROLE_ID = '" + role + "'" + sqlExt;
+    var permissionsetid = db.cell(sqlStr, alias);
+    
+    if (permissionsetid == "") {
+        // no fitting permissionset found - insert new permissionset
+        var rootpermissionset;
+        if (accesstype == "E") {
+            rootpermissionset = "";
+        } else {
+            rootpermissionset = PermissionUtil.getRootPermissionSet(role, entity);
+        }
+        permissionsetid = PermissionUtil.insertNewPermissionSet(rootpermissionset, entity, role, field, accesstype)
+    }
+
+    // check if a new permissions is needed or an existing one can be used
+    var existingPermId = permExists(role, entity, field, accesstype, condtype, condition);
+    if (existingPermId != "") {
+        // update
+        permissionid = existingPermId;
+    } else {
+        // permission doesnt exist -> insert new permission
+        // new permissionid is needed to link actions to the permission in the next step
+        permissionid = PermissionUtil.insertNewPermission(permissionsetid, condition, condtype)
+    }
+    
+    // insert new permissionaction    
+    var actionNew = action.split(",");
+    for each (let permaction in actionNew) {
+        PermissionUtil.insertNewPermissionAction(permissionid, permaction);
+    }
+}
+
+// checks input array if each element is a valid input, returns true if valid, otherwise false
+function checkInput(pInputArr) {
+    for each (var input in pInputArr) {
+        if (input == undefined || input == null || input == "")
+            return false;
+    }
+    return true;
+}
+
+// returns permissionid of the permission with fitting parameters, otherwise returns empty string
+function permExists(pRole, pEntity, pField, pAccesstype, pCondtype, pCondition) {
+    var sqlStr = "";
+    var sqlExt = "";
+    
+    if (checkInput([pCondition])) {
+        sqlExt += " and COND = '" + pCondition + "'";
+    }
+    
+    if (checkInput([pField])) {
+        sqlExt += " and FIELD_ID = '" + pField + "'";
+    }
+    
+    sqlStr = "select ASYS_PERMISSION.ASYS_PERMISSIONID from ASYS_PERMISSIONSET"
+    + " join ASYS_PERMISSION on ASYS_PERMISSION.ASYS_PERMISSIONSET_ID = ASYS_PERMISSIONSET.ASYS_PERMISSIONSETID"
+    + " where ENTITY_ID = '" + pEntity + "' and ROLE_ID = '" + pRole + "'"
+    + " and ACCESSTYPE = '" + pAccesstype + "' and CONDTYPE = '" + pCondtype + "'" + sqlExt;
+    var permId = db.cell(sqlStr, alias);
+    return permId;
 }
\ No newline at end of file
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 5b8c1e58a3d58629438063a2b43d7d48dcf7901c..d8635bbbef7aba3c05071e51b1608a72786a879e 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,92 +1,96 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>PermissionMetaData_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:CONNECT</icon>
-  <title>Entities</title>
-  <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess>
-  <iconIdProcess>%aditoprj%/entity/PermissionMetaData_entity/iconIdProcess.js</iconIdProcess>
-  <recordContainer>jDito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>TITLE</name>
-      <title>Title</title>
-    </entityField>
-    <entityField>
-      <name>DESCRIPTION</name>
-      <title>Description</title>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <title>Name</title>
-    </entityField>
-    <entityProvider>
-      <name>MetaData</name>
-      <recordContainer>jDito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
-          <entityName>PermissionDetail_entity</entityName>
-          <fieldName>MetaData</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>EntityName_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityProvider>
-    <entityConsumer>
-      <name>PermissionOverviews</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionOverview_entity</entityName>
-        <fieldName>PermissionOverviews</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>EntityTitle_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>PermissionDetails</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionDetail_entity</entityName>
-        <fieldName>Permissions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>EntityTitle_param</name>
-          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityParameter>
-      <name>EntityName_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jDito</name>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <isPageable v="false" />
-      <isFilterable v="true" />
-      <contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>PermissionMetaData_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:CONNECT</icon>
+  <title>Entities</title>
+  <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconIdProcess>%aditoprj%/entity/PermissionMetaData_entity/iconIdProcess.js</iconIdProcess>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>TITLE</name>
+      <title>Title</title>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <title>Name</title>
+    </entityField>
+    <entityProvider>
+      <name>MetaData</name>
+      <recordContainer>jDito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
+          <entityName>PermissionDetail_entity</entityName>
+          <fieldName>MetaData</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>EntityName_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>PermissionOverviews</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>PermissionOverview_entity</entityName>
+        <fieldName>PermissionOverviews</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>EntityTitle_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>PermissionDetails</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>PermissionDetail_entity</entityName>
+        <fieldName>Permissions</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>EntityTitle_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>EntityName_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>USEPERMISSION</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <isPageable v="false" />
+      <isFilterable v="true" />
+      <contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TITLE.value</element>
+        <element>DESCRIPTION.value</element>
+        <element>USEPERMISSION.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/PermissionMetaData_entity/iconIdProcess.js b/entity/PermissionMetaData_entity/iconIdProcess.js
index 4e92d3f9ca4e6171b3065b5925dc0c3d6a3f4206..d46ea77e82344bcbce0aa5117e1508e974be3cf6 100644
--- a/entity/PermissionMetaData_entity/iconIdProcess.js
+++ b/entity/PermissionMetaData_entity/iconIdProcess.js
@@ -1,17 +1,16 @@
-import("system.logging");
-import("system.result");
-import("system.project");
-import("system.vars");
-
-var currEntity = vars.get("$field.UID");
-
-if (currEntity != undefined && currEntity != null && currEntity != "") {
-    var entityInfo = project.getDataModel(project.DATAMODEL_KIND_ENTITY, currEntity);
-    if (entityInfo[5] != "") {
-        result.string(entityInfo[5]);
-    } else {
-        result.string("VAADIN:CONNECT");
-    }
-} else {
-    result.string("VAADIN:CONNECT");
+import("system.result");
+import("system.project");
+import("system.vars");
+
+var currEntity = vars.get("$field.UID");
+
+if (currEntity != undefined && currEntity != null && currEntity != "") {
+    var entityInfo = project.getDataModel(project.DATAMODEL_KIND_ENTITY, currEntity);
+    if (entityInfo[5] != "") {
+        result.string(entityInfo[5]);
+    } else {
+        result.string("VAADIN:CONNECT");
+    }
+} else {
+    result.string("VAADIN:CONNECT");
 }
\ No newline at end of file
diff --git a/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js
index 244e9ef8dfb185d4cf55ef51872c621978d7c9e3..88ebe7191307eca9c722e78e99c00a77bf3e52aa 100644
--- a/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js
@@ -1,24 +1,20 @@
-import("system.vars");
-import("system.result");
-import("system.project");
-
-var entities = project.getDataModels(project.DATAMODEL_KIND_ENTITY);
-var selectedEntity = vars.get("$local.idvalues");
-var res = [];
-
-if (selectedEntity == null) {
-    for each (let entity in entities) {
-        if (entity[6] == "true") {
-            res.push([entity[0], entity[1], entity[2]]);
-        }
-    }
-} else {
-    for each (let entity in entities) {
-        if (entity[0] == selectedEntity) {
-            res.push([entity[0], entity[1], entity[2]]);
-            break;
-        }
-    }
-}
-
+import("system.vars");
+import("system.result");
+import("system.project");
+
+var selectedEntity = vars.get("$local.idvalues");
+var res = [];
+
+if (selectedEntity == null) {
+    var allEntities = project.getDataModels(project.DATAMODEL_KIND_ENTITY);
+    for each (let e in allEntities) {
+        if (e[6] == "true") {
+            res.push([e[0], e[1], e[2], e[6]]);
+        }
+    }
+} else {
+    entity = project.getDataModel(project.DATAMODEL_KIND_ENTITY, selectedEntity);
+    res.push([entity[0], entity[1], entity[2], entity[6]]);
+}
+
 result.object(res.sort());
\ No newline at end of file
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index a4787997318a7f9a28d92c26c6e0b8a9fe22fb0d..d9deac586e8ed420d9752dcf26422554642afd02 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,95 +1,95 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>PermissionOverview_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <title>Permission Overview</title>
-  <grantUpdate v="false" />
-  <grantDelete v="false" />
-  <iconIdProcess>%aditoprj%/entity/PermissionOverview_entity/iconIdProcess.js</iconIdProcess>
-  <recordContainer>jDito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>ENTITY</name>
-      <titleProcess>%aditoprj%/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js</titleProcess>
-    </entityField>
-    <entityField>
-      <name>ACTION_VIEW</name>
-      <title>View</title>
-      <contentType>IMAGE</contentType>
-    </entityField>
-    <entityField>
-      <name>ACTION_CREATE</name>
-      <title>Create</title>
-      <contentType>IMAGE</contentType>
-    </entityField>
-    <entityField>
-      <name>ACTION_READ</name>
-      <title>Read</title>
-      <contentType>IMAGE</contentType>
-    </entityField>
-    <entityField>
-      <name>ACTION_EDIT</name>
-      <title>Edit</title>
-      <contentType>IMAGE</contentType>
-    </entityField>
-    <entityField>
-      <name>ACTION_DELETE</name>
-      <title>Delete</title>
-      <contentType>IMAGE</contentType>
-    </entityField>
-    <entityField>
-      <name>CONDTYPE</name>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-      <title>Permission Set ID</title>
-    </entityField>
-    <entityProvider>
-      <name>PermissionOverviews</name>
-      <recordContainer>jDito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>b9f4df41-74e9-41d2-bfe6-1427ae7c8c36</name>
-          <entityName>Role_entity</entityName>
-          <fieldName>PermissionOverviews</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>ac8eb318-8d26-43a0-9463-e1c3741c7710</name>
-          <entityName>PermissionMetaData_entity</entityName>
-          <fieldName>PermissionOverviews</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>RoleTitle_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityParameter>
-      <name>EntityTitle_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jDito</name>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ENTITY.value</element>
-        <element>ACTION_VIEW.value</element>
-        <element>ACTION_CREATE.value</element>
-        <element>ACTION_READ.value</element>
-        <element>ACTION_EDIT.value</element>
-        <element>ACTION_DELETE.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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>PermissionOverview_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Permission Overview</title>
+  <grantUpdate v="false" />
+  <grantDelete v="false" />
+  <iconIdProcess>%aditoprj%/entity/PermissionOverview_entity/iconIdProcess.js</iconIdProcess>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>ENTITY</name>
+      <titleProcess>%aditoprj%/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js</titleProcess>
+    </entityField>
+    <entityField>
+      <name>ACTION_VIEW</name>
+      <title>View</title>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityField>
+      <name>ACTION_CREATE</name>
+      <title>Create</title>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityField>
+      <name>ACTION_READ</name>
+      <title>Read</title>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityField>
+      <name>ACTION_EDIT</name>
+      <title>Edit</title>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityField>
+      <name>ACTION_DELETE</name>
+      <title>Delete</title>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityField>
+      <name>CONDTYPE</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <title>Permission Set ID</title>
+    </entityField>
+    <entityProvider>
+      <name>PermissionOverviews</name>
+      <recordContainer>jDito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>b9f4df41-74e9-41d2-bfe6-1427ae7c8c36</name>
+          <entityName>Role_entity</entityName>
+          <fieldName>PermissionOverviews</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>ac8eb318-8d26-43a0-9463-e1c3741c7710</name>
+          <entityName>PermissionMetaData_entity</entityName>
+          <fieldName>PermissionOverviews</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>RoleTitle_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>EntityTitle_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>ENTITY.value</element>
+        <element>ACTION_VIEW.value</element>
+        <element>ACTION_CREATE.value</element>
+        <element>ACTION_READ.value</element>
+        <element>ACTION_EDIT.value</element>
+        <element>ACTION_DELETE.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6a56d00b4b6a72e855abe258a2da2e2e15c5bded..9e4e5dea7acccd0c6d1649a504f13c63eea3a126 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,1048 +1,1043 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/gender/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</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>
-      <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>
-      <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>Company</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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <title>Edit defaults</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:WRENCH</iconId>
-    </entityActionField>
-    <entityActionField>
-      <name>newOffer</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Offers</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-          <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>
-      <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/gender/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</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>
+      <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>
+      <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>Company</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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Gender_keyword</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <dependencies>
+        <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>
+      <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>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>12c5350a-3159-449b-a94e-d57658b4c124</name>
+          <entityName>Member_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>
+      <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>
+      <title>Edit defaults</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:WRENCH</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newOffer</name>
+      <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>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityConsumer>
+      <name>ObjectRelations</name>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <dependencies>
+        <entityDependency>
+          <name>e46dcd73-64a8-4b3e-b976-1b4643c54ebb</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>ContactsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4d317eb3-6a4e-40c6-946e-d54289dcd99b</name>
+          <entityName>Member_entity</entityName>
+          <fieldName>Contacts</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>
+      <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>
+      <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>
+      <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>
+          <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>
+      <title>Write email</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newemail/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:AT</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newAppointment</name>
+      <title>New appointment</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CALENDAR</iconId>
+      <tooltip>New Appointment</tooltip>
+    </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/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
index 0fbec19d1da86b1b492606a5cc430e756e5d1313..93d8123c03681bebbed47b99243cc230a6543b95 100644
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.neon");
-import("Campaign_lib");
-
-if(vars.exists("$sys.selection")) //selektierte IDs als Array
-{
-    CampaignUtils.addParticipants(vars.getString("$sys.selection"));
+import("system.vars");
+import("system.neon");
+import("Campaign_lib");
+
+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/newappointment/onActionProcess.js b/entity/Person_entity/entityfields/newappointment/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8e1ec06ffd0747eb8bb5b556143f23687aaa1b28
--- /dev/null
+++ b/entity/Person_entity/entityfields/newappointment/onActionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("system.neon");
+import("system.calendars");
+import("Calendar_lib");
+import("system.date");
+import("Context_lib");
+
+var params = {};
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.CONTACTID")));
+
+neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index bf8dae034a5d5494cb58db57a06a970007ef1244..8c2125c5a92036013d111763751929a32a07d38f 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-          <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+          <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>
+      <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/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index bb5fcc0559027a3fd5ab7534a4cc4a53a2ea2a71..a06514c8f8c855531d3b59e0a435121dd5c2783c 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -111,32 +111,33 @@ function buildGraph (elementID, parentElementID, mappingStructure, prod2prodIdMa
     return elements;
 }
 
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
-    var prodid = vars.exists("$param.ProductId_param") 
-                 && vars.get("$param.ProductId_param") != null ? vars.get("$param.ProductId_param") : "";
-    if(prodid != "")
-    {
-        // First 3 columns are crucial, the rest is optional.
-        var data = db.table("select PROD2PRODID, SOURCE_ID, DEST_ID, QUANTITY, PRODUCTCODE, PRODUCTID, PROD2PRODID, OPTIONAL, TAKEPRICE "
-                    + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
-                    + "order by PRODUCTCODE");
-                
-        var prod2prodIdMapping = buildProd2ProdIDMapping(data);
-        var childrenMapping = buildChildrenMapping(data);
-        var rootElements = calculateRootElements(prodid, data);
-        
-        var allData = []
-        
-        rootElements.forEach(function(rg) {
-            var graphData = buildGraph(rg, null, childrenMapping, prod2prodIdMapping)
-            graphData.forEach(function (gd) { allData.push(gd); })
-        })
-                
-        result.object(allData);
-    }
-}
-else
+/*
+ * in the past at this point a check for the "recordstate" was done
+ * this should not be necessery and in fact causes a problem:
+ * When adding a new prod2prod entry and performing a cancel an error is raised that the variable does not exist.
+ * 
+ * So *IF* you need that check for the state, you should check if this error is thrown 
+ * + add a comment why the check is needed here instead of this current comment
+ */
+var prodid = vars.exists("$param.ProductId_param") 
+             && vars.get("$param.ProductId_param") != null ? vars.get("$param.ProductId_param") : "";
+if(prodid != "")
 {
-    result.object([]);
-}
+    // First 3 columns are crucial, the rest is optional.
+    var data = db.table("select PROD2PRODID, SOURCE_ID, DEST_ID, QUANTITY, PRODUCTCODE, PRODUCTID, PROD2PRODID, OPTIONAL, TAKEPRICE "
+                + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID "
+                + "order by PRODUCTCODE");
+
+    var prod2prodIdMapping = buildProd2ProdIDMapping(data);
+    var childrenMapping = buildChildrenMapping(data);
+    var rootElements = calculateRootElements(prodid, data);
+
+    var allData = []
+
+    rootElements.forEach(function(rg) {
+        var graphData = buildGraph(rg, null, childrenMapping, prod2prodIdMapping)
+        graphData.forEach(function (gd) { allData.push(gd); })
+    })
+
+    result.object(allData);
+}
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 2ec9b9aab5c927d43391f1d94ac75473e6f7e5ad..7a361aedf78b3fa0764292e113b67afd179e9d11 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,538 +1,538 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Language_entity</entityName>
-        <fieldName>ISO3Name</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Activities</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityConsumer>
+      <name>Attributes</name>
+      <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>
+      <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>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <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>
+      <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/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 113f1aaafc6aa5301cb36335d752e1468824e8ce..429b00c4a6157a40a7a64391168735f99c4faea3 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,296 +1,296 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>Productprice_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
-  <title>Prices</title>
-  <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
-  <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>
-    </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>
-    </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>
-      <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>
-      <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>
-      <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>
-      <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>
-    <entityField>
-      <name>DELIVERYTERM</name>
-      <title>Deliveryspecification</title>
-    </entityField>
-    <entityField>
-      <name>PAYMENTTERM</name>
-      <title>Paymentterm</title>
-    </entityField>
-    <entityField>
-      <name>INFO</name>
-      <title>Information</title>
-      <contentType>TEXT</contentType>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityConsumer>
-      <name>OrganisationConditions</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Productprice_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
+  <title>Prices</title>
+  <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
+  <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>
+    </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>
+    </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>
+      <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>
+      <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>
+      <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>
+      <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>
+    <entityField>
+      <name>DELIVERYTERM</name>
+      <title>Deliveryspecification</title>
+    </entityField>
+    <entityField>
+      <name>PAYMENTTERM</name>
+      <title>Paymentterm</title>
+    </entityField>
+    <entityField>
+      <name>INFO</name>
+      <title>Information</title>
+      <contentType>TEXT</contentType>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>OrganisationConditions</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </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/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index e5718a964fdc6153cf1187d94c38642e248c4d69..1fab0ebc798e54b8d7573909e54ad38ca92ee730 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,88 +1,88 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <name>Role_entity</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:USER_CHECK</icon>
-  <title>Roles</title>
-  <contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess>
-  <iconId>VAADIN:USER_CHECK</iconId>
-  <recordContainer>jDito</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityField>
-      <name>ROLETITLE</name>
-      <title>Title</title>
-    </entityField>
-    <entityField>
-      <name>ROLETYPE</name>
-      <title>Type</title>
-    </entityField>
-    <entityField>
-      <name>ROLEDESCRIPTION</name>
-      <title>Description</title>
-    </entityField>
-    <entityField>
-      <name>UID</name>
-    </entityField>
-    <entityField>
-      <name>USERCOUNT</name>
-    </entityField>
-    <entityConsumer>
-      <name>Permissions</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionDetail_entity</entityName>
-        <fieldName>Permissions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RoleTitle_param</name>
-          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>PermissionOverviews</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>PermissionOverview_entity</entityName>
-        <fieldName>PermissionOverviews</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>RoleTitle_param</name>
-          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityProvider>
-      <name>Roles</name>
-      <recordContainer>jDito</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>64d800d0-4db5-4b95-ab6a-9197b83cc09c</name>
-          <entityName>PermissionDetail_entity</entityName>
-          <fieldName>Roles</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-  </entityFields>
-  <recordContainers>
-    <jDitoRecordContainer>
-      <name>jDito</name>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <isFilterable v="true" />
-      <contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ROLETITLE.value</element>
-        <element>ROLETYPE.value</element>
-        <element>ROLEDESCRIPTION.value</element>
-        <element>USERCOUNT.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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Role_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:USER_CHECK</icon>
+  <title>Roles</title>
+  <contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconId>VAADIN:USER_CHECK</iconId>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>ROLETITLE</name>
+      <title>Title</title>
+    </entityField>
+    <entityField>
+      <name>ROLETYPE</name>
+      <title>Type</title>
+    </entityField>
+    <entityField>
+      <name>ROLEDESCRIPTION</name>
+      <title>Description</title>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>USERCOUNT</name>
+    </entityField>
+    <entityConsumer>
+      <name>Permissions</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>PermissionDetail_entity</entityName>
+        <fieldName>Permissions</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RoleTitle_param</name>
+          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>PermissionOverviews</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>PermissionOverview_entity</entityName>
+        <fieldName>PermissionOverviews</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RoleTitle_param</name>
+          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>Roles</name>
+      <recordContainer>jDito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>64d800d0-4db5-4b95-ab6a-9197b83cc09c</name>
+          <entityName>PermissionDetail_entity</entityName>
+          <fieldName>Roles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <isFilterable v="true" />
+      <contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>ROLETITLE.value</element>
+        <element>ROLETYPE.value</element>
+        <element>ROLEDESCRIPTION.value</element>
+        <element>USERCOUNT.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 5c3cd9f4fcb02682fce99ab62b5ae57b5b29b828..864db02a9c179e5a07a998c7efd23338be23939d 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
index ee0d25216e614abb98916577c77e51f3460f1995..38822523a7c5999867dbfff1d157e5e59ce99056 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
@@ -1,13 +1,14 @@
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Sql_lib");
-import("system.SQLTYPES")
-
-var forecast = db.cell(SqlCondition.begin()
-                                   .andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
-                                   .buildSql("select sum(VOLUME) from SALESPROJECT_FORECAST", "1=2"));
-                                  
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var forecast = db.cell(SqlCondition.begin()
+                                   .buildSql("select sum(VOLUME) from SALESPROJECT_FORECAST", "1=2"));
+                                   .andPrepare("FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+                                   .buildSql("select sum(VOLUME) from FORECAST", "1=2"));
+                                  
 result.string(forecast);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/conditionProcess.js b/entity/SalesprojectCompetition_entity/conditionProcess.js
deleted file mode 100644
index f28e2da06f6d02e7faa5dee5adb832f282dadf59..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/conditionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_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/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..76d502d1caf3f69fdc72c4fb9b90c4ce9631375f
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+
+result.object([
+    '8af37871-d407-4414-98ad-e64dbaa5794a', // Price politics
+    '558419b2-6113-4060-b88d-cc6324754765', // Strength
+    '71226196-2812-4d70-b90f-c3e2c14fd4d1' // Weakness
+]);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
deleted file mode 100644
index 09c14009f31a5ba857d921e0e9e2aec4c14bc91c..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.db");
-import("Sql_lib");
-
-result.object(db.array(db.COLUMN, SqlCondition.begin()
-                                .andPrepare("SALESPROJECT_COMPETITION.SALESPROJECT_ID", vars.get("$field.SALESPROJECT_ID"))
-                                .buildSql("select CONTACT_ID from SALESPROJECT_COMPETITION", "1=2")));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/salesproject_id/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/salesproject_id/valueProcess.js
deleted file mode 100644
index 5f36de767cbd29329b5ff55802646021c5927057..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/salesproject_id/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    if(vars.exists("$param.SalesprojectId_param") && vars.get("$param.SalesprojectId_param") != null) {
-        result.string(vars.getString("$param.SalesprojectId_param"));    
-    }
-}
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index f28e2da06f6d02e7faa5dee5adb832f282dadf59..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-cond.andPrepareVars("SALESPROJECT_COMPETITION.SALESPROJECT_ID", "$param.SalesprojectId_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/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
deleted file mode 100644
index 9fc93fc11f5b609ac40f70009ecd3f0e312d3365..0000000000000000000000000000000000000000
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ /dev/null
@@ -1,137 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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/SalesprojectForecast_entity/entityfields/salesproject_id/valueProcess.js b/entity/SalesprojectForecast_entity/entityfields/salesproject_id/valueProcess.js
deleted file mode 100644
index 5f36de767cbd29329b5ff55802646021c5927057..0000000000000000000000000000000000000000
--- a/entity/SalesprojectForecast_entity/entityfields/salesproject_id/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    if(vars.exists("$param.SalesprojectId_param") && vars.get("$param.SalesprojectId_param") != null) {
-        result.string(vars.getString("$param.SalesprojectId_param"));    
-    }
-}
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/salesproject_id/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/salesproject_id/valueProcess.js
deleted file mode 100644
index 5f36de767cbd29329b5ff55802646021c5927057..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMember_entity/entityfields/salesproject_id/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    if(vars.exists("$param.SalesprojectId_param") && vars.get("$param.SalesprojectId_param") != null) {
-        result.string(vars.getString("$param.SalesprojectId_param"));    
-    }
-}
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js b/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
deleted file mode 100644
index c44ff2976cfe055a8f1ab36b33130afbd9e711b1..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMember_entity/entityfields/salesproject_role/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectMemberRole(), vars.get("$field.SALESPROJECT_ROLE")));
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 3cc124225ba7b17db565d2e4a52421465e09aa0d..b4c58e18a37126b64ab511832fe7a9d52b8ef9b0 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,185 +1,185 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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>
+      <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>
+      <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 395688326edec3dd1e9f46c936eb6dc34cc4c630..f443b20ebe2ee148a68fac1c12fde522faee60db 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,125 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <title>Information</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>
+      <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 ef5bb9805c67d5c6bbbebfa6ad02f37d3ef36a53..a2c2f769da61385613cab85c72eee74026008961 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,696 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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></description>
-      <contentType>NUMBER</contentType>
-      <inputFormat>#0</inputFormat>
-      <searchable v="true" />
-      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Organisations</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <title>New task</title>
-      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:TASKS</iconId>
-    </entityActionField>
-    <entityConsumer>
-      <name>Tasks</name>
-      <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>SalesprojectMilestone_entity</entityName>
-        <fieldName>StateMilestones</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Attributes</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <state>READONLY</state>
-      <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>
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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></description>
+      <contentType>NUMBER</contentType>
+      <inputFormat>#0</inputFormat>
+      <searchable v="true" />
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <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>
+      <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>
+      <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>Forecasts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Forecast_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/forecasts/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Competitions</name>
+      <selectionMode>MULTI</selectionMode>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Competition_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/competitions/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/competitions/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/offers/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/offers/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <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>Members</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Member_entity</entityName>
+        <fieldName>Links</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/members/children/objectrowid_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/members/children/objecttype_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newOffer</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</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>
+      <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>
+      <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>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Tasks</name>
+      <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectMilestone_entity</entityName>
+        <fieldName>StateMilestones</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <state>READONLY</state>
+      <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/entityfields/classificationresult/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
index aa00d635b63e157cb00b3861bf412fc79b426e16..ec7e306ee9580b62b61f879c1acac71f7c0872ad 100644
--- a/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js
@@ -4,4 +4,5 @@ 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
+var classes = ClassificationUtils.getClass($KeywordRegistry.classificationType$salesproject(), ContextUtils.getCurrentContextId(), vars.get("$sys.uid"))
+result.string(classes);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/competitions/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/competitions/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b119ebfa1944164fd2a1cb645511740bec9015e
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/competitions/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/competitions/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/competitions/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc6924394ae950c43386275dda2c8db5d7a9c0ed
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/competitions/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e443fa2a1062390231b0d24f7bde6d886e21a954
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECTID"));
diff --git a/entity/Salesproject_entity/entityfields/forecasts/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/forecasts/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c346bbcfecb98c65bb737be761cd1c66191250b9
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/forecasts/children/objecttype_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("Context_lib");
+import("system.result");
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/members/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/members/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b119ebfa1944164fd2a1cb645511740bec9015e
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/members/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/members/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/members/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc6924394ae950c43386275dda2c8db5d7a9c0ed
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/members/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/offers/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/offers/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b119ebfa1944164fd2a1cb645511740bec9015e
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/offers/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/offers/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/offers/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc6924394ae950c43386275dda2c8db5d7a9c0ed
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/offers/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/valueProcess.js
rename to entity/Salesproject_entity/entityfields/salesprojectforecasts/children/forecastid_param/valueProcess.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a19da02962159545a287ddc773e7320d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectforecasts/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/salesprojectmembers/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a19da02962159545a287ddc773e7320d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectmembers/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/salesprojectoffers/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/valueProcess.js
deleted file mode 100644
index b9a94c51a19da02962159545a287ddc773e7320d..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/salesprojectoffers/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/salesprojectsopen/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
index e593be26ec8829f70c64b9efa45061cb427cb08b..52a7642475b873a3e9afb4e686aa447f07ec64d5 100644
--- a/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/salesprojectsopen/children/state_param/valueProcess.js
@@ -1,5 +1,5 @@
 import("system.result");
 
 
-//KeywordId for SalesprojectCompetitionState OPEN
+//KeywordId for CompetitionState OPEN
 result.string("25b0ac77-ef92-4809-802e-bb9d8782f865")
\ 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 63f1823605ffbd72027c574e96024582fd2dc7fb..dc8096032637d39091a4bec27f435dd08d99165e 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -1,29 +1,42 @@
-import("system.db");
-import("system.vars");
-import("Sql_lib");
-import("Context_lib");
-
-var currentId = vars.getString("$field.SALESPROJECTID");
-
-if (currentId)
-{
-    var toDelete = [
-        "SALESPROJECT_COMPETITION",
-        "SALESPROJECT_MILESTONE",
-        "SALESPROJECT_FORECAST",
-        "SALESPROJECT_MEMBER",
-        "SALESPROJECT_SOURCE"
-    ];
-    
-    toDelete = toDelete.map(function(pTable)
-    {
-        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?
+import("Context_lib");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+var currentId = vars.getString("$field.SALESPROJECTID");
+
+if (currentId)
+{
+    var toDelete = [
+    "SALESPROJECT_MILESTONE",
+    "SALESPROJECT_SOURCE"
+    ];
+    
+        
+    toDelete = toDelete.map(function(pTable)
+    {
+        return [pTable, SqlCondition.equals(pTable + ".SALESPROJECT_ID", currentId, "1=2")];
+    });
+    
+    
+    
+    var modulesToDelete = [
+    "CLASSIFICATION",
+    "COMPETITION",
+    "MEMBER",
+    "FORECAST"
+    ];
+
+    toDelete = toDelete.concat(modulesToDelete.map(function(pTableComp)
+    {
+        return [pTableComp, SqlCondition.begin()
+        .andPrepare(pTableComp + ".OBJECT_TYPE", ContextUtils.getCurrentContextId())
+        .andPrepare(pTableComp + ".OBJECT_ROWID", currentId)
+        .build("1=2")];
+    }));
+    
+    
+    db.deletes(toDelete);
+
+// TODO: auch Dokumente, Aktivitäten, Aufgaben, Zeiterfassungen löschen?
 }
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index 95c901de86dfdf90d075c1311539cfe8971f4886..67dfadce51729efc98e31f67a5a9892eb264710e 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -33,7 +33,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
             if (state == 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd')
             {
                 // set all offers of the salesproject to lost
-                db.updateData("OFFER", ["STATUS"], null, ["a5682630-01ae-4769-8f03-47dc1db44da4"], SqlCondition.equals("OFFER.SALESPROJECT_ID", vars.getString("$field.SALESPROJECTID"), "1=2"));
+                db.updateData("OFFER", ["STATUS"], null, ["a5682630-01ae-4769-8f03-47dc1db44da4"], SqlCondition.equals("OFFER.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
                 _updateReasons();
                 clearReason = false;
             }
@@ -41,7 +41,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
             else if (state == '130bb53a-a97e-455e-8f34-8d445e985474')
             {
                 // set all competitions of the salesproject to lost
-                db.updateData("SALESPROJECT_COMPETITION", ["STATUS"], null, ["ff73172c-8517-4b6e-98cb-43aebacd9af1"], SqlCondition.equals("SALESPROJECT_COMPETITION.SALESPROJECT_ID", vars.getString("$field.SALESPROJECTID"), "1=2"));
+                db.updateData("COMPETITION", ["STATUS"], null, ["ff73172c-8517-4b6e-98cb-43aebacd9af1"], SqlCondition.equals("COMPETITION.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
                 _updateReasons();
                 clearReason = false;
             }
@@ -50,7 +50,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
             {
                 // do not notify as the user just got a question, if he really would like to clear the forecast
                 needToUpdateForecast = false;
-                db.deleteData("SALESPROJECT_FORECAST", SqlCondition.equals("SALESPROJECT_FORECAST.SALESPROJECT_ID", vars.getString("$field.SALESPROJECTID"), "1=2"));
+                db.deleteData("FORECAST", SqlCondition.equals("FORECAST.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
             }
             // if state changed, but not to one of the above states
             else
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 71e92e08a6c44e8ab340f41d9427ccd903aa531b..3c1f61ab2b0cc3e31b257b069328cda02f75031a 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,40 +1,40 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 da79acffd1c902c6095895d451eca50e33bab7f2..8a20efcfe08b7db243bebdac6d958ab4914b729a 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 67c29c8f37627e29690cbae1e241b84a19cb5046..7744aeaa83908e4a9820e15002035b670ac0bcc0 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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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 2b4c23327771b07d04682d6391012c4160c0ac01..c5ad1b78ead08d8f5e962af19d4b0c549bc721db 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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 1c8f12bc89375a40d82622cc5157cd7ff458fe7c..dd9a71014ae44dc0ee93b802a5d34a1408f2f1b5 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,120 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Context_entity</entityName>
-        <fieldName>TaskLinkable</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Objects</name>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Context_entity</entityName>
+        <fieldName>TaskLinkable</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Objects</name>
+      <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 b769a9dc97f3508aeae5421d9460f7b45d0debc8..9fc98a92cb538970b95f286f69fa5bb7c08d7e7b 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,553 +1,609 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-  <onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
-  <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>
-    </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>
-    </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>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ContactRequestors</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>MainDocuments</name>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <name>Task_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
+  <title>Task</title>
+  <contentTitleProcess>%aditoprj%/entity/Task_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
+  <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>
+      <title>task number</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>0000000</outputFormat>
+      <inputFormat>0000000</inputFormat>
+      <searchable v="false" />
+      <state>DISABLED</state>
+      <stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
+    </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>
+      <groupable v="true" />
+      <mandatory 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>
+      <groupable v="true" />
+      <mandatory 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>
+    </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>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>type</title>
+      <consumer>KeywordTypes</consumer>
+      <groupable v="true" />
+      <searchable v="true" />
+      <state>READONLY</state>
+      <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>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContactRequestors</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>MainDocuments</name>
+      <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>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>
+      <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>
+      <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>
+      <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>
+      <title>New activity</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:HOURGLASS_END</iconId>
+      <tooltip>New activity</tooltip>
+      <tooltipProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask</name>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>Tasks</name>
+      <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>
+      <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>
+      <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>
+    <entityConsumer>
+      <name>Attributes</name>
+      <stateProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/stateProcess.js</stateProcess>
+      <onValidation>%aditoprj%/entity/Task_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/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ShowEmpty_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>FilteredAttributeIds_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DisplaySimpleName_param</name>
+          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>Type_param</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionGroup>
+      <name>tableActions</name>
+      <children>
+        <entityActionField>
+          <name>newBugTicket</name>
+          <title>New Bugticket</title>
+          <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:PUZZLE_PIECE</iconId>
+          <tooltip>New Bugticket</tooltip>
+        </entityActionField>
+        <entityActionField>
+          <name>newSupportTicket</name>
+          <title>New Supportticket</title>
+          <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:QUESTION</iconId>
+          <tooltip>New Supportticket</tooltip>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+  </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>
+      <onDBInsert>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <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>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>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Task_entity/contentTitleProcess.js b/entity/Task_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..42200983cd942d93065d3728601f40eb2cc2d4ad
--- /dev/null
+++ b/entity/Task_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TYPE.displayValue"))
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
similarity index 100%
rename from entity/Classification_entity/entityfields/classificationsadministration/children/isadminmode_param/valueProcess.js
rename to entity/Task_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
diff --git a/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..47009a542400d5bd799e4892bf7c05a261be8aea
--- /dev/null
+++ b/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("ActivityTask_lib");
+
+result.object(TaskUtils.getTypeAttributes(vars.get("$field.TYPE")));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
similarity index 55%
rename from entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
rename to entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index 55b3460083670fb4c229762303b24bd9585dbaaf..9bd2844554488d1a7fb68ec959556b48ef4566b3 100644
--- a/entity/Classification_entity/entityfields/isadminmode_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(1);
\ No newline at end of file
+result.string(vars.get("$field.TASKID"))
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f0153b04fc8c8d5a96fd136bdc438f35169d787
--- /dev/null
+++ b/entity/Task_entity/entityfields/attributes/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/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40effa0178464da0c7850912345f19c7fa95975a
--- /dev/null
+++ b/entity/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/attributes/onValidation.js b/entity/Task_entity/entityfields/attributes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..508c2b5e9491f486c6c9ceb574b1b951dd5acc62
--- /dev/null
+++ b/entity/Task_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(), "Attributes"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/stateProcess.js b/entity/Task_entity/entityfields/attributes/stateProcess.js
similarity index 65%
rename from entity/Classification_entity/entityfields/classificationscores/stateProcess.js
rename to entity/Task_entity/entityfields/attributes/stateProcess.js
index 02b7fbc2bb2c333e2948112fad78a3b816c71313..8c4ca0d7a0ad5b3a03f3206a27db0c7fba0fa525 100644
--- a/entity/Classification_entity/entityfields/classificationscores/stateProcess.js
+++ b/entity/Task_entity/entityfields/attributes/stateProcess.js
@@ -1,8 +1,9 @@
-import("system.neon");
 import("system.result");
 import("system.vars");
+import("system.neon");
+import("ActivityTask_lib");
 
-if (vars.exists("$param.IsAdminMode_param") && vars.getString("$param.IsAdminMode_param") == "1")
+if (TaskUtils.typeHasAttributes(vars.get("$field.TYPE")))
 {
     result.string(neon.COMPONENTSTATE_EDITABLE);
 }
diff --git a/entity/Task_entity/entityfields/code/documentation.adoc b/entity/Task_entity/entityfields/code/documentation.adoc
deleted file mode 100644
index 23f0e1f5074bd4a70aab2155d98e0127d0430ddc..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/code/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-The `CODE` field is reserved for future implementations. It's in no view and does not store any value or has any other interaction.
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/stateProcess.js b/entity/Task_entity/entityfields/code/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b066ae31a4bfa6b06c5c8c9bf20df77e978fe24e
--- /dev/null
+++ b/entity/Task_entity/entityfields/code/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("ActivityTask_lib");
+
+if (TaskUtils.getShowCode(vars.get("$field.TYPE")))
+{
+    result.string(neon.COMPONENTSTATE_READONLY);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js b/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
index 8590e504f05a614b1c0c4b74901bb008feb47b94..d2a77dbd123cda7f78fb2c8f4d8f24b97b18c51d 100644
--- a/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/keywordstates/children/containername_param/valueProcess.js
@@ -1,5 +1,5 @@
+import("system.vars");
+import("ActivityTask_lib");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-result.string($KeywordRegistry.taskStatus());
+result.string(TaskUtils.getTypeStatusKeyword(vars.get("$field.TYPE")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/linkedobjects/children/presettype_param/valueProcess.js b/entity/Task_entity/entityfields/linkedobjects/children/presettype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/priority_icon/valueProcess.js b/entity/Task_entity/entityfields/priority_icon/valueProcess.js
index 1d877139db73d94e330e88594b9476b9afc85b9d..74ff67f1f27ad41536797fc61cac709a3c2299c4 100644
--- a/entity/Task_entity/entityfields/priority_icon/valueProcess.js
+++ b/entity/Task_entity/entityfields/priority_icon/valueProcess.js
@@ -1,20 +1,6 @@
-import("system.vars");
-import("KeywordRegistry_basic");
-import("system.result");
-
-switch(vars.getString("$field.STATUS"))
-{
-    case $KeywordRegistry.taskStatus$new():
-        result.string("NEON:STATUS_NOT_STARTED");
-        break;
-    case $KeywordRegistry.taskStatus$inProcess():
-        result.string("NEON:STATUS_IN_PROGRESS");
-        break;
-    case $KeywordRegistry.taskStatus$waiting():
-        result.string("NEON:STATUS_WAITING");
-        break;
-    case $KeywordRegistry.taskStatus$ended():
-        result.string("NEON:STATUS_DONE");
-        break;
-}
-
+import("system.vars");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string(TaskUtils.getStatusIcon(vars.getString("$field.TYPE"), vars.getString("$field.STATUS")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/status/displayValueProcess.js b/entity/Task_entity/entityfields/status/displayValueProcess.js
index 759b610257ea2c3b32d2835923f9951bc6455d21..38abbb7de7a0411c01486d243c0cc215f694157f 100644
--- a/entity/Task_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Task_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
+import("ActivityTask_lib");
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUS")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue(TaskUtils.getTypeStatusKeyword(vars.get("$field.TYPE")), vars.get("$field.STATUS")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/status/valueProcess.js b/entity/Task_entity/entityfields/status/valueProcess.js
index fe5d8581fd1d4c730aa95a9d23345b118513674c..15024ad9a4247e1020dc9527666d3d6d8145b2e4 100644
--- a/entity/Task_entity/entityfields/status/valueProcess.js
+++ b/entity/Task_entity/entityfields/status/valueProcess.js
@@ -1,8 +1,20 @@
+import("ActivityTask_lib");
 import("system.util");
 import("system.result");
 import("system.neon");
 import("system.vars");
 import("KeywordRegistry_basic");
+import("Keyword_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string($KeywordRegistry.taskStatus$new());
\ No newline at end of file
+{
+    var states = KeywordUtils.getEntryNamesAndIdsByContainer(TaskUtils.getTypeStatusKeyword(vars.get("$field.TYPE")))
+    if (states.length > 0)
+    {
+        result.string(states[0][0]);
+    }
+    else
+    {
+        result.string("");
+    }
+}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js b/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a967a81057b8ce337e9789b841c044c007f343f
--- /dev/null
+++ b/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
+import("Context_lib");
+
+// no parentid as tickets do not use them
+TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), undefined, {Type_param: $KeywordRegistry.taskType$bugTicket()});
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js b/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..56a663ad518bb5156c6a5ed889190b143fa87200
--- /dev/null
+++ b/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
+import("Context_lib");
+
+// no parentid as tickets do not use them
+TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), undefined, {Type_param: $KeywordRegistry.taskType$supportTicket()});
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
index e1331380ae6b66c5317e8bb769149a68f057d83a..5785a095c958b5fe6e59428fce0420b546ae38db 100644
--- a/entity/Task_entity/entityfields/type/valueProcess.js
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -1,5 +1,10 @@
 import("system.result");
+import("system.vars");
+import("system.neon");
 import("KeywordRegistry_basic");
 
-// Sets the type to "Task" as default value.
-result.string($KeywordRegistry.taskType$Task());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    // Sets the type to "Task" as default value.
+    result.string(vars.get("$param.Type_param"));
+}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type_param/valueProcess.js b/entity/Task_entity/entityfields/type_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1d6cdd9b2e130ea987bb633c2422d98befe664b
--- /dev/null
+++ b/entity/Task_entity/entityfields/type_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.taskType$Task());
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBInsert.js b/entity/Task_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1600f76112729020c057ab2a436a59ca5da716e
--- /dev/null
+++ b/entity/Task_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("ActivityTask_lib")
+
+TaskUtils.setCode(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 30eb95f58808f11dcc55f47d69c83025233fe2db..2ff962697835ef0243dc987da40063bfc1dee5b6 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,6 +1,2 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskStatus(), "TASK.STATUS");
-result.string(sql);
+// do not use this, because TaskUtils.getTypeStatusKeyword(vars.get("$field.TYPE")) has to be called, which is not possible in a subselect.
+// --> only use display value process
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 733e95be2cfbb5c55deb774da9c8556a3143e883..99696a060a4775c562003a3a594d30c31f6da154 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,163 +1,163 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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 fcd836cbfb05d38f9a142217b5076ffc272b99ec..677abbe530472051bfe828aa97b88f1dec317adc 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,103 +1,103 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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 f98905ba9fd812fdac45e5bcc7fe987b415eb1c2..6c0f3b465bf10066800c6e56b117a90239061399 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,99 +1,99 @@
-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
-  <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>
-      <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>
-      <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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
+  <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>
+      <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>
+      <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/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index 6083d605bc6b79bd6de1d3e68bb0c03b70bdc358..4f94c77a16d4c1158c06232d605d56ad62009d08 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -1,116 +1,116 @@
-import("Turnover_lib");
-import("system.vars");
-import("system.result");
-import("Money_lib");
-import("system.datetime");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
-import("system.translate");
-
-var turnoverCategory = translate.text('Turnover');
-var forecastCategory = translate.text('Forecast');
-
-var maxYear = parseInt(vars.get("$param.MaxYear_param"));
-var yearCountToShow = parseInt(vars.get("$param.YearCountToShow_param"));
-var minYear = maxYear - yearCountToShow + 1;
-
-var data = TurnoverUtil.getTurnoverAndForecastData(maxYear, yearCountToShow);
-
-var columns = {
-    type: 0,
-    year: 1,
-    month: 2,
-    discount: 3,
-    vat: 4,
-    price: 5,
-    quantity: 6,
-    groupcodeId: 7,
-    groupcodeName: 8
-};
-
-var chartData = [];
-var countData = {}
-
-var monthDate;
-    
-// add all months for all years
-for (let y = minYear; y <= maxYear; y++)
-{
-    for (let m = 0; m < 12; m++) 
-    {
-        monthDate = new Date(y, m-1);
-        monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
-        _addCount([forecastCategory, ""+y, [m, monthDate]], 0.0);
-        _addCount([turnoverCategory, ""+y, [m, monthDate]], 0.0);
-    }
-}
-
-data.forEach(function(row) 
-{    
-    monthDate = new Date(row[columns.year], row[columns.month]-1);
-    monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
-    
-    switch(row[columns.type])
-    {
-        case forecastCategory:
-            _addCount([row[columns.type], row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], row[columns.price]);
-            break;
-        case turnoverCategory:
-            _addCount([row[columns.type], row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], 
-                MoneyUtils.getGross(
-                    (row[columns.vat] ? parseFloat(row[columns.vat]) : 0.0),
-                    (row[columns.price] ? parseFloat(row[columns.price]) : 0.0),
-                    (row[columns.quantity] ? parseFloat(row[columns.quantity]) : 0.0),
-                    (row[columns.discount] ? parseFloat(row[columns.discount]) : 0.0)));
-            break;
-    }
-});
-
-for (let key in countData) {
-    var countDataSet = countData[key];
-    chartData.push([key, countDataSet.parent, countDataSet.category, countDataSet.x, countDataSet.count]);
-}
-
-result.object(chartData);
-
-/**
- * add the counts to countData for the given key and value
- * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
- *                      the first key is the Category
- * @param {float} pValue the value to display
- */
-function _addCount(pKeys, pValue) {
-    var key = "";
-    
-    for (let i = 0; i < pKeys.length; i++) {
-        let keyId;
-        let keyName;
-        
-        if (typeof pKeys[i] != "object")
-        {
-            keyId = pKeys[i];
-            keyName = pKeys[i];
-        }
-        else // handle array: first is id seccond is name for X-value
-        {
-            keyId = pKeys[i][0];
-            keyName = pKeys[i][1];
-        }
-        var parent = key;
-        if (i < 2)
-        {
-            parent = ""
-        }
-
-        key += ";" + keyId;
-        if (i > 0)
-        {
-            if (countData[key] == undefined)
-            {
-                countData[key] = {parent: parent, count: 0.0, category: pKeys[0], x: keyName}; // keys[0] is the category
-            }
-
-            countData[key].count += parseFloat(pValue);
-        }
-    }
+import("Turnover_lib");
+import("system.vars");
+import("system.result");
+import("Money_lib");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.translate");
+
+var turnoverCategory = translate.text('Turnover');
+var forecastCategory = translate.text('Forecast');
+
+var maxYear = parseInt(vars.get("$param.MaxYear_param"));
+var yearCountToShow = parseInt(vars.get("$param.YearCountToShow_param"));
+var minYear = maxYear - yearCountToShow + 1;
+
+var data = TurnoverUtil.getTurnoverAndForecastData(maxYear, yearCountToShow);
+
+var columns = {
+    type: 0,
+    year: 1,
+    month: 2,
+    discount: 3,
+    vat: 4,
+    price: 5,
+    quantity: 6,
+    groupcodeId: 7,
+    groupcodeName: 8
+};
+
+var chartData = [];
+var countData = {}
+
+var monthDate;
+    
+// add all months for all years
+for (let y = minYear; y <= maxYear; y++)
+{
+    for (let m = 0; m < 12; m++) 
+    {
+        monthDate = new Date(y, m-1);
+        monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
+        _addCount([forecastCategory, ""+y, [m, monthDate]], 0.0);
+        _addCount([turnoverCategory, ""+y, [m, monthDate]], 0.0);
+    }
+}
+
+data.forEach(function(row) 
+{    
+    monthDate = new Date(row[columns.year], row[columns.month]-1);
+    monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
+    
+    switch(row[columns.type])
+    {
+        case forecastCategory:
+            _addCount([row[columns.type], row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], row[columns.price]);
+            break;
+        case turnoverCategory:
+            _addCount([row[columns.type], row[columns.year], [row[columns.month], monthDate], [row[columns.groupcodeId], row[columns.groupcodeName]]], 
+                MoneyUtils.getGross(
+                    (row[columns.vat] ? parseFloat(row[columns.vat]) : 0.0),
+                    (row[columns.price] ? parseFloat(row[columns.price]) : 0.0),
+                    (row[columns.quantity] ? parseFloat(row[columns.quantity]) : 0.0),
+                    (row[columns.discount] ? parseFloat(row[columns.discount]) : 0.0)));
+            break;
+    }
+});
+
+for (let key in countData) {
+    var countDataSet = countData[key];
+    chartData.push([key, countDataSet.parent, countDataSet.category, countDataSet.x, countDataSet.count]);
+}
+
+result.object(chartData);
+
+/**
+ * add the counts to countData for the given key and value
+ * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
+ *                      the first key is the Category
+ * @param {float} pValue the value to display
+ */
+function _addCount(pKeys, pValue) {
+    var key = "";
+    
+    for (let i = 0; i < pKeys.length; i++) {
+        let keyId;
+        let keyName;
+        
+        if (typeof pKeys[i] != "object")
+        {
+            keyId = pKeys[i];
+            keyName = pKeys[i];
+        }
+        else // handle array: first is id seccond is name for X-value
+        {
+            keyId = pKeys[i][0];
+            keyName = pKeys[i][1];
+        }
+        var parent = key;
+        if (i < 2)
+        {
+            parent = ""
+        }
+
+        key += ";" + keyId;
+        if (i > 0)
+        {
+            if (countData[key] == undefined)
+            {
+                countData[key] = {parent: parent, count: 0.0, category: pKeys[0], x: keyName}; // keys[0] is the category
+            }
+
+            countData[key].count += parseFloat(pValue);
+        }
+    }
 }
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 59b7ec497683e428709b4ba9b436b00fa4776670..d2d589154dd5ac77102343155628cb70a1f8e57c 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -57,9 +57,6 @@
     <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>
@@ -69,9 +66,6 @@
     <entry>
       <key>Contactmanagement</key>
     </entry>
-    <entry>
-      <key>Mobile</key>
-    </entry>
     <entry>
       <key>Office address</key>
     </entry>
@@ -93,9 +87,6 @@
     <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>
@@ -381,24 +372,6 @@
     <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>
@@ -498,18 +471,6 @@
     <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>
@@ -528,9 +489,6 @@
     <entry>
       <key>Milestones</key>
     </entry>
-    <entry>
-      <key>Milestone</key>
-    </entry>
     <entry>
       <key>Excreted</key>
     </entry>
@@ -546,9 +504,6 @@
     <entry>
       <key>Forecast</key>
     </entry>
-    <entry>
-      <key>Datei</key>
-    </entry>
     <entry>
       <key>Role</key>
     </entry>
@@ -576,51 +531,24 @@
     <entry>
       <key>Classification</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>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>Standard / Individual</key>
-    </entry>
     <entry>
       <key>Please update the ${FORECAST_ENGLISH}.</key>
     </entry>
-    <entry>
-      <key>no Project planned</key>
-    </entry>
     <entry>
       <key>Value</key>
     </entry>
-    <entry>
-      <key>Projectstart</key>
-    </entry>
     <entry>
       <key>no valid format</key>
     </entry>
@@ -906,9 +834,6 @@
     <entry>
       <key>Free</key>
     </entry>
-    <entry>
-      <key>From</key>
-    </entry>
     <entry>
       <key>Total</key>
     </entry>
@@ -981,9 +906,6 @@
     <entry>
       <key>Senden per E-Mail</key>
     </entry>
-    <entry>
-      <key>Hauptdokument</key>
-    </entry>
     <entry>
       <key>Betreff</key>
     </entry>
@@ -1008,18 +930,12 @@
     <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>
@@ -1089,12 +1005,6 @@
     <entry>
       <key>Title (original language)</key>
     </entry>
-    <entry>
-      <key>Attribute Relation</key>
-    </entry>
-    <entry>
-      <key>Attribute Usage</key>
-    </entry>
     <entry>
       <key>Key</key>
     </entry>
@@ -2151,9 +2061,6 @@
     <entry>
       <key>Object type</key>
     </entry>
-    <entry>
-      <key>Level</key>
-    </entry>
     <entry>
       <key>Print Offer</key>
     </entry>
@@ -2178,18 +2085,9 @@
     <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>
@@ -2352,9 +2250,6 @@
       <key>30 days net</key>
       <value></value>
     </entry>
-    <entry>
-      <key>Relation tree</key>
-    </entry>
     <entry>
       <key>Directly responsible:</key>
     </entry>
@@ -2421,18 +2316,12 @@
     <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>
@@ -2451,9 +2340,6 @@
     <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>
@@ -2499,12 +2385,6 @@
     <entry>
       <key>Campaign Step</key>
     </entry>
-    <entry>
-      <key>Campaign Participant</key>
-    </entry>
-    <entry>
-      <key>Campaign Steps</key>
-    </entry>
     <entry>
       <key>360 Degree</key>
     </entry>
@@ -2517,48 +2397,21 @@
     <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>
@@ -2619,18 +2472,12 @@
     <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>
@@ -2679,9 +2526,6 @@
     <entry>
       <key>Maturity</key>
     </entry>
-    <entry>
-      <key>Stored selections</key>
-    </entry>
     <entry>
       <key>Username</key>
     </entry>
@@ -2691,15 +2535,6 @@
     <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>
@@ -2709,9 +2544,6 @@
     <entry>
       <key>Project</key>
     </entry>
-    <entry>
-      <key>Human resources</key>
-    </entry>
     <entry>
       <key>Project management</key>
     </entry>
@@ -2727,12 +2559,6 @@
     <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>
@@ -2751,9 +2577,6 @@
     <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>
@@ -2763,9 +2586,6 @@
     <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>
@@ -2781,9 +2601,6 @@
     <entry>
       <key>Deleted all usages of \"%0\".</key>
     </entry>
-    <entry>
-      <key>promotion target ofc</key>
-    </entry>
     <entry>
       <key>Successful</key>
     </entry>
@@ -2808,30 +2625,15 @@
     <entry>
       <key>Object relation</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>
@@ -2844,21 +2646,9 @@
     <entry>
       <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</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>
@@ -2880,9 +2670,6 @@
     <entry>
       <key>Steps</key>
     </entry>
-    <entry>
-      <key>CampaignStep</key>
-    </entry>
     <entry>
       <key>Added</key>
     </entry>
@@ -2892,9 +2679,6 @@
     <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>
@@ -2922,15 +2706,9 @@
     <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>
@@ -2958,9 +2736,6 @@
     <entry>
       <key>file '%0' cannot be read</key>
     </entry>
-    <entry>
-      <key>Campaign costs</key>
-    </entry>
     <entry>
       <key>Importer</key>
     </entry>
@@ -2982,15 +2757,9 @@
     <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>
@@ -3012,9 +2781,6 @@
     <entry>
       <key>Variable costs</key>
     </entry>
-    <entry>
-      <key>Version number</key>
-    </entry>
     <entry>
       <key>Id value</key>
     </entry>
@@ -3066,9 +2832,6 @@
     <entry>
       <key>Timetracking Id</key>
     </entry>
-    <entry>
-      <key>Salesorder date</key>
-    </entry>
     <entry>
       <key>Exec type</key>
     </entry>
@@ -3093,9 +2856,6 @@
     <entry>
       <key>Id</key>
     </entry>
-    <entry>
-      <key>Start date</key>
-    </entry>
     <entry>
       <key>Object 1 row Id</key>
     </entry>
@@ -3171,12 +2931,6 @@
     <entry>
       <key>Task link Id</key>
     </entry>
-    <entry>
-      <key>Protection level</key>
-    </entry>
-    <entry>
-      <key>Salesorder code</key>
-    </entry>
     <entry>
       <key>BOOL VALUE</key>
     </entry>
@@ -3303,9 +3057,6 @@
     <entry>
       <key>Keyword entry Id</key>
     </entry>
-    <entry>
-      <key>Salesproject classification Id</key>
-    </entry>
     <entry>
       <key>Stop costs</key>
     </entry>
@@ -3321,9 +3072,6 @@
     <entry>
       <key>Date start</key>
     </entry>
-    <entry>
-      <key>Cover Letter</key>
-    </entry>
     <entry>
       <key>Deployment Id</key>
     </entry>
@@ -3339,9 +3087,6 @@
     <entry>
       <key>Creation user</key>
     </entry>
-    <entry>
-      <key>Unit Price</key>
-    </entry>
     <entry>
       <key>Object Id</key>
     </entry>
@@ -3393,9 +3138,6 @@
     <entry>
       <key>Tablename Id</key>
     </entry>
-    <entry>
-      <key>Offer date</key>
-    </entry>
     <entry>
       <key>Competitors</key>
     </entry>
@@ -3414,9 +3156,6 @@
     <entry>
       <key>Document Template</key>
     </entry>
-    <entry>
-      <key>Document Templates</key>
-    </entry>
     <entry>
       <key>Text Modular</key>
     </entry>
@@ -3441,18 +3180,6 @@
     <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>
@@ -3504,9 +3231,6 @@
     <entry>
       <key>Keyword Attributes</key>
     </entry>
-    <entry>
-      <key>HTML</key>
-    </entry>
     <entry>
       <key>Student/Internship</key>
     </entry>
@@ -3681,15 +3405,6 @@
     <entry>
       <key>Scoretype</key>
     </entry>
-    <entry>
-      <key>${NUMBER_FORMAT_NEEDED}</key>
-    </entry>
-    <entry>
-      <key>Possible values</key>
-    </entry>
-    <entry>
-      <key>ARCHIVE</key>
-    </entry>
     <entry>
       <key>archieve</key>
     </entry>
@@ -3699,9 +3414,6 @@
     <entry>
       <key>Rating</key>
     </entry>
-    <entry>
-      <key>sum</key>
-    </entry>
     <entry>
       <key>setRead</key>
     </entry>
@@ -3711,15 +3423,9 @@
     <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>
@@ -3756,12 +3462,6 @@
     <entry>
       <key>Postcode</key>
     </entry>
-    <entry>
-      <key>Sales Dashboard</key>
-    </entry>
-    <entry>
-      <key>Main Resp.</key>
-    </entry>
     <entry>
       <key>Main document</key>
     </entry>
@@ -3771,9 +3471,6 @@
     <entry>
       <key>Street</key>
     </entry>
-    <entry>
-      <key>Permission Action</key>
-    </entry>
     <entry>
       <key>Start</key>
     </entry>
@@ -3786,15 +3483,9 @@
     <entry>
       <key>File</key>
     </entry>
-    <entry>
-      <key>Parent Permission Action</key>
-    </entry>
     <entry>
       <key> User</key>
     </entry>
-    <entry>
-      <key>Parent Permission</key>
-    </entry>
     <entry>
       <key>Edit</key>
     </entry>
@@ -3807,9 +3498,6 @@
     <entry>
       <key>Permission  Overview</key>
     </entry>
-    <entry>
-      <key>Permission Admin</key>
-    </entry>
     <entry>
       <key>PermissionId</key>
     </entry>
@@ -3822,9 +3510,6 @@
     <entry>
       <key>Field</key>
     </entry>
-    <entry>
-      <key>Permission Set</key>
-    </entry>
     <entry>
       <key>Permission Detail</key>
     </entry>
@@ -3840,15 +3525,9 @@
     <entry>
       <key>Create</key>
     </entry>
-    <entry>
-      <key>Permission</key>
-    </entry>
     <entry>
       <key>To buildingnumber</key>
     </entry>
-    <entry>
-      <key>Access Type</key>
-    </entry>
     <entry>
       <key>Permission Overview</key>
     </entry>
@@ -3864,15 +3543,9 @@
     <entry>
       <key>Salutations</key>
     </entry>
-    <entry>
-      <key>Footer</key>
-    </entry>
     <entry>
       <key>Paymentterm</key>
     </entry>
-    <entry>
-      <key>Header</key>
-    </entry>
     <entry>
       <key>New step</key>
     </entry>
@@ -3885,9 +3558,6 @@
     <entry>
       <key>Total costs</key>
     </entry>
-    <entry>
-      <key>Costs per participant</key>
-    </entry>
     <entry>
       <key>Per participant</key>
     </entry>
@@ -3951,6 +3621,54 @@
     <entry>
       <key>Email Template</key>
     </entry>
+    <entry>
+      <key>${SQL_LIB_FIELD_WRONG_FORMAT} field: %0</key>
+    </entry>
+    <entry>
+      <key>testing</key>
+    </entry>
+    <entry>
+      <key>double</key>
+    </entry>
+    <entry>
+      <key>closed</key>
+    </entry>
+    <entry>
+      <key>New Supportticket</key>
+    </entry>
+    <entry>
+      <key>Bug Ticket</key>
+    </entry>
+    <entry>
+      <key>Support ticket</key>
+    </entry>
+    <entry>
+      <key>New Bugticket</key>
+    </entry>
+    <entry>
+      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+    </entry>
+    <entry>
+      <key>Search for new Entries</key>
+    </entry>
+    <entry>
+      <key>Salesproject member</key>
+    </entry>
+    <entry>
+      <key>Maximal count has to be a whole number</key>
+    </entry>
+    <entry>
+      <key>Minimal count must be a positive whole number</key>
+    </entry>
+    <entry>
+      <key>Meilensteine und Kontaktpunkte</key>
+    </entry>
+    <entry>
+      <key>Maximal count must be one or higher</key>
+    </entry>
     <entry>
       <key>Campaign name</key>
     </entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 45590005835967f3be99177062adc7e228e35ef7..09fcc235ede94998445456baaa5a8d05e0ec2399 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,10 +6,6 @@
   <country></country>
   <variant></variant>
   <keyValueMap>
-    <entry>
-      <key>SalesprojectState</key>
-      <value>Status</value>
-    </entry>
     <entry>
       <key>Steps</key>
       <value>Stufen</value>
@@ -31,8 +27,8 @@
       <value>Firma</value>
     </entry>
     <entry>
-      <key>Open tasks</key>
-      <value>Offene Aufgaben</value>
+      <key>${SQL_LIB_FIELD_WRONG_FORMAT} field: %0</key>
+      <value>Das Feld %0 hat ein falsches Format. Das Datenbankfeld muss wie "tablename.columnname" ("ORGANISATION.NAME") oder als Array mit Column-alias formatiert sein: ["ORGANISATION", "NAME", "myorgAlias"]</value>
     </entry>
     <entry>
       <key>Attribute \"%0\" can't be used more than %1.</key>
@@ -114,10 +110,6 @@
       <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>
@@ -134,14 +126,6 @@
       <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>
@@ -198,10 +182,6 @@
       <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>
@@ -270,10 +250,6 @@
       <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>
@@ -322,10 +298,6 @@
       <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>
@@ -342,10 +314,6 @@
       <key>Contactmanagement</key>
       <value>Kontaktmanagement</value>
     </entry>
-    <entry>
-      <key>Mobile</key>
-      <value>Mobil</value>
-    </entry>
     <entry>
       <key>Office address</key>
       <value>Firmenadresse</value>
@@ -370,9 +338,6 @@
       <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>
@@ -393,10 +358,6 @@
       <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>
@@ -544,10 +505,6 @@
       <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>
@@ -695,10 +652,6 @@
       <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>
@@ -878,30 +831,6 @@
       <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>
@@ -990,10 +919,6 @@
       <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>
@@ -1025,10 +950,6 @@
     <entry>
       <key>Option4</key>
     </entry>
-    <entry>
-      <key>ARCHIVE</key>
-      <value>Archiviert</value>
-    </entry>
     <entry>
       <key>Offers</key>
       <value>Angebote</value>
@@ -1069,22 +990,6 @@
       <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>
@@ -1110,11 +1015,6 @@
     <entry>
       <key>Milestones</key>
       <value>Meilensteine
-</value>
-    </entry>
-    <entry>
-      <key>Milestone</key>
-      <value>Meilenstein
 </value>
     </entry>
     <entry>
@@ -1202,10 +1102,6 @@
       <key>Classification</key>
       <value>Klassifizierung</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>
@@ -1218,16 +1114,10 @@
       <key>Low price strategy</key>
       <value>Niedrigpreisstrategie</value>
     </entry>
-    <entry>
-      <key>Uid</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>
@@ -1260,9 +1150,6 @@
       <key>Salesprojects</key>
       <value>Vertriebsprojekte</value>
     </entry>
-    <entry>
-      <key>to</key>
-    </entry>
     <entry>
       <key>Open salesprojects</key>
       <value>Offene Vertriebsprojekte</value>
@@ -1270,9 +1157,6 @@
     <entry>
       <key>Other</key>
     </entry>
-    <entry>
-      <key>Main Resp.</key>
-    </entry>
     <entry>
       <key>Show all sent offers</key>
       <value>Alle versendeten Angebote anzeigen</value>
@@ -1284,14 +1168,6 @@
     <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>
@@ -1312,9 +1188,6 @@
       <key>Show all tweets of a user</key>
       <value>Alle tweets eines Benutzers anzeigen</value>
     </entry>
-    <entry>
-      <key>Standard / Individual</key>
-    </entry>
     <entry>
       <key>Please update the ${FORECAST_ENGLISH}.</key>
       <value>Bitte den Forecast überprüfen.</value>
@@ -1323,21 +1196,10 @@
       <key>Industry</key>
       <value>Branche</value>
     </entry>
-    <entry>
-      <key>From</key>
-      <value>Von</value>
-    </entry>
-    <entry>
-      <key>no Project planned</key>
-    </entry>
     <entry>
       <key>Value</key>
       <value>Wert</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>
@@ -1369,10 +1231,6 @@
     <entry>
       <key>0.00</key>
     </entry>
-    <entry>
-      <key>Document Templates</key>
-      <value>Dokumentvorlagen</value>
-    </entry>
     <entry>
       <key>Conditions of payment</key>
       <value>Zahlungsbedingung</value>
@@ -1670,9 +1528,6 @@
     <entry>
       <key>Senden per E-Mail</key>
     </entry>
-    <entry>
-      <key>Hauptdokument</key>
-    </entry>
     <entry>
       <key>Betreff</key>
     </entry>
@@ -1701,9 +1556,6 @@
       <key>Unit price</key>
       <value>Einzelpreis</value>
     </entry>
-    <entry>
-      <key>Firma</key>
-    </entry>
     <entry>
       <key>type</key>
       <value>Typ</value>
@@ -1711,9 +1563,6 @@
     <entry>
       <key>Benutzer</key>
     </entry>
-    <entry>
-      <key>Schlüsselwort</key>
-    </entry>
     <entry>
       <key>{$TASK_PRIORITY_NONE}</key>
       <value>keine</value>
@@ -1765,18 +1614,10 @@
       <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>
@@ -3131,10 +2972,6 @@
       <key>Checkbox</key>
       <value>Checkbox</value>
     </entry>
-    <entry>
-      <key>Sales Dashboard</key>
-      <value>Vertriebsdashboard</value>
-    </entry>
     <entry>
       <key>Numeric value</key>
       <value>Zahlenwert</value>
@@ -3210,9 +3047,6 @@
       <key>Object type</key>
       <value>Typ</value>
     </entry>
-    <entry>
-      <key>Level</key>
-    </entry>
     <entry>
       <key>Print Offer</key>
       <value>Angebot drucken</value>
@@ -3232,16 +3066,9 @@
       <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>
@@ -3361,9 +3188,6 @@
     <entry>
       <key>MQC</key>
     </entry>
-    <entry>
-      <key>Datei</key>
-    </entry>
     <entry>
       <key>Japan</key>
       <value>Japan</value>
@@ -3376,10 +3200,6 @@
       <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>
@@ -3462,18 +3282,12 @@
     <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>
@@ -3492,9 +3306,6 @@
     <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>
@@ -3604,10 +3415,6 @@
       <key>Manufacturer</key>
       <value>Hersteller</value>
     </entry>
-    <entry>
-      <key>Prospective customer</key>
-      <value>Potenzieller Kunde</value>
-    </entry>
     <entry>
       <key>Competitor</key>
       <value>Mitbewerber</value>
@@ -3658,15 +3465,6 @@
       <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>
@@ -3677,35 +3475,12 @@
       <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>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>
@@ -3737,9 +3512,6 @@
       <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>
@@ -3748,9 +3520,6 @@
       <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>
@@ -3780,12 +3549,6 @@
       <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>
@@ -3809,9 +3572,6 @@
     <entry>
       <key>Analyses</key>
     </entry>
-    <entry>
-      <key>Imminent appointments for today </key>
-    </entry>
     <entry>
       <key>Variable costs</key>
       <value>Variable Kosten</value>
@@ -3819,9 +3579,6 @@
     <entry>
       <key>To-Do</key>
     </entry>
-    <entry>
-      <key>My Tasks</key>
-    </entry>
     <entry>
       <key>Calendar</key>
     </entry>
@@ -3829,9 +3586,6 @@
       <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>
@@ -3847,45 +3601,15 @@
     <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>
@@ -3911,10 +3635,6 @@
     <entry>
       <key>file '%0' cannot be read</key>
     </entry>
-    <entry>
-      <key>Campaign costs</key>
-      <value>Kampagnen Kosten</value>
-    </entry>
     <entry>
       <key>Importer</key>
     </entry>
@@ -3940,7 +3660,8 @@
       <key>Zip</key>
     </entry>
     <entry>
-      <key>Add to campaign</key>
+      <key>Salesproject member</key>
+      <value>Projektteam</value>
     </entry>
     <entry>
       <key>Layout costs</key>
@@ -3950,10 +3671,6 @@
       <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>
@@ -3974,9 +3691,6 @@
       <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>
@@ -4029,9 +3743,6 @@
     <entry>
       <key>Timetracking Id</key>
     </entry>
-    <entry>
-      <key>Salesorder date</key>
-    </entry>
     <entry>
       <key>Exec type</key>
     </entry>
@@ -4136,12 +3847,6 @@
     <entry>
       <key>Task link Id</key>
     </entry>
-    <entry>
-      <key>Protection level</key>
-    </entry>
-    <entry>
-      <key>Salesorder code</key>
-    </entry>
     <entry>
       <key>BOOL VALUE</key>
     </entry>
@@ -4182,10 +3887,6 @@
     <entry>
       <key>Flag</key>
     </entry>
-    <entry>
-      <key>SEEN</key>
-      <value>Neu</value>
-    </entry>
     <entry>
       <key>Address Id</key>
     </entry>
@@ -4276,9 +3977,6 @@
     <entry>
       <key>Keyword entry Id</key>
     </entry>
-    <entry>
-      <key>Salesproject classification Id</key>
-    </entry>
     <entry>
       <key>Stop costs</key>
     </entry>
@@ -4295,9 +3993,6 @@
     <entry>
       <key>Date start</key>
     </entry>
-    <entry>
-      <key>Cover Letter</key>
-    </entry>
     <entry>
       <key>Deployment Id</key>
     </entry>
@@ -4313,9 +4008,6 @@
     <entry>
       <key>Creation user</key>
     </entry>
-    <entry>
-      <key>Unit Price</key>
-    </entry>
     <entry>
       <key>Object Id</key>
     </entry>
@@ -4372,9 +4064,6 @@
     <entry>
       <key>Tablename Id</key>
     </entry>
-    <entry>
-      <key>Offer date</key>
-    </entry>
     <entry>
       <key>Termin</key>
     </entry>
@@ -4433,9 +4122,6 @@
     <entry>
       <key>Keyword Attributes</key>
     </entry>
-    <entry>
-      <key>HTML</key>
-    </entry>
     <entry>
       <key>Student/Internship</key>
       <value>Student/Praktikant</value>
@@ -4667,17 +4353,6 @@
       <key>Scoretype</key>
       <value>Bewertungstyp</value>
     </entry>
-    <entry>
-      <key>${NUMBER_FORMAT_NEEDED}</key>
-      <value>Es wird eine Zahl erwartet.</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>
@@ -4686,10 +4361,6 @@
       <key>Rating</key>
       <value>Bewertung</value>
     </entry>
-    <entry>
-      <key>sum</key>
-      <value>Summe</value>
-    </entry>
     <entry>
       <key>Possible Values</key>
       <value>Mögliche Werte</value>
@@ -4697,9 +4368,6 @@
     <entry>
       <key>251 to 1,000</key>
     </entry>
-    <entry>
-      <key>${SCORETYPE_ALREADY_EXISTS}</key>
-    </entry>
     <entry>
       <key>Selection</key>
       <value>Auswahl</value>
@@ -4708,9 +4376,6 @@
       <key>Files</key>
       <value>Dateien</value>
     </entry>
-    <entry>
-      <key>Dateien</key>
-    </entry>
     <entry>
       <key>postcode</key>
     </entry>
@@ -4720,14 +4385,12 @@
     <entry>
       <key>Street</key>
     </entry>
-    <entry>
-      <key>Permission Action</key>
-    </entry>
     <entry>
       <key>Start</key>
     </entry>
     <entry>
       <key>End</key>
+      <value>Ende</value>
     </entry>
     <entry>
       <key>Condition</key>
@@ -4735,15 +4398,9 @@
     <entry>
       <key>File</key>
     </entry>
-    <entry>
-      <key>Parent Permission Action</key>
-    </entry>
     <entry>
       <key> User</key>
     </entry>
-    <entry>
-      <key>Parent Permission</key>
-    </entry>
     <entry>
       <key>Edit</key>
     </entry>
@@ -4756,9 +4413,6 @@
     <entry>
       <key>Permission  Overview</key>
     </entry>
-    <entry>
-      <key>Permission Admin</key>
-    </entry>
     <entry>
       <key>PermissionId</key>
     </entry>
@@ -4767,13 +4421,11 @@
     </entry>
     <entry>
       <key>Sales Project</key>
+      <value>Vertriebsprojekt</value>
     </entry>
     <entry>
       <key>Field</key>
     </entry>
-    <entry>
-      <key>Permission Set</key>
-    </entry>
     <entry>
       <key>Permission Detail</key>
     </entry>
@@ -4789,15 +4441,9 @@
     <entry>
       <key>Create</key>
     </entry>
-    <entry>
-      <key>Permission</key>
-    </entry>
     <entry>
       <key>To buildingnumber</key>
     </entry>
-    <entry>
-      <key>Access Type</key>
-    </entry>
     <entry>
       <key>Permission Overview</key>
     </entry>
@@ -4813,15 +4459,9 @@
     <entry>
       <key>Salutations</key>
     </entry>
-    <entry>
-      <key>Footer</key>
-    </entry>
     <entry>
       <key>Paymentterm</key>
     </entry>
-    <entry>
-      <key>Header</key>
-    </entry>
     <entry>
       <key>New step</key>
     </entry>
@@ -4833,10 +4473,6 @@
       <key>Fix costs</key>
       <value>Fixkosten</value>
     </entry>
-    <entry>
-      <key>Costs per participant</key>
-      <value>Kosten pro Teilnehmer</value>
-    </entry>
     <entry>
       <key>Per participant</key>
       <value>Pro Teilnehmer</value>
@@ -4899,11 +4535,11 @@
     </entry>
     <entry>
       <key>Choose Footer</key>
-      <value>Footer auswählen</value>
+      <value>Fußtext auswählen</value>
     </entry>
     <entry>
       <key>Choose Header</key>
-      <value>Header auswählen</value>
+      <value>Kopftext  auswählen</value>
     </entry>
     <entry>
       <key>#0</key>
@@ -4911,6 +4547,54 @@
     <entry>
       <key>Email Template</key>
     </entry>
+    <entry>
+      <key>testing</key>
+    </entry>
+    <entry>
+      <key>double</key>
+    </entry>
+    <entry>
+      <key>closed</key>
+    </entry>
+    <entry>
+      <key>New Supportticket</key>
+      <value>Neues Supportticket</value>
+    </entry>
+    <entry>
+      <key>Bug Ticket</key>
+    </entry>
+    <entry>
+      <key>Support ticket</key>
+    </entry>
+    <entry>
+      <key>New Bugticket</key>
+      <value>Neues Bugticket</value>
+    </entry>
+    <entry>
+      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+    </entry>
+    <entry>
+      <key>Search for new Entries</key>
+      <value>Nach neuen Einträgen suchen</value>
+    </entry>
+    <entry>
+      <key>Maximal count has to be a whole number</key>
+      <value>Maximale Anzahl muss eine ganze Zahl sein</value>
+    </entry>
+    <entry>
+      <key>Minimal count must be a positive whole number</key>
+      <value>Minimale Anzahl muss eine positive, ganze Zahl sein</value>
+    </entry>
+    <entry>
+      <key>Meilensteine und Kontaktpunkte</key>
+    </entry>
+    <entry>
+      <key>Maximal count must be one or higher</key>
+      <value>Maximale Anzahl muss eins oder höher sein</value>
+    </entry>
     <entry>
       <key>Campaign name</key>
       <value>Kampagnen Name</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 5c1a94d46326f46c7ab64bd2ec02246575db3db2..4373adf32eff1fe69f2c0d4bbda6e59abea9a59f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -66,9 +66,6 @@
     <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>
@@ -78,9 +75,6 @@
     <entry>
       <key>Contactmanagement</key>
     </entry>
-    <entry>
-      <key>Mobile</key>
-    </entry>
     <entry>
       <key>Office address</key>
     </entry>
@@ -99,9 +93,6 @@
     <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>
@@ -389,24 +380,6 @@
     <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>
@@ -506,19 +479,6 @@
     <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>
@@ -539,9 +499,6 @@
     <entry>
       <key>Milestones</key>
     </entry>
-    <entry>
-      <key>Milestone</key>
-    </entry>
     <entry>
       <key>Excreted</key>
     </entry>
@@ -557,9 +514,6 @@
     <entry>
       <key>Forecast</key>
     </entry>
-    <entry>
-      <key>Datei</key>
-    </entry>
     <entry>
       <key>Role</key>
     </entry>
@@ -587,53 +541,25 @@
     <entry>
       <key>Classification</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>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>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>Value</key>
     </entry>
-    <entry>
-      <key>Projectstart</key>
-    </entry>
     <entry>
       <key>no valid format</key>
     </entry>
@@ -921,9 +847,6 @@
     <entry>
       <key>Free</key>
     </entry>
-    <entry>
-      <key>From</key>
-    </entry>
     <entry>
       <key>Total</key>
     </entry>
@@ -997,15 +920,9 @@
     <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>
@@ -1032,9 +949,6 @@
     <entry>
       <key>Unit price</key>
     </entry>
-    <entry>
-      <key>Firma</key>
-    </entry>
     <entry>
       <key>type</key>
     </entry>
@@ -1114,12 +1028,6 @@
     <entry>
       <key>Title (original language)</key>
     </entry>
-    <entry>
-      <key>Attribute Relation</key>
-    </entry>
-    <entry>
-      <key>Attribute Usage</key>
-    </entry>
     <entry>
       <key>Key</key>
     </entry>
@@ -2168,9 +2076,6 @@
     <entry>
       <key>Object type</key>
     </entry>
-    <entry>
-      <key>Level</key>
-    </entry>
     <entry>
       <key>Touchpoint</key>
     </entry>
@@ -2192,18 +2097,9 @@
     <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>
@@ -2365,9 +2261,6 @@
     <entry>
       <key>30 days net</key>
     </entry>
-    <entry>
-      <key>Relation tree</key>
-    </entry>
     <entry>
       <key>Directly responsible:</key>
     </entry>
@@ -2422,15 +2315,9 @@
     <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>
@@ -2488,12 +2375,6 @@
     <entry>
       <key>Campaign Step</key>
     </entry>
-    <entry>
-      <key>Campaign Participant</key>
-    </entry>
-    <entry>
-      <key>Campaign Steps</key>
-    </entry>
     <entry>
       <key>360 Degree</key>
     </entry>
@@ -2506,48 +2387,21 @@
     <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>
@@ -2633,15 +2487,9 @@
     <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>
@@ -2651,18 +2499,12 @@
     <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>
@@ -2682,9 +2524,6 @@
       <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>
@@ -2717,9 +2556,6 @@
     <entry>
       <key>Maturity</key>
     </entry>
-    <entry>
-      <key>Stored selections</key>
-    </entry>
     <entry>
       <key>Username</key>
     </entry>
@@ -2729,15 +2565,6 @@
     <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>
@@ -2747,9 +2574,6 @@
     <entry>
       <key>Project</key>
     </entry>
-    <entry>
-      <key>Human resources</key>
-    </entry>
     <entry>
       <key>Project management</key>
     </entry>
@@ -2784,9 +2608,6 @@
     <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>
@@ -2796,9 +2617,6 @@
     <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>
@@ -2808,9 +2626,6 @@
     <entry>
       <key>Key figures</key>
     </entry>
-    <entry>
-      <key>Relation</key>
-    </entry>
     <entry>
       <key>Hierarchy</key>
     </entry>
@@ -2838,33 +2653,18 @@
     <entry>
       <key>Deleted all usages of \"%0\".</key>
     </entry>
-    <entry>
-      <key>promotion target ofc</key>
-    </entry>
     <entry>
       <key>Successful</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>Tochter</key>
-    </entry>
     <entry>
       <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
     </entry>
@@ -2877,21 +2677,9 @@
     <entry>
       <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</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>
@@ -2913,9 +2701,6 @@
     <entry>
       <key>Steps</key>
     </entry>
-    <entry>
-      <key>CampaignStep</key>
-    </entry>
     <entry>
       <key>Added</key>
     </entry>
@@ -2925,9 +2710,6 @@
     <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>
@@ -2955,15 +2737,9 @@
     <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>
@@ -2996,9 +2772,6 @@
     <entry>
       <key>file '%0' cannot be read</key>
     </entry>
-    <entry>
-      <key>Campaign costs</key>
-    </entry>
     <entry>
       <key>Importer</key>
     </entry>
@@ -3020,15 +2793,9 @@
     <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>
@@ -3051,9 +2818,6 @@
     <entry>
       <key>Variable costs</key>
     </entry>
-    <entry>
-      <key>Version number</key>
-    </entry>
     <entry>
       <key>Id value</key>
     </entry>
@@ -3105,9 +2869,6 @@
     <entry>
       <key>Timetracking Id</key>
     </entry>
-    <entry>
-      <key>Salesorder date</key>
-    </entry>
     <entry>
       <key>Exec type</key>
     </entry>
@@ -3132,9 +2893,6 @@
     <entry>
       <key>Id</key>
     </entry>
-    <entry>
-      <key>Start date</key>
-    </entry>
     <entry>
       <key>Object 1 row Id</key>
     </entry>
@@ -3210,12 +2968,6 @@
     <entry>
       <key>Task link Id</key>
     </entry>
-    <entry>
-      <key>Protection level</key>
-    </entry>
-    <entry>
-      <key>Salesorder code</key>
-    </entry>
     <entry>
       <key>BOOL VALUE</key>
     </entry>
@@ -3342,9 +3094,6 @@
     <entry>
       <key>Keyword entry Id</key>
     </entry>
-    <entry>
-      <key>Salesproject classification Id</key>
-    </entry>
     <entry>
       <key>Stop costs</key>
     </entry>
@@ -3360,9 +3109,6 @@
     <entry>
       <key>Date start</key>
     </entry>
-    <entry>
-      <key>Cover Letter</key>
-    </entry>
     <entry>
       <key>Deployment Id</key>
     </entry>
@@ -3378,9 +3124,6 @@
     <entry>
       <key>Creation user</key>
     </entry>
-    <entry>
-      <key>Unit Price</key>
-    </entry>
     <entry>
       <key>Object Id</key>
     </entry>
@@ -3432,9 +3175,6 @@
     <entry>
       <key>Tablename Id</key>
     </entry>
-    <entry>
-      <key>Offer date</key>
-    </entry>
     <entry>
       <key>Competitors</key>
     </entry>
@@ -3453,9 +3193,6 @@
     <entry>
       <key>Document Template</key>
     </entry>
-    <entry>
-      <key>Document Templates</key>
-    </entry>
     <entry>
       <key>Text Modular</key>
     </entry>
@@ -3480,18 +3217,6 @@
     <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>
@@ -3543,9 +3268,6 @@
     <entry>
       <key>Keyword Attributes</key>
     </entry>
-    <entry>
-      <key>HTML</key>
-    </entry>
     <entry>
       <key>Student/Internship</key>
     </entry>
@@ -3731,16 +3453,6 @@
     <entry>
       <key>Scoretype</key>
     </entry>
-    <entry>
-      <key>${NUMBER_FORMAT_NEEDED}</key>
-      <value>Value has to be a number.</value>
-    </entry>
-    <entry>
-      <key>Possible values</key>
-    </entry>
-    <entry>
-      <key>ARCHIVE</key>
-    </entry>
     <entry>
       <key>archieve</key>
     </entry>
@@ -3757,25 +3469,15 @@
     <entry>
       <key>Rating</key>
     </entry>
-    <entry>
-      <key>sum</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>
@@ -3814,12 +3516,6 @@
     <entry>
       <key>Postcode</key>
     </entry>
-    <entry>
-      <key>Sales Dashboard</key>
-    </entry>
-    <entry>
-      <key>Main Resp.</key>
-    </entry>
     <entry>
       <key>Main document</key>
     </entry>
@@ -3829,9 +3525,6 @@
     <entry>
       <key>Street</key>
     </entry>
-    <entry>
-      <key>Permission Action</key>
-    </entry>
     <entry>
       <key>Start</key>
     </entry>
@@ -3844,15 +3537,9 @@
     <entry>
       <key>File</key>
     </entry>
-    <entry>
-      <key>Parent Permission Action</key>
-    </entry>
     <entry>
       <key> User</key>
     </entry>
-    <entry>
-      <key>Parent Permission</key>
-    </entry>
     <entry>
       <key>Edit</key>
     </entry>
@@ -3865,9 +3552,6 @@
     <entry>
       <key>Permission  Overview</key>
     </entry>
-    <entry>
-      <key>Permission Admin</key>
-    </entry>
     <entry>
       <key>PermissionId</key>
     </entry>
@@ -3880,9 +3564,6 @@
     <entry>
       <key>Field</key>
     </entry>
-    <entry>
-      <key>Permission Set</key>
-    </entry>
     <entry>
       <key>Permission Detail</key>
     </entry>
@@ -3898,15 +3579,9 @@
     <entry>
       <key>Create</key>
     </entry>
-    <entry>
-      <key>Permission</key>
-    </entry>
     <entry>
       <key>To buildingnumber</key>
     </entry>
-    <entry>
-      <key>Access Type</key>
-    </entry>
     <entry>
       <key>Permission Overview</key>
     </entry>
@@ -3922,15 +3597,9 @@
     <entry>
       <key>Salutations</key>
     </entry>
-    <entry>
-      <key>Footer</key>
-    </entry>
     <entry>
       <key>Paymentterm</key>
     </entry>
-    <entry>
-      <key>Header</key>
-    </entry>
     <entry>
       <key>Runtime</key>
     </entry>
@@ -3940,9 +3609,6 @@
     <entry>
       <key>Total costs</key>
     </entry>
-    <entry>
-      <key>Costs per participant</key>
-    </entry>
     <entry>
       <key>Per participant</key>
     </entry>
@@ -4003,6 +3669,55 @@
     <entry>
       <key>Email Template</key>
     </entry>
+    <entry>
+      <key>${SQL_LIB_FIELD_WRONG_FORMAT} field: %0</key>
+      <value>Field %0 is in an incorrect format. The database field has to be like "tablename.columnname" ("ORGANISATION.NAME") or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]</value>
+    </entry>
+    <entry>
+      <key>testing</key>
+    </entry>
+    <entry>
+      <key>double</key>
+    </entry>
+    <entry>
+      <key>closed</key>
+    </entry>
+    <entry>
+      <key>New Supportticket</key>
+    </entry>
+    <entry>
+      <key>Bug Ticket</key>
+    </entry>
+    <entry>
+      <key>Support ticket</key>
+    </entry>
+    <entry>
+      <key>New Bugticket</key>
+    </entry>
+    <entry>
+      <key>Keine Berechtigung zum Verschieben der Aufgabe</key>
+    </entry>
+    <entry>
+      <key>Kein Weitergeben von privaten Aufgaben möglich!</key>
+    </entry>
+    <entry>
+      <key>Search for new Entries</key>
+    </entry>
+    <entry>
+      <key>Salesproject member</key>
+    </entry>
+    <entry>
+      <key>Maximal count has to be a whole number</key>
+    </entry>
+    <entry>
+      <key>Minimal count must be a positive whole number</key>
+    </entry>
+    <entry>
+      <key>Meilensteine und Kontaktpunkte</key>
+    </entry>
+    <entry>
+      <key>Maximal count must be one or higher</key>
+    </entry>
     <entry>
       <key>Campaign name</key>
     </entry>
diff --git a/neonContext/Activity/Activity.aod b/neonContext/Activity/Activity.aod
index 5822e64fb80fca5377d40de7308530bf2c8dc26b..d2af3b2670063c6b7bbf65b0fab7d6bcb5e3c79c 100644
--- a/neonContext/Activity/Activity.aod
+++ b/neonContext/Activity/Activity.aod
@@ -29,5 +29,9 @@
       <name>d842dc4a-46f4-44d0-ab2e-2ff460a5aa47</name>
       <view>ActivityDetail_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>03805b3b-d037-49b3-9836-e50f2a359aec</name>
+      <view>ActivityDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/AppointmentLink/AppointmentLink.aod b/neonContext/AppointmentLink/AppointmentLink.aod
index bfe84c66b362cdc82cee99227b0332604b78af00..ae9547946f30873b917bc262695c126cb2e048cb 100644
--- a/neonContext/AppointmentLink/AppointmentLink.aod
+++ b/neonContext/AppointmentLink/AppointmentLink.aod
@@ -1,19 +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>AppointmentLink</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <mainview>AppointmentLinkFilter_view</mainview>
-  <filterview>AppointmentLinkFilter_view</filterview>
-  <editview>AppointmentLinkEdit_view</editview>
-  <entity>AppointmentLink_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>015bf8e9-621a-423d-8fd3-17ef264cc919</name>
-      <view>AppointmentLinkEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>f0f803a8-74a4-4a96-a989-d3923b994280</name>
-      <view>AppointmentLinkFilter_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
+<?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>AppointmentLink</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterview>AppointmentLinkFilter_view</filterview>
+  <editview>AppointmentLinkEdit_view</editview>
+  <entity>AppointmentLink_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>015bf8e9-621a-423d-8fd3-17ef264cc919</name>
+      <view>AppointmentLinkEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f0f803a8-74a4-4a96-a989-d3923b994280</name>
+      <view>AppointmentLinkFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index ea75439e7a635ccae6bd4864815ff8590f693569..4f850ea6cffa3913dd32f9573ace3c88094b0dab 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -22,5 +22,9 @@
       <name>b50638d0-30ec-4166-80c0-ab6d0f2180a1</name>
       <view>AttributeRelationPreviewList</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>62bb0096-a16a-49a4-88c1-aae53c730169</name>
+      <view>AttributeRelationTreeDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
index 9319b3ed21f3f9da1f49d6b6c73d10c8595f8e7e..9f78f8cfd61d0869964ef51159450461f3130f97 100644
--- a/neonContext/Classification/Classification.aod
+++ b/neonContext/Classification/Classification.aod
@@ -3,28 +3,20 @@
   <name>Classification</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/Classification/documentation.adoc</documentation>
-  <editview>ClassificatonAdminEdit_view</editview>
+  <preview>ClassificatonPreview_view</preview>
   <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>
+      <view>ClassificatonPreview_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>8412dc60-bffd-49bd-a68d-c730404b807b</name>
-      <view>ClassificationFilter_view</view>
+      <name>cabdb49c-4faf-4581-8bb5-8a409f27ac3f</name>
+      <view>ClassificationDrawer_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index 45495e30e8520da2d6576872ddcf5d1bdf752445..809c94a1d06d1491fddf32c0728c0426810467cc 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -4,12 +4,22 @@
   <title></title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/ClassificationAdmin/documentation.adoc</documentation>
-  <mainview>ClassificationAdminMain_view</mainview>
+  <filterview>ClassificationAdminTree_view</filterview>
+  <editview>ClassificationAdminEdit_view</editview>
+  <preview>ClassificatonAdminPreview_view</preview>
   <entity>ClassificationAdmin_entity</entity>
   <references>
     <neonViewReference>
-      <name>4a240156-6c62-46d8-890e-b5c239ef8128</name>
-      <view>ClassificationAdminMain_view</view>
+      <name>d2a900f6-8860-4bd6-bc8a-3a8261fb9b3d</name>
+      <view>ClassificationAdminTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3d860a00-13a4-45ef-8087-487ea80bb84b</name>
+      <view>ClassificatonAdminPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2c6e2b30-0fd1-4f12-bf9f-d4bbcfbed8aa</name>
+      <view>ClassificationAdminEdit_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ClassificationScore/ClassificationScore.aod b/neonContext/ClassificationScore/ClassificationScore.aod
index b93085f7299a80219111e4660ec78108ef2d0ccf..1b36df91560e36642648a2fce4435aa13d2f841b 100644
--- a/neonContext/ClassificationScore/ClassificationScore.aod
+++ b/neonContext/ClassificationScore/ClassificationScore.aod
@@ -6,6 +6,10 @@
   <references>
     <neonViewReference>
       <name>ccaf4443-07e0-4e29-a73d-2073d132fbe6</name>
+      <view>ClassificationScoreMultiplePreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e857034a-2e2c-4026-8833-12ba4ce597d0</name>
       <view>ClassificationScoreMultipleEdit_view</view>
     </neonViewReference>
   </references>
diff --git a/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod b/neonContext/Competition/Competition.aod
similarity index 56%
rename from neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
rename to neonContext/Competition/Competition.aod
index 20698327ec099dd3dbda4b261c5ddfee79cc177b..5426e2187996dc03b6997e1fda9f53d5e0a58d01 100644
--- a/neonContext/SalesprojectCompetition/SalesprojectCompetition.aod
+++ b/neonContext/Competition/Competition.aod
@@ -1,23 +1,27 @@
 <?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>SalesprojectCompetition</name>
+  <name>Competition</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>SalesprojectCompetitionFilter_view</filterview>
-  <editview>SalesprojectCompetitionEdit_view</editview>
-  <preview>SalesprojectCompetitionPreview_view</preview>
-  <entity>SalesprojectCompetition_entity</entity>
+  <filterview>CompetitionFilter_view</filterview>
+  <editview>CompetitionEdit_view</editview>
+  <preview>CompetitionPreview_view</preview>
+  <entity>Competition_entity</entity>
   <references>
     <neonViewReference>
       <name>a002c925-becb-4051-95bc-a38a4b01b65a</name>
-      <view>SalesprojectCompetitionFilter_view</view>
+      <view>CompetitionFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>df710f0b-ed2b-46d1-852d-47ada0b6b8f0</name>
-      <view>SalesprojectCompetitionEdit_view</view>
+      <view>CompetitionEdit_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>6df65cb7-f8fc-4b6e-963d-df6dde6d523b</name>
-      <view>SalesprojectCompetitionPreview_view</view>
+      <view>CompetitionPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>181ce712-9fd0-4044-9d44-6f12da0f0f54</name>
+      <view>CompetitionDrawer_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod
index bdc733dc1b240079dc84f44a22d7be2cee1bb354..b5c6d46ab5c89200d2949c64d97b309181311502 100644
--- a/neonContext/Document/Document.aod
+++ b/neonContext/Document/Document.aod
@@ -25,5 +25,9 @@
       <name>b9455efd-d150-46c0-bfae-cdccb0c9bcad</name>
       <view>DocumentList_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>16c5b82f-8690-493c-98d9-150c086202d0</name>
+      <view>DocumentDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Email/Email.aod b/neonContext/Email/Email.aod
index 502cb77e4a78d090f6549ac3bc98a7b202ec8568..d7d3395fb7a4e38c16637a5b4ace340265ee1d43 100644
--- a/neonContext/Email/Email.aod
+++ b/neonContext/Email/Email.aod
@@ -1,12 +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>
+<?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/SalesprojectForecast/SalesprojectForecast.aod b/neonContext/Forecast/Forecast.aod
similarity index 58%
rename from neonContext/SalesprojectForecast/SalesprojectForecast.aod
rename to neonContext/Forecast/Forecast.aod
index 4a1b96a50fe65547544ef278b40fccd77d050f7f..016e7b97cb223c282df24c9fe596e3a1f56ed4a7 100644
--- a/neonContext/SalesprojectForecast/SalesprojectForecast.aod
+++ b/neonContext/Forecast/Forecast.aod
@@ -1,23 +1,27 @@
 <?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>SalesprojectForecast</name>
+  <name>Forecast</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>SalesprojectForecastFilter_view</filterview>
-  <editview>SalesprojectForecastEdit_view</editview>
-  <preview>SalesprojectForecastPreview_view</preview>
-  <entity>SalesprojectForecast_entity</entity>
+  <filterview>ForecastFilter_view</filterview>
+  <editview>ForecastEdit_view</editview>
+  <preview>ForecastPreview_view</preview>
+  <entity>Forecast_entity</entity>
   <references>
     <neonViewReference>
       <name>20d80c15-97f0-490c-b845-b2b4f63c6a5d</name>
-      <view>SalesprojectForecastFilter_view</view>
+      <view>ForecastFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>7cc72509-722b-4d4f-870c-08878129ceb9</name>
-      <view>SalesprojectForecastEdit_view</view>
+      <view>ForecastEdit_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>1fe6e10b-52b4-44a4-88d8-9784a967572c</name>
-      <view>SalesprojectForecastPreview_view</view>
+      <view>ForecastPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4fb2da2d-ef4b-4b86-8d4b-9212591a8c47</name>
+      <view>ForecastDrawer_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Mail/Mail.aod b/neonContext/Mail/Mail.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6c1b4c798c638d24c8953b7635eea0c4b2fa1dee
--- /dev/null
+++ b/neonContext/Mail/Mail.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+  <name>Mail</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>Mail_entity</entity>
+</neonContext>
diff --git a/neonContext/SalesprojectMember/SalesprojectMember.aod b/neonContext/Member/Member.aod
similarity index 59%
rename from neonContext/SalesprojectMember/SalesprojectMember.aod
rename to neonContext/Member/Member.aod
index ade9ba64f87a933fe925695525117df577ab64ff..a1a393bf7426b4e49d8c29a16a30f59f48a72126 100644
--- a/neonContext/SalesprojectMember/SalesprojectMember.aod
+++ b/neonContext/Member/Member.aod
@@ -1,18 +1,22 @@
 <?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>SalesprojectMember</name>
+  <name>Member</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>SalesprojectMemberFilter_view</filterview>
-  <editview>SalesprojectMemberEdit_view</editview>
-  <entity>SalesprojectMember_entity</entity>
+  <filterview>MemberFilter_view</filterview>
+  <editview>MemberEdit_view</editview>
+  <entity>Member_entity</entity>
   <references>
     <neonViewReference>
       <name>6b0b9d8f-6fe8-475b-a303-f1c4f2011d37</name>
-      <view>SalesprojectMemberFilter_view</view>
+      <view>MemberFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>ebef21a3-c0e1-4333-b769-eb967cb4099b</name>
-      <view>SalesprojectMemberEdit_view</view>
+      <view>MemberEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>61eb4778-61aa-4419-8c8b-5ad69d86a4bb</name>
+      <view>MemberDrawer_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index 6e9ba1f1001ad9c7efa2d0d415d375b055b05593..40418dc2dbd8042c2a0b757a6d61a8f401bd5aa9 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -30,5 +30,9 @@
       <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name>
       <view>OfferCoverLetter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d72d1eb1-461c-442c-881d-48fb71b89316</name>
+      <view>OfferDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 682b44c4ab3336b96d57d44f9af18558889ef0d3..a7d8eda383934c413cd8c4aff7b82528a77c0e51 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -34,5 +34,25 @@
       <name>5990b9d2-b9b8-495e-85de-68a765d09b7f</name>
       <view>SalesprojectClassification_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>6640a2aa-cd7f-41d0-ab55-30a99256c2c6</name>
+      <view>SalesprojectMemberActivity_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>58afb929-85fb-4aea-a149-25afc9cc7a97</name>
+      <view>SalesprojectMilestoneSource_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e320d244-6417-4b7b-a532-4a7e2011fb64</name>
+      <view>SalesprojectOfferForecast_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d878f3b7-1de6-4319-93c7-0fff621c0458</name>
+      <view>SalesprojectTimeDocComp_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>68e9257b-d402-4edc-8345-7da46c3b63f9</name>
+      <view>SalesprojectClassificationAttribute_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/SalesprojectSource/SalesprojectSource.aod b/neonContext/SalesprojectSource/SalesprojectSource.aod
index 85736ec596358f7e5fe53ab9807900275b169695..bfd11662b330436309099e077c316c28261f737e 100644
--- a/neonContext/SalesprojectSource/SalesprojectSource.aod
+++ b/neonContext/SalesprojectSource/SalesprojectSource.aod
@@ -19,5 +19,9 @@
       <name>231302ed-b2a5-4ccd-bd08-e6a536efbc58</name>
       <view>SalesprojectSourcePreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d7246373-a0a3-42e7-83c9-572eb7083cf8</name>
+      <view>SalesprojectSourceDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Timetracking/Timetracking.aod b/neonContext/Timetracking/Timetracking.aod
index 1e5a05053df48bf466bd9209177543af4a709385..72386c6a08a480cb48e2a1513e25880dcf5eb81e 100644
--- a/neonContext/Timetracking/Timetracking.aod
+++ b/neonContext/Timetracking/Timetracking.aod
@@ -19,5 +19,9 @@
       <name>4ee9a88d-98a4-4fb5-b1ab-0fffa03c9344</name>
       <view>TimetrackingPreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>1afcd6f9-1692-4df7-b514-32c1db2f7dd1</name>
+      <view>TimetrackingDrawer_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonNotificationType/Andis/Andis.aod b/neonNotificationType/Andis/Andis.aod
deleted file mode 100644
index 760bb2546129a98634dc8f0d899060374466226e..0000000000000000000000000000000000000000
--- a/neonNotificationType/Andis/Andis.aod
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonNotificationType 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/neonNotificationType/1.1.0">
-  <name>Andis</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>NEON:GROUP_APPOINTMENT</icon>
-  <defaultPriority>MAX</defaultPriority>
-</neonNotificationType>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 97c355590c2f00a64a59848650f9236f2f870af3..dcb00d28cde6404ae34f960b9aba10f1140d3ecb 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -13,7 +13,8 @@
       <name>OfferInfo</name>
       <editMode v="false" />
       <showDrawer v="true" />
-      <drawerCaption>Detail</drawerCaption>
+      <drawerCaption></drawerCaption>
+      <fixedDrawer v="true" />
       <hideLabels v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/ClassificationFilter_view/ClassificationFilter_view.aod b/neonView/ActivityDrawer_view/ActivityDrawer_view.aod
similarity index 54%
rename from neonView/ClassificationFilter_view/ClassificationFilter_view.aod
rename to neonView/ActivityDrawer_view/ActivityDrawer_view.aod
index fa541ebaeb8626db1a1a3cbea7b4d8fdba3b3a68..83b47cbe383508807a6e8647d92349cf077e3e30 100644
--- a/neonView/ClassificationFilter_view/ClassificationFilter_view.aod
+++ b/neonView/ActivityDrawer_view/ActivityDrawer_view.aod
@@ -1,22 +1,18 @@
-<?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>
+<?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>ActivityDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Activities</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>9a0bf95e-8e6f-47ac-aff0-c420d5fb86aa</name>
+      <entityField>#ENTITY</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 53890651d942d11febcae00d9ab2f838d49286ee..8e49b44e5eb29ee0e4fdf68b4977f336b331001d 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -3,7 +3,7 @@
   <name>ActivityEdit_view</name>
   <title>Activity</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>NEON:HISTORY</icon>
+  <icon>VAADIN:HOURGLASS_END</icon>
   <quickEntry v="3" />
   <layout>
     <boxLayout>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 42dd805060a6f14fb40fa837a5572c072331847f..a47d25215ecbd820e8eb0d5ee925fe10f03f248f 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -1,123 +1,122 @@
-<?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>
+<?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>entryDateDateFormat</dateField>
+      <titleField>SUBJECT_DETAILS</titleField>
+      <descriptionField>INFO</descriptionField>
+      <iconIdField>#IMAGE</iconIdField>
+      <hideTime v="true" />
+      <entityField>#ENTITY</entityField>
+    </timelineViewTemplate>
+    <tableViewTemplate>
+      <name>ActivitiesTable</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>56f0d70a-04de-4acf-b7f6-08414ab5e7ce</name>
+          <entityField>entryDateDateFormat</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c1ff85eb-dde9-4362-82bc-8be6e3346b1c</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>aafb6ac4-a584-48c4-9355-630bfd4579d3</name>
+          <entityField>RESPONSIBLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c8fc85eb-dde9-4362-82bc-8be6e3346b1c</name>
+          <entityField>SUBJECT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>692a655b-18f5-4323-8d87-ee42726bed38</name>
+          <entityField>INFO</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>ActivitiesTreeTable</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
+          <entityField>entryDateDateFormat</entityField>
+          <width v="75" />
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
+          <entityField>#IMAGE</entityField>
+          <width v="75" />
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
+          <entityField>RESPONSIBLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
+          <entityField>SUBJECT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
+          <entityField>INFO</entityField>
+        </neonTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 94937fc368f2ed154201b4463f1c4c6fdd2156cd..63627905d091b8727c4200343b3b246c2e8ae8c7 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -30,10 +30,6 @@
           <name>ad41c89c-2f4a-414c-90c8-d5a5df24aeaa</name>
           <entityField>CATEGORY</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>b0673d1d-af3d-4daa-b6ec-511f18367e7f</name>
-          <entityField>INFO</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
           <entityField>RESPONSIBLE</entityField>
@@ -50,5 +46,18 @@
       <entityField>MainDocuments</entityField>
       <view>DocumentList_view</view>
     </neonViewReference>
+    <genericViewTemplate>
+      <name>Description</name>
+      <showDrawer v="true" />
+      <drawerCaption>Description</drawerCaption>
+      <hideLabels v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>cfdae746-0433-49fa-877d-0c5ca93024e3</name>
+          <entityField>INFO</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 6f2ad8f29b5333eea83036c3519889f401bc3643..cb454f46fe04bed624404f29bc0a0ef1ffac9b3b 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -1,60 +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>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>
+<?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 ca5b096ab51c184eef02ea9f2d32a948b075b48b..0f9f3dd26c5452e5f17c359be445d1d2b1e5ea42 100644
--- a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
+++ b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
@@ -1,50 +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>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>
+<?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 dd76803d162ec19ee585a6d797e69684f7c832b3..59b689504901b79dd11f6978bcde410015e4f9fa 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -1,58 +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>00300f6f-ac45-4daa-9693-6452da972403</name>
-          <entityField>AddressSearch</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>2aebe24e-875a-4c57-8461-16da46d6f080</name>
+          <entityField>ADDR_TYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>00300f6f-ac45-4daa-9693-6452da972403</name>
+          <entityField>AddressSearch</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/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 65acf9a4df32daf07b5fecd7828a1126ddad3ba5..4951de3ef21be0e5b516f934ac1c8cbfdb3c4204 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,28 +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>AppointmentLinkFilter_view</name>
-  <title>relations</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <genericMultipleViewTemplate>
-      <name>MultipleEdit</name>
-      <autoNewRow v="true" />
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>539c9844-8f4b-49e8-8974-30bdf127f47c</name>
-          <entityField>OBJECTTYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>eba00f45-cd7e-43c0-9dea-559293ca7d49</name>
-          <entityField>OBJECTID</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>AppointmentLinkFilter_view</name>
+  <title>relations</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <title>Connections</title>
+      <columns>
+        <neonTableColumn>
+          <name>dd971b22-845f-4177-8220-f280abec6e59</name>
+          <entityField>OBJECTTYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>7b0a52f0-bcc6-491c-bd9c-a23152b4cc98</name>
+          <entityField>OBJECTID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index b98f1bf94f63ae76b25d22b5d0248ce5531f0c9b..beabd6985997e61880b70f11c9dff950e0d36ea7 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -1,31 +1,36 @@
-<?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>AppointmentPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <appointmentPreviewViewTemplate>
-      <name>Appointments</name>
-      <summaryField>SUMMARY</summaryField>
-      <descriptionField>DESCRIPTION</descriptionField>
-      <beginField>BEGIN</beginField>
-      <endField>END</endField>
-      <periodField>STARTEND</periodField>
-      <attendeesField>ATTENDEES</attendeesField>
-      <privateField>CLASSIFICATION</privateField>
-      <transparencyField>TRANSPARENCY</transparencyField>
-      <statusField>STATUS</statusField>
-      <locationField>LOCATION</locationField>
-      <linkField>LINKS</linkField>
-      <organizerField>ORGANIZER</organizerField>
-      <categoriesField>CATEGORIES</categoriesField>
-      <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
-      <entityField>#ENTITY</entityField>
-    </appointmentPreviewViewTemplate>
-  </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>AppointmentPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <appointmentPreviewViewTemplate>
+      <name>Appointments</name>
+      <summaryField>SUMMARY</summaryField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <beginField>BEGIN</beginField>
+      <endField>END</endField>
+      <periodField>STARTEND</periodField>
+      <attendeesField>ATTENDEES</attendeesField>
+      <privateField>CLASSIFICATION</privateField>
+      <transparencyField>TRANSPARENCY</transparencyField>
+      <statusField>STATUS</statusField>
+      <locationField>LOCATION</locationField>
+      <linkField>LINKS</linkField>
+      <organizerField>ORGANIZER</organizerField>
+      <categoriesField>CATEGORIES</categoriesField>
+      <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
+    </appointmentPreviewViewTemplate>
+    <neonViewReference>
+      <name>7937d700-ecaf-488e-a2a5-79e4310b88b5</name>
+      <entityField>AppointmentLinks</entityField>
+      <view>AppointmentLinkFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index 01763de1cc5695761550790c001988d6e80ea4fd..927067b784f37e269a22e64db11894d1cc074651 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>
-    <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>
+<?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/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod b/neonView/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9e8cd7121ad9a573c978a700dca784fa9c56f7ff
--- /dev/null
+++ b/neonView/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>AttributeRelationTreeDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Attributes</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>fda0b0db-8bb8-4d61-99e0-715717885740</name>
+      <entityField>#ENTITY</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4c48e7bb07f04d7b9c8fbaa3956087c21f59da4d
--- /dev/null
+++ b/neonView/ClassificationAdminEdit_view/ClassificationAdminEdit_view.aod
@@ -0,0 +1,40 @@
+<?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>ClassificationAdminEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <autoHeight v="true" />
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>classification</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Classification</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>c702f17c-af6c-4674-bbef-9586adfa3f3b</name>
+          <entityField>CLASSIFICATIONTYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>66ce2c02-1cd3-4867-91a6-825655d6d16a</name>
+          <entityField>CLASSIFICATIONGROUP</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>85cf625b-8ea4-4e6f-8b21-2e42314b46d6</name>
+          <entityField>SCORETYPE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>cedafb39-a59c-480f-aeff-e6276ea4fb9e</name>
+      <entityField>ClassificationScores</entityField>
+      <view>ClassificationScoreMultipleEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
index 423b78a6c95dfa2f33262e2f5e51bf40e3e64aa7..e2b1d8b0bc76eaf6a4f3cb1b11d55a3f8d12c1b4 100644
--- a/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
+++ b/neonView/ClassificationAdminTree_view/ClassificationAdminTree_view.aod
@@ -16,9 +16,7 @@
         <element>CLASSIFICATIONTYPE</element>
         <element>CLASSIFICATIONGROUP</element>
       </defaultGroupFields>
-      <hideContentSearch v="true" />
       <showChildrenCount v="false" />
-      <entryAction>edit</entryAction>
       <entityField>#ENTITY</entityField>
     </treeViewTemplate>
   </children>
diff --git a/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod b/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4f3c0065ecf038cd2d66c0ee3aefbeef34ef2451
--- /dev/null
+++ b/neonView/ClassificationDrawer_view/ClassificationDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>ClassificationDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Classification</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>be8f5d17-80ab-49c4-8153-f90aa23667cd</name>
+      <entityField>#ENTITY</entityField>
+      <view>ClassificationTree_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c6695b0ad5550b72680ae0497bc33f93b1d83222
--- /dev/null
+++ b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
@@ -0,0 +1,31 @@
+<?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>ClassificationPreview_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>
diff --git a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
index b8c8b7594b6189ef25f0a104b8a4e8288e3d60b6..db967914146e37c3b1d6e81851364f992ac22c23 100644
--- a/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
+++ b/neonView/ClassificationScoreMultipleEdit_view/ClassificationScoreMultipleEdit_view.aod
@@ -2,7 +2,6 @@
 <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>
     <drawerLayout>
       <name>layout</name>
@@ -12,19 +11,18 @@
   <children>
     <genericMultipleViewTemplate>
       <name>scores</name>
-      <autoNewRow v="true" />
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
-          <name>4c9b65c7-96a8-4524-a465-2e928b51242f</name>
+          <name>7d49c1b4-3525-410c-92d2-b21a69fd8dec</name>
           <entityField>TITLE</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>9321f0c5-321e-4962-843b-f274d33916be</name>
+          <name>db21eec0-16c6-4267-a785-cb63f15e43b3</name>
           <entityField>SCORE</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>1170097d-0206-445e-8f2d-5768300f0262</name>
+          <name>38641e7a-a8fe-4ad4-af63-efde73d66a9a</name>
           <entityField>SORT</entityField>
         </neonTableColumn>
       </columns>
diff --git a/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod b/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..52c6ef70281889c3c150aaa3e5fd221fe33fb4f5
--- /dev/null
+++ b/neonView/ClassificationScoreMultiplePreview_view/ClassificationScoreMultiplePreview_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>ClassificationScoreMultiplePreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="false" />
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>scores</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>a50378a0-74dd-47fb-804b-f83bc1d25910</name>
+          <entityField>TITLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>d56f97c1-a634-4b12-8dd3-c2c32a9e16f1</name>
+          <entityField>SCORE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9fb3ba45-55e6-44f0-a612-7ddd54dacce0</name>
+          <entityField>SORT</entityField>
+        </neonTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
index f4592d59df1d3cc89a3154c2e5161511ee1fb05a..5343c1ed7a90cdfc9e13aa7a038992199ef497ad 100644
--- a/neonView/ClassificationTree_view/ClassificationTree_view.aod
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -15,7 +15,6 @@
       </defaultGroupFields>
       <hideActions v="true" />
       <showChildrenCount v="false" />
-      <entryAction>edit</entryAction>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/ClassificatonAdminEdit_view_/ClassificatonAdminEdit_view.aod b/neonView/ClassificatonAdminEdit_view_/ClassificatonAdminEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod b/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
similarity index 86%
rename from neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
rename to neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
index b0ef52c8a97aa2eab368e78f72d7057ef1f84996..ee90e4bcd018d01c53d357f714980712514c1a0b 100644
--- a/neonView/ClassificatonAdminEdit_view/ClassificatonAdminEdit_view.aod
+++ b/neonView/ClassificatonAdminPreview_view/ClassificatonAdminPreview_view.aod
@@ -1,17 +1,18 @@
 <?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>
+  <name>ClassificatonAdminPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <isSmall v="true" />
   <layout>
-    <noneLayout>
+    <boxLayout>
       <name>layout</name>
-    </noneLayout>
+      <autoHeight v="true" />
+    </boxLayout>
   </layout>
   <children>
     <genericViewTemplate>
       <name>classification</name>
-      <editMode v="true" />
+      <showDrawer v="true" />
       <drawerCaption>Classification</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
@@ -32,7 +33,7 @@
     <neonViewReference>
       <name>214fbe22-378d-404e-99f8-f175e037f196</name>
       <entityField>ClassificationScores</entityField>
-      <view>ClassificationScoreMultipleEdit_view</view>
+      <view>ClassificationScoreMultiplePreview_view</view>
     </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod b/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
similarity index 92%
rename from neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
rename to neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
index 6f355f1a9b0896d34c434d5740c887d5aacd4fd1..38b3c867605f61b06226af409931a0f0b301c5f8 100644
--- a/neonView/ClassificatonEdit_view/ClassificatonEdit_view.aod
+++ b/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
@@ -1,6 +1,6 @@
 <?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>
+  <name>ClassificatonPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <isSmall v="true" />
   <layout>
@@ -12,7 +12,7 @@
   <children>
     <genericViewTemplate>
       <name>classification</name>
-      <editMode v="true" />
+      <showDrawer v="true" />
       <drawerCaption>Classification</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
@@ -25,6 +25,7 @@
     <genericViewTemplate>
       <name>info</name>
       <entityField>#ENTITY</entityField>
+      <title></title>
       <fields>
         <entityFieldLink>
           <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
diff --git a/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c4e1ca3f84f61ae10f92174176bfe28c5405c99b
--- /dev/null
+++ b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>CompetitionDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Competitors</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>539e86b4-19da-4e25-a2fd-ee41cda09273</name>
+      <entityField>#ENTITY</entityField>
+      <view>CompetitionFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
similarity index 95%
rename from neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
rename to neonView/CompetitionEdit_view/CompetitionEdit_view.aod
index 1fba13ea39d0990722c2b9334394da2366ab85d2..244b0fd00ef45090ed8cdebc794480ba390d65f8 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectCompetitionEdit_view</name>
+  <name>CompetitionEdit_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <isSmall v="true" />
   <layout>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/CompetitionFilter_view/CompetitionFilter_view.aod
similarity index 70%
rename from neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
rename to neonView/CompetitionFilter_view/CompetitionFilter_view.aod
index 6236db526de5f5cdf0245e13bb4b72a6f638e8af..c48e69551e83641f2ca6a28c4da6b8f51b2c4e6a 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/CompetitionFilter_view/CompetitionFilter_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectCompetitionFilter_view</name>
+  <name>CompetitionFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
@@ -15,29 +15,27 @@
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
-          <name>511ea459-1b6f-41e8-b35a-0f67361c82eb</name>
+          <name>47821fb3-d178-4a54-9ec4-d78232e9b4de</name>
           <entityField>CONTACT_ID</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>5d146f0e-f0c7-4e7e-82e6-2b24bc241001</name>
+          <name>994c203b-f3df-4ea9-8c77-207c738e068a</name>
           <entityField>PHASE</entityField>
-          <width v="75" />
-          <expandRatio v="100" />
         </neonTableColumn>
         <neonTableColumn>
-          <name>322f7067-83ac-486e-9540-16d693775bdb</name>
+          <name>f2635d81-d079-486b-9b32-7980d36d2930</name>
           <entityField>STATUS</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>7143021a-18a5-4e78-a530-a46cd8dba1c8</name>
+          <name>785e5e08-9761-467b-864d-81ff5cc40729</name>
           <entityField>DATE_CANCELLED</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>1072d35e-6367-4f68-a92c-aae95c3e40b9</name>
+          <name>65daffc5-c8ba-46c0-baef-2ad105566941</name>
           <entityField>REASON</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>8922dc2c-e9e1-4a1b-b9db-b1908510d4e8</name>
+          <name>31bf73c0-fd3b-474b-bae5-cddfc0a16d65</name>
           <entityField>INFO</entityField>
         </neonTableColumn>
       </columns>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/CompetitionPreview_view/CompetitionPreview_view.aod
similarity index 94%
rename from neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
rename to neonView/CompetitionPreview_view/CompetitionPreview_view.aod
index b36a9970f54d7cc90102f1377c27d062bee24df6..76ab0ea75d85921c0b9026cb3ce11abab3d67cda 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/CompetitionPreview_view/CompetitionPreview_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectCompetitionPreview_view</name>
+  <name>CompetitionPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <headerFooterLayout>
diff --git a/neonView/DocumentDrawer_view/DocumentDrawer_view.aod b/neonView/DocumentDrawer_view/DocumentDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..147cf88d5a2c83708bbc1ebe09a36b6bf3727ec0
--- /dev/null
+++ b/neonView/DocumentDrawer_view/DocumentDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>DocumentDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Documents</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>10ff8c81-9280-4f65-856b-3fc9b56df818</name>
+      <entityField>#ENTITY</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/DocumentEdit_view/DocumentEdit_view.aod b/neonView/DocumentEdit_view/DocumentEdit_view.aod
index 94c8f4329ba5469401611c1d36b95d8e342a8464..e0cd372b0b900a03188a1d31c70c23be0e423e08 100644
--- a/neonView/DocumentEdit_view/DocumentEdit_view.aod
+++ b/neonView/DocumentEdit_view/DocumentEdit_view.aod
@@ -1,35 +1,35 @@
-<?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>DocumentEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Edit</name>
-      <editMode v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
-          <entityField>BINDATA_UPLOAD</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>91d96ac4-d838-4f92-90e7-954166b57288</name>
-          <entityField>NAME</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>253b8716-bdec-4e24-8540-7513d934693b</name>
-          <entityField>DESCRIPTION</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
-          <entityField>IS_MAIN_DOCUMENT</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>DocumentEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
+          <entityField>BINDATA_UPLOAD</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>91d96ac4-d838-4f92-90e7-954166b57288</name>
+          <entityField>NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>253b8716-bdec-4e24-8540-7513d934693b</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
+          <entityField>IS_MAIN_DOCUMENT</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index 1cc6202cb15454b17ea6f3ad01b4e7e8f330ec6f..ad738a576609563eb392edc278d57c7a74b8e725 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -37,10 +37,6 @@
           <name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>850130f7-75b1-42ef-9da9-da98966d6367</name>
-          <entityField>htmlText</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>bf313ea8-821a-4693-8ba2-4246ad8a4f62</name>
           <entityField>texText</entityField>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index e87e4b80f8ce90e5f85919f98cf0e3961a220810..bd55b911b25ad295f800d5ccd41559230f5b2332 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -1,37 +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>
-    <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>
+<?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/EmailEdit_view/EmailEdit_view.aod b/neonView/EmailEdit_view/EmailEdit_view.aod
index d2e4d3b22bb1fd976c706f0842a46e28a3801701..cd8e000e993edf8e77e39739352fb51355c50e69 100644
--- a/neonView/EmailEdit_view/EmailEdit_view.aod
+++ b/neonView/EmailEdit_view/EmailEdit_view.aod
@@ -1,28 +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>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>
+<?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/ForecastDrawer_view/ForecastDrawer_view.aod b/neonView/ForecastDrawer_view/ForecastDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c6b7af5d814bd26d1f64e0644e23b339f67d9a98
--- /dev/null
+++ b/neonView/ForecastDrawer_view/ForecastDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>ForecastDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Forecast</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>2d256ab5-1496-437a-abcb-20900cf3cc37</name>
+      <entityField>#ENTITY</entityField>
+      <view>ForecastFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod b/neonView/ForecastEdit_view/ForecastEdit_view.aod
similarity index 94%
rename from neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
rename to neonView/ForecastEdit_view/ForecastEdit_view.aod
index 4762fe310033f801a2bd17659e1d540437c1bee9..3a70c55d767e5edce33846c5e36373b1bcfc1684 100644
--- a/neonView/SalesprojectForecastEdit_view/SalesprojectForecastEdit_view.aod
+++ b/neonView/ForecastEdit_view/ForecastEdit_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectForecastEdit_view</name>
+  <name>ForecastEdit_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <isSmall v="true" />
   <layout>
diff --git a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod b/neonView/ForecastFilter_view/ForecastFilter_view.aod
similarity index 75%
rename from neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
rename to neonView/ForecastFilter_view/ForecastFilter_view.aod
index 821a4c272d01aa615aedbc57e94b113e18eb7164..785c2aa0f0b03055fe72b3abcb5180cb5a33ee91 100644
--- a/neonView/SalesprojectForecastFilter_view/SalesprojectForecastFilter_view.aod
+++ b/neonView/ForecastFilter_view/ForecastFilter_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectForecastFilter_view</name>
+  <name>ForecastFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
@@ -29,6 +29,14 @@
           <name>305d0254-a1ea-4733-87a7-a4d85fc78b7e</name>
           <entityField>INFO</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>945c0ec1-826f-4dc7-9556-7bd3d5e0afbc</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1ac60cf5-fa50-4305-81b4-859a883ddc3e</name>
+          <entityField>OBJECT_ROWID</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod b/neonView/ForecastPreview_view/ForecastPreview_view.aod
similarity index 93%
rename from neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
rename to neonView/ForecastPreview_view/ForecastPreview_view.aod
index 48095804a33f48cf688bfe2afd0bcd0237ea6cef..7e6bbac9e4a08e144b3c23f17c79fb3d3775ceb3 100644
--- a/neonView/SalesprojectForecastPreview_view/SalesprojectForecastPreview_view.aod
+++ b/neonView/ForecastPreview_view/ForecastPreview_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectForecastPreview_view</name>
+  <name>ForecastPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <headerFooterLayout>
diff --git a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
index 8de8af8aed11c23f39e0fda52b772905b34504c1..7d4e08182e5e7bbb5454b1024de173b4090c0588 100644
--- a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
+++ b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
@@ -1,42 +1,44 @@
-<?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>LogHistoryFilter_view</name>
-  <title>Log</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <timelineViewTemplate>
-      <name>LogHistoryTimeLine</name>
-      <dateField>DATE_NEW</dateField>
-      <titleField>USER_NEW</titleField>
-      <descriptionField>DESCRIPTION</descriptionField>
-      <iconIdField>#IMAGE</iconIdField>
-      <entityField>#ENTITY</entityField>
-    </timelineViewTemplate>
-    <tableViewTemplate>
-      <name>LogHistoryTable</name>
-      <hideContentSearch v="true" />
-      <entityField>#ENTITY</entityField>
-      <isEditable v="false" />
-      <columns>
-        <neonTableColumn>
-          <name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name>
-          <entityField>DATE_NEW</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name>
-          <entityField>USER_NEW</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name>
-          <entityField>DESCRIPTION</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>LogHistoryFilter_view</name>
+  <title>Log</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <timelineViewTemplate>
+      <name>LogHistoryTimeLine</name>
+      <favoriteActionGroup1>Reloading_actionGroup</favoriteActionGroup1>
+      <dateField>DATE_NEW</dateField>
+      <titleField>USER_NEW</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconIdField>#IMAGE</iconIdField>
+      <entityField>#ENTITY</entityField>
+    </timelineViewTemplate>
+    <tableViewTemplate>
+      <name>LogHistoryTable</name>
+      <favoriteActionGroup1>Reloading_actionGroup</favoriteActionGroup1>
+      <hideContentSearch v="true" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
+      <columns>
+        <neonTableColumn>
+          <name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name>
+          <entityField>DATE_NEW</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name>
+          <entityField>USER_NEW</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name>
+          <entityField>DESCRIPTION</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/MemberDrawer_view/MemberDrawer_view.aod b/neonView/MemberDrawer_view/MemberDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9f540b690679e26cecec5e401337be0754b4da0e
--- /dev/null
+++ b/neonView/MemberDrawer_view/MemberDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>MemberDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Salesproject member</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>9210dae5-1587-43f2-875b-5136bf5976bf</name>
+      <entityField>#ENTITY</entityField>
+      <view>MemberFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod b/neonView/MemberEdit_view/MemberEdit_view.aod
similarity index 66%
rename from neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
rename to neonView/MemberEdit_view/MemberEdit_view.aod
index 72f201d902b6ad950f01672667761eae7ea092b9..7db2988ef3466b156e8ae76f7817c4e9203fb643 100644
--- a/neonView/SalesprojectMemberEdit_view/SalesprojectMemberEdit_view.aod
+++ b/neonView/MemberEdit_view/MemberEdit_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectMemberEdit_view</name>
+  <name>MemberEdit_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <isSmall v="true" />
   <layout>
@@ -15,12 +15,16 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>0f78acf5-bea7-4c91-afe0-0907d20db131</name>
+          <name>2cdccd07-43f2-45c9-afcc-498ff2d36d47</name>
           <entityField>CONTACT_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>b74ab5a3-2d3c-49e6-b7df-219b16ca22fd</name>
-          <entityField>SALESPROJECT_ROLE</entityField>
+          <name>84696d3f-fe39-45f2-a48a-90cd916b125f</name>
+          <entityField>ROLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>188da6f5-4e65-4918-ba4c-379887d51449</name>
+          <entityField>DECIDER</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/MemberFilter_view/MemberFilter_view.aod
similarity index 77%
rename from neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
rename to neonView/MemberFilter_view/MemberFilter_view.aod
index 06067b78f960d356765705090c98860fe149422c..6a719214fa3920b2d2d60bbd6f9304580727a415 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/MemberFilter_view/MemberFilter_view.aod
@@ -1,6 +1,6 @@
 <?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>SalesprojectMemberFilter_view</name>
+  <name>MemberFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
@@ -13,6 +13,10 @@
       <name>Members</name>
       <entityField>#ENTITY</entityField>
       <columns>
+        <neonTableColumn>
+          <name>8bdd903b-0cd0-4327-bd24-3643d61d3de0</name>
+          <entityField>ICON</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
           <entityField>ORGANISATION_NAME</entityField>
@@ -23,7 +27,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>bea82980-0639-405a-ab3f-92e45f97090e</name>
-          <entityField>SALESPROJECT_ROLE</entityField>
+          <entityField>ROLE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>a30a083a-be66-4690-a7b6-19860a9bc72e</name>
@@ -37,6 +41,10 @@
           <name>c23f4e8b-87a1-4535-b2d1-f6c97d6bfe0b</name>
           <entityField>POSITION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>ade2cdae-ad07-4797-9440-00eddda68ee5</name>
+          <entityField>DECIDER</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
index c72f7535143b95cb61379886ac1b32b0be2994e3..c15aaf566d3fe38066e7678e0115869500adc16e 100644
--- a/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
+++ b/neonView/MyDashboardScoreCard_view/MyDashboardScoreCard_view.aod
@@ -29,6 +29,10 @@
   <children>
     <scoreCardViewTemplate>
       <name>Scorecard</name>
+      <fieldActions>
+        <element>openOverdueTasks</element>
+        <element>openNewTasks</element>
+      </fieldActions>
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
diff --git a/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod b/neonView/OfferDrawer_view/OfferDrawer_view.aod
similarity index 62%
rename from neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod
rename to neonView/OfferDrawer_view/OfferDrawer_view.aod
index 01e5e5579f7c7f5061697a45810d4983ecd20347..26c58377bbdf76ef991b55265e93046b1ce3398c 100644
--- a/neonView/ClassificationAdminMain_view/ClassificationAdminMain_view.aod
+++ b/neonView/OfferDrawer_view/OfferDrawer_view.aod
@@ -1,17 +1,18 @@
-<?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>
+<?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>OfferDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Offers</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>9ace1633-8aec-4bd7-a4e2-9bd7ef6b0d5a</name>
+      <entityField>#ENTITY</entityField>
+      <view>OfferFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 143ed88ba6a511a62bb4934e94ef75cd4249f3f5..ddc985c18e01bf4f507eb9fda9e4bfb88077a6b1 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -64,6 +64,10 @@
           <name>ed71986f-303c-4118-a895-51ec31ba8775</name>
           <entityField>HEADER</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>6fa2c13e-e3e6-4c27-9d62-bfb2faa61a03</name>
+          <entityField>ChoosenTEXFooter</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>9954516a-3fc3-48b5-8fe9-9dfc74f021e8</name>
           <entityField>FOOTER</entityField>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 3c8f81ddc0b662f5ec91d7fb6e840514ea785108..0b01196b5ffa3fb8cfc3dc41bbbe8df48e562bda 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_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>OfferitemFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <treeTableViewTemplate>
-      <name>OfferitemsTreeTable</name>
-      <parentField>ASSIGNEDTO</parentField>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>91e85f61-5e5d-48f8-aeb1-a5740ec07e25</name>
-          <entityField>ITEMPOSITION</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>0d896874-cdb1-42bb-8a47-8ee61def6177</name>
-          <entityField>PRODUCT_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>0b493fd0-d94d-4bfa-8533-ff2ad4af7ffb</name>
-          <entityField>QUANTITY</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>917406b8-f030-417d-a961-f391655526ec</name>
-          <entityField>UNIT</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>14da5a9f-4fed-4977-aec0-823ab665e1cb</name>
-          <entityField>PRICE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>25d9f682-eb5f-4d96-a040-c3f4522affe7</name>
-          <entityField>DISCOUNT</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>9e2bcb7e-b042-4f13-946c-0a6422412975</name>
-          <entityField>VAT</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>7a3b3ce6-a651-4a2a-acfa-0e990fb0b041</name>
-          <entityField>OPTIONAL</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>e43213db-8867-495f-8305-3472a8906222</name>
-          <entityField>TotalPrice</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>OfferitemFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>OfferitemsTreeTable</name>
+      <parentField>ASSIGNEDTO</parentField>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>91e85f61-5e5d-48f8-aeb1-a5740ec07e25</name>
+          <entityField>ITEMPOSITION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0d896874-cdb1-42bb-8a47-8ee61def6177</name>
+          <entityField>PRODUCT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0b493fd0-d94d-4bfa-8533-ff2ad4af7ffb</name>
+          <entityField>QUANTITY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>917406b8-f030-417d-a961-f391655526ec</name>
+          <entityField>UNIT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>14da5a9f-4fed-4977-aec0-823ab665e1cb</name>
+          <entityField>PRICE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>25d9f682-eb5f-4d96-a040-c3f4522affe7</name>
+          <entityField>DISCOUNT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9e2bcb7e-b042-4f13-946c-0a6422412975</name>
+          <entityField>VAT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>7a3b3ce6-a651-4a2a-acfa-0e990fb0b041</name>
+          <entityField>OPTIONAL</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>e43213db-8867-495f-8305-3472a8906222</name>
+          <entityField>TotalPrice</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ee165147-d91b-4d87-bd8a-90428d6f52be</name>
+          <entityField>INFO</entityField>
+        </neonTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
index ca1524850be726abbc34d28b8cbaa207d6f9b5fa..e6db91d75ca21de791e1f8d3b2a297c8368e58f6 100644
--- a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
+++ b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
@@ -19,10 +19,6 @@
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>7aa0ce6f-370c-4f50-8498-fd5768e0859c</name>
-          <entityField>CONDTYPE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>dd33df7a-82e6-49a8-b35f-99d0187970e3</name>
           <entityField>CONDITION</entityField>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..12ee08acd9ac1f2a9193b15bedb3c9a43fa9b699
--- /dev/null
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -0,0 +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>SalesprojectClassificationAttribute_view</name>
+  <title>Bewertung</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>HORIZONTAL</direction>
+      <maxDirectionElements v="2" />
+      <autoHeight v="false" />
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>793ed21a-147f-4ca0-a86a-ddbf79db92b6</name>
+      <entityField>Classifications</entityField>
+      <view>ClassificationDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e54114a1-3031-47f5-b27b-9774fc5225c5</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationTreeDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod b/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
index 465ac261fdfb3beb8426b1a60871c9d3fb73eac5..f7cbf462fa1591102a186115c4c422524d288ef5 100644
--- a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
+++ b/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
@@ -20,7 +20,7 @@
       </fields>
     </scoreCardViewTemplate>
     <neonViewReference>
-      <name>dab87547-93e4-43d4-94c9-b584f5bb8502</name>
+      <name>e8de8288-df16-4deb-9ce0-6554a669724f</name>
       <entityField>Classifications</entityField>
       <view>ClassificationTree_view</view>
     </neonViewReference>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index e4677ec406178b49442679b04ec8affd4fa49c15..ceb73d5aed643664180d427f2993191fe45674aa 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -27,7 +27,7 @@
       <name>OpenSalesprojectsDashlet</name>
       <title>Open salesprojects</title>
       <description>Show open salesprojects</description>
-      <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
+      <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiNDgzYmNhZWItMWU1Yi00NzcyLWI1NGUtN2Q3ZDhhYTY1NzEyIiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <icon>vaadin:filter</icon>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 1e5aa1272bef31bb2f73b3b12b19a1f0f87f2c2d..b10c6e54996d3441746a4558e3851b6f50bd689d 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -15,64 +15,29 @@
       <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>a2e010e7-434c-4188-be41-01672b9ccd25</name>
+      <name>57b93e84-fcb9-4f9d-bbad-1d7fdf16cc77</name>
       <entityField>#ENTITY</entityField>
-      <view>SalesprojectClassification_view</view>
+      <view>SalesprojectMemberActivity_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>
+      <name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
       <entityField>#ENTITY</entityField>
-      <view>SalesprojectMilestone_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
-      <entityField>SalesprojectCompetitions</entityField>
-      <view>SalesprojectCompetitionFilter_view</view>
+      <view>SalesprojectMilestoneSource_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>
+      <name>1cd0f7cc-bda9-40b1-ba46-7bdd28c0bef2</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectClassificationAttribute_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>9c98cef0-f9dd-40a7-a9c9-eb4e741286d2</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTree_view</view>
+      <name>16ef2fde-0b5f-4545-b065-80738b2388fc</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectOfferForecast_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>0a3f2444-8d91-41e3-8f4d-19a6013c29c5</name>
-      <entityField>Documents</entityField>
-      <view>DocumentFilter_view</view>
+      <name>1ff890f4-58e1-441f-a714-1faabbf3744b</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectTimeDocComp_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
diff --git a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fbe4c90ef72d87bd581912c5f65b4f7b0aef6532
--- /dev/null
+++ b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
@@ -0,0 +1,24 @@
+<?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>SalesprojectMemberActivity_view</name>
+  <title>Projektteam und Aktivitäten</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <autoHeight v="false" />
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>5e9b2286-227e-494d-a252-be29a50a093a</name>
+      <entityField>Activities</entityField>
+      <view>ActivityDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ebf752f4-653d-4de3-9c81-c3e6ef692c48</name>
+      <entityField>Members</entityField>
+      <view>MemberDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..af24daab68b399092e28a9f2eb2a119295bcea46
--- /dev/null
+++ b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_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>SalesprojectMilestoneSource_view</name>
+  <title>Meilensteine und Kontaktpunkte</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>4f6c1764-1a86-45c7-aa70-c109d20f0fb2</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectMilestone_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7126a87f-4a78-462b-ac35-a3fb68afedcd</name>
+      <entityField>SalesprojectSources</entityField>
+      <view>SalesprojectSourceDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1dd424987fa8f479dfb515eb3ab28ab6dc8e619a
--- /dev/null
+++ b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_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>SalesprojectOfferForecast_view</name>
+  <title>Angebot und Forecast</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>c399a9ac-e0ad-490c-8ffb-247fc806233b</name>
+      <entityField>Forecasts</entityField>
+      <view>ForecastDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>74772673-7bf8-4e9c-8e61-d798c275c180</name>
+      <entityField>Offers</entityField>
+      <view>OfferDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 6aeddbb32771721192bb676fa6d46006e174a425..93d3fc2ee2cb3095455e208b639a8b16eeda80bc 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,102 +1,102 @@
-<?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>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
-          <entityField>ClassificationResult</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
-          <entityField>RemainingTime</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>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>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
+          <entityField>ClassificationResult</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
+          <entityField>RemainingTime</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod b/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..35f94f37719cbcba5ad3e05deb4e6b479e1447f1
--- /dev/null
+++ b/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>SalesprojectSourceDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Touchpoints</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>48334450-993a-4922-b314-271a98d85abe</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectSourceFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
index 15e04bd2e1d58f9d7b429e4f188ba4ba7f1f2789..b66ef9b3fd6ae3f9f9ef50b23630e3bf97f4701d 100644
--- a/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
+++ b/neonView/SalesprojectSourcePreview_view/SalesprojectSourcePreview_view.aod
@@ -12,18 +12,19 @@
     <cardViewTemplate>
       <name>Header</name>
       <titleField>SOURCE</titleField>
-      <descriptionField>INFO</descriptionField>
+      <descriptionField>ENTRYDATE</descriptionField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
       <showDrawer v="true" />
-      <drawerCaption>Details</drawerCaption>
+      <drawerCaption>Description</drawerCaption>
+      <hideLabels v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>7c61ec34-3206-4dba-96cf-24fe0112bf7b</name>
-          <entityField>ENTRYDATE</entityField>
+          <name>06422231-b584-4573-a9b4-eb42f8500aca</name>
+          <entityField>INFO</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
diff --git a/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod b/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..770985b37d98c8663bce5182ea1ab133a5139718
--- /dev/null
+++ b/neonView/SalesprojectTimeDocComp_view/SalesprojectTimeDocComp_view.aod
@@ -0,0 +1,30 @@
+<?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>SalesprojectTimeDocComp_view</name>
+  <title>Further informations</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>HORIZONTAL</direction>
+      <maxDirectionElements v="2" />
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>0e085746-ca89-4afa-b83a-30af959d7ddb</name>
+      <entityField>Timetrackings</entityField>
+      <view>TimetrackingDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>baccab92-37f1-4a33-9662-771323996adf</name>
+      <entityField>Documents</entityField>
+      <view>DocumentDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4dcc3fdd-6683-435c-95c1-a59597fc3e71</name>
+      <entityField>Competitions</entityField>
+      <view>CompetitionDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 11e5be41cb21ff7d265807345517101cf5124fb2..4d44b6272b1c108cfaa569dc452c7f1331c31461 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -1,64 +1,73 @@
-<?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>TaskEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Edit</name>
-      <editMode v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
-          <entityField>SUBJECT</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
-          <entityField>DESCRIPTION</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>b5d6e9ea-355f-49f8-bcc2-f3efd44adb19</name>
-          <entityField>START_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>511acbd5-4ab6-44a9-932d-df4f201896a5</name>
-          <entityField>MATURITY_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>05c54fab-56b8-4cea-8b66-ba26e5dd16cd</name>
-          <entityField>STATUS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>5fd464a1-d394-4f83-ba6a-386984a5df49</name>
-          <entityField>PROGRESS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
-          <entityField>PRIORITY</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
-          <entityField>PROTECTIONLEVEL</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>fd41b0ee-cae4-40b5-8aad-45740f4d6268</name>
-          <entityField>REQUESTOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>8428cbf6-7df0-4f7e-b6d6-5ab17e266028</name>
-          <entityField>EDITOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>ee35d86f-aef9-4ebd-b90a-d31b32cc3d5f</name>
-      <entityField>Links</entityField>
-      <view>TaskLinkMultiEdit_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>TaskEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>f8dcc490-1b86-47c3-88fa-8005f8e0095b</name>
+          <entityField>TYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
+          <entityField>SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b31bb2ab-22a6-4bc6-8b6c-d73a1c43283f</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b5d6e9ea-355f-49f8-bcc2-f3efd44adb19</name>
+          <entityField>START_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>511acbd5-4ab6-44a9-932d-df4f201896a5</name>
+          <entityField>MATURITY_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>05c54fab-56b8-4cea-8b66-ba26e5dd16cd</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5fd464a1-d394-4f83-ba6a-386984a5df49</name>
+          <entityField>PROGRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
+          <entityField>PROTECTIONLEVEL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fd41b0ee-cae4-40b5-8aad-45740f4d6268</name>
+          <entityField>REQUESTOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8428cbf6-7df0-4f7e-b6d6-5ab17e266028</name>
+          <entityField>EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>ee35d86f-aef9-4ebd-b90a-d31b32cc3d5f</name>
+      <entityField>Links</entityField>
+      <view>TaskLinkMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>74f3f70d-c25f-455c-a619-593f569360a6</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index a732fde154879f3561cfa3eb8287894e79f95d40..36538160f32f47a8e26957c0e5fec4b32d4fd0e5 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -34,6 +34,7 @@
   <children>
     <timelineViewTemplate>
       <name>TasksTimeline</name>
+      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <dateField>MATURITY_DATE</dateField>
       <titleField>SUBJECT_DETAILS</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
@@ -42,6 +43,7 @@
     </timelineViewTemplate>
     <tableViewTemplate>
       <name>TasksTable</name>
+      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
       <title></title>
       <columns>
@@ -70,6 +72,7 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>TasksTreeTable</name>
+      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index 4adad92199f4e88c9e612bb02012711f2cd1ebac..efa23f33b6a49391cfe6ff89f0c08eb046e0fa27 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -1,57 +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>TaskMainPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-      <header>Header</header>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Header</name>
-      <iconField>PRIORITY_ICON</iconField>
-      <titleField>SUBJECT</titleField>
-      <descriptionField>STATUS</descriptionField>
-      <favoriteAction1>newActivity</favoriteAction1>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-    <genericViewTemplate>
-      <name>Info</name>
-      <showDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
-          <entityField>START_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
-          <entityField>MATURITY_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>a2c82cd5-6dcd-42aa-b650-85369f4e8d39</name>
-          <entityField>PROGRESS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
-          <entityField>PRIORITY</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
-          <entityField>REQUESTOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
-          <entityField>EDITOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>c4f66270-1d64-4243-9561-fb5642cff3f1</name>
-      <entityField>Links</entityField>
-      <view>TaskLinkPreviewList_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>TaskMainPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Header</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Header</name>
+      <iconField>PRIORITY_ICON</iconField>
+      <titleField>SUBJECT</titleField>
+      <subtitleField>CODE</subtitleField>
+      <descriptionField>STATUS</descriptionField>
+      <favoriteAction1>newActivity</favoriteAction1>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Info</name>
+      <showDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
+          <entityField>START_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
+          <entityField>MATURITY_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>a2c82cd5-6dcd-42aa-b650-85369f4e8d39</name>
+          <entityField>PROGRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
+          <entityField>REQUESTOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
+          <entityField>EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>c4f66270-1d64-4243-9561-fb5642cff3f1</name>
+      <entityField>Links</entityField>
+      <view>TaskLinkPreviewList_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 06d66f34d0c96cdeebfd8d6b5a3289e10a6636b1..adf0d2c480a382d698b8a3bba7a677f9ff75d938 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -1,50 +1,57 @@
-<?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>TaskMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
-      <entityField>#ENTITY</entityField>
-      <view>TaskMainPreview_view</view>
-    </neonViewReference>
-    <genericViewTemplate>
-      <name>details</name>
-      <showDrawer v="true" />
-      <drawerCaption>Detail</drawerCaption>
-      <entityField>#ENTITY</entityField>
-      <title>details</title>
-      <fields>
-        <entityFieldLink>
-          <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
-          <entityField>PROTECTIONLEVEL</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
-          <entityField>DESCRIPTION</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
-      <entityField>ModuleTrees</entityField>
-      <view>ModuleTree_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
-      <entityField>Documents</entityField>
-      <view>DocumentFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>ffa776bd-013c-4d4d-aedd-490625ef0fe1</name>
-      <entityField>LogHistories</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>TaskMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>bfecc398-890e-485f-afa0-74e24f41b019</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>details</name>
+      <showDrawer v="true" />
+      <drawerCaption></drawerCaption>
+      <fixedDrawer v="true" />
+      <hideLabels v="false" />
+      <entityField>#ENTITY</entityField>
+      <title>details</title>
+      <fields>
+        <entityFieldLink>
+          <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
+          <entityField>PROTECTIONLEVEL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
+      <entityField>ModuleTrees</entityField>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ffa776bd-013c-4d4d-aedd-490625ef0fe1</name>
+      <entityField>LogHistories</entityField>
+      <view>LogHistoryFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bfecc398-890e-485f-afa0-74e24f41b019</name>
+      <entityField>#ENTITY</entityField>
+      <view>TaskPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f45ff4cb-e469-46ee-808f-8c406eccbcd2</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 822f65baed5aa216801c0f4b6ba9287d63a8a152..c9c0f3de9c6e3d68e0c1dc6ebd087b106832b759 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -1,66 +1,80 @@
-<?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>TaskPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-      <header>Header</header>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <cardViewTemplate>
-      <name>Header</name>
-      <iconField>PRIORITY_ICON</iconField>
-      <titleField>SUBJECT</titleField>
-      <descriptionField>STATUS</descriptionField>
-      <favoriteAction1>newActivity</favoriteAction1>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-    <genericViewTemplate>
-      <name>Info</name>
-      <showDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
-          <entityField>START_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
-          <entityField>MATURITY_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>3c7f0603-f659-47ea-adbf-4a4b0b0c6b37</name>
-          <entityField>PROGRESS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
-          <entityField>PRIORITY</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
-          <entityField>PROTECTIONLEVEL</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
-          <entityField>REQUESTOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
-          <entityField>EDITOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
-      <entityField>Links</entityField>
-      <view>TaskLinkPreviewList_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
-      <entityField>MainDocuments</entityField>
-      <view>DocumentList_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>TaskPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Header</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Header</name>
+      <iconField>PRIORITY_ICON</iconField>
+      <titleField>SUBJECT</titleField>
+      <subtitleField>CODE</subtitleField>
+      <descriptionField>STATUS</descriptionField>
+      <favoriteAction1>newActivity</favoriteAction1>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Info</name>
+      <showDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
+          <entityField>START_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
+          <entityField>MATURITY_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3c7f0603-f659-47ea-adbf-4a4b0b0c6b37</name>
+          <entityField>PROGRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
+          <entityField>PROTECTIONLEVEL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
+          <entityField>REQUESTOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
+          <entityField>EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
+      <entityField>Links</entityField>
+      <view>TaskLinkPreviewList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
+      <entityField>MainDocuments</entityField>
+      <view>DocumentList_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>Description</name>
+      <showDrawer v="true" />
+      <drawerCaption>Description</drawerCaption>
+      <hideLabels v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>65933f93-96fc-4bfe-9297-7e185868ec77</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod b/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..eaaa35e64364e5872a26a37e262849ddabd47966
--- /dev/null
+++ b/neonView/TimetrackingDrawer_view/TimetrackingDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>TimetrackingDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Timetracking</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>463458e6-fb6a-4550-b4b4-04b61969f9f2</name>
+      <entityField>#ENTITY</entityField>
+      <view>TimetrackingFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 3e5bbf87dec599e4e0be6ba8428dd5cbee05fced..f838414acb5379736f9113239c8abf45b09a1847 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -1,100 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>xRM-Basic2019</projectName>
-  <jditoMaxContentSize v="57671680" />
-  <calendarCategoriesEvent>
-    <entry>
-      <key>Meeting</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>Organisation</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>auswärts</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>Urlaub</key>
-      <value></value>
-    </entry>
-  </calendarCategoriesEvent>
-  <clientSearchOptimizedForSpeed v="true" />
-  <clientSearchExcludeForIgnorecase v="true" />
-  <blobHandlingMethod>DATABASE</blobHandlingMethod>
-  <databaseAuditGetOldValueLobs v="false" />
-  <indexsearchGlobalEnabled v="true" />
-  <indexsearchFullIndexerEnabled v="true" />
-  <indexsearchFullIndexerInterval v="0" />
-  <indexsearchIncrementingIndexerEnabled v="true" />
-  <indexsearchIncrementingIndexerInterval v="1000" />
-  <indexsearchIncrementingIndexerBunchSize v="250" />
-  <indexsearchMaximumHits v="50000" />
-  <customProperties>
-    <customBooleanProperty>
-      <name>addressValidation.enable</name>
-      <property v="false" />
-    </customBooleanProperty>
-    <customStringProperty>
-      <name>addressValidation.url</name>
-      <property>https://services.aditosoftware.local/services/rest/ws_checkAddress</property>
-    </customStringProperty>
-    <customStringProperty>
-      <name>addressValidation.user</name>
-      <property>Admin</property>
-    </customStringProperty>
-    <customStringProperty>
-      <name>addressValidation.pw</name>
-      <property>a</property>
-    </customStringProperty>
-    <customStringProperty>
-      <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>
-      <property v="false" />
-    </customBooleanProperty>
-    <customStringProperty>
-      <name>phoneValidation.url</name>
-      <description></description>
-      <property>https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber</property>
-    </customStringProperty>
-    <customStringProperty>
-      <name>phoneValidation.user</name>
-      <property>Admin</property>
-    </customStringProperty>
-    <customStringProperty>
-      <name>phoneValidation.pw</name>
-      <property>a</property>
-    </customStringProperty>
-    <customStringProperty>
-      <name>phoneValidation.countryParamName</name>
-      <property>Country</property>
-    </customStringProperty>
-  </customProperties>
-</preferences>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <mailGlobalUserServerEnabled v="true" />
+  <projectName>xRM-Basic2019</projectName>
+  <jditoMaxContentSize v="57671680" />
+  <mailDefaultMailserver>mailServerIMAP</mailDefaultMailserver>
+  <mailRepositoryAlias>defaultDbRepository</mailRepositoryAlias>
+  <calendarCategoriesEvent>
+    <entry>
+      <key>Meeting</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>Organisation</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>auswärts</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>Urlaub</key>
+      <value></value>
+    </entry>
+  </calendarCategoriesEvent>
+  <clientSearchOptimizedForSpeed v="true" />
+  <clientSearchExcludeForIgnorecase v="true" />
+  <blobHandlingMethod>DATABASE</blobHandlingMethod>
+  <databaseAuditGetOldValueLobs v="false" />
+  <indexsearchGlobalEnabled v="true" />
+  <indexsearchFullIndexerEnabled v="true" />
+  <indexsearchFullIndexerInterval v="0" />
+  <indexsearchIncrementingIndexerEnabled v="true" />
+  <indexsearchIncrementingIndexerInterval v="1000" />
+  <indexsearchIncrementingIndexerBunchSize v="250" />
+  <indexsearchMaximumHits v="50000" />
+  <customProperties>
+    <customBooleanProperty>
+      <name>addressValidation.enable</name>
+      <property v="true" />
+    </customBooleanProperty>
+    <customStringProperty>
+      <name>addressValidation.url</name>
+      <property>https://services.aditosoftware.local/services/rest/ws_checkAddress</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>addressValidation.user</name>
+      <property>Admin</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>addressValidation.pw</name>
+      <property>a</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>addressValidation.countryParamName</name>
+      <property>country</property>
+    </customStringProperty>
+    <customBooleanProperty>
+      <name>zipCityValidation.enable</name>
+      <property v="true" />
+    </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>
+      <property v="true" />
+    </customBooleanProperty>
+    <customStringProperty>
+      <name>phoneValidation.url</name>
+      <description></description>
+      <property>https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>phoneValidation.user</name>
+      <property>Admin</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>phoneValidation.pw</name>
+      <property>a</property>
+    </customStringProperty>
+    <customStringProperty>
+      <name>phoneValidation.countryParamName</name>
+      <property>Country</property>
+    </customStringProperty>
+  </customProperties>
+</preferences>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 26a4efc1d49cfdef8c81de0730eb1c9097a79e69..d502802ce34c25af3f60529f0861dd85fd1b758e 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -9,6 +9,7 @@ import("system.eMath");
 import("Util_lib");
 import("Sql_lib");
 import("Keyword_lib");
+import("KeywordRegistry_basic");
 import("Product_lib");
 import("Report_lib");
 import("Context_lib");
@@ -77,9 +78,9 @@ function TaskUtils () {}
 /**
  * Create a new task
  */
-TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pParentId)
+TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pParentId, pParams)
 {
-    _ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId)
+    _ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId, pParams)
 }
 
 /**
@@ -101,6 +102,49 @@ TaskUtils.hasTasks = function(pRowId, pObjectType)
         return true;
 }
 
+/**
+ * Sets the code of the given Task to the current max-code + 1
+ */
+TaskUtils.setCode = function(pTaskId)
+{
+    var max = db.cell("select max(CODE) from TASK");
+    if (!max)
+        max = -1;
+    
+    db.updateData("TASK", ["CODE"], null, [parseInt(max)+1], SqlCondition.equals("TASK.TASKID", pTaskId, "1=2"));
+}
+
+TaskUtils.getTypeGroup = function(pType)
+{
+    return KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "group", "Task");
+}
+
+TaskUtils.typeHasAttributes = function(pType)
+{
+    return TaskUtils.getTypeAttributes(pType).length > 0;
+}
+
+TaskUtils.getTypeAttributes = function(pType)
+{
+    return JSON.parse(KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "attributes", "[]"));
+}
+
+TaskUtils.getTypeStatusKeyword = function(pType)
+{
+    return KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "status", $KeywordRegistry.taskStatus());
+}
+
+TaskUtils.getShowCode = function(pType)
+{
+    return KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "showCode", true);
+}
+
+TaskUtils.getStatusIcon = function(pType, pStatus)
+{
+    var status = TaskUtils.getTypeStatusKeyword(pType)
+    return KeywordUtils.getAttributeRelation(pStatus, status, "icon", "NEON:STATUS_NOT_STARTED");
+}
+
 /**
  * add the links to the link-table in new mode
  * 
@@ -127,12 +171,16 @@ function _ActivityTaskUtils() {}
  * Create a new task
  * @ignore
  */
-_ActivityTaskUtils._createNew = function(pContext, pRowId, pAdditionalLinks, pParentContext, pParentId)
+_ActivityTaskUtils._createNew = function(pContext, pRowId, pAdditionalLinks, pParentContext, pParentId, pParams)
 {
     if (pAdditionalLinks == undefined)
         pAdditionalLinks = [];
     
     var params = {};
+    
+    if (pParams)
+        params = pParams
+    
     if (pRowId)
     {
         params["ObjectId_param"] = ContextUtils.getCurrentContextId();
diff --git a/process/Address_lib/process.js b/process/Address_lib/process.js
index 2b4406c8124819a4ec41bf95302450c8de6de8c4..5f543024e9ef8cd4876ac36491278caf4ef55070 100644
--- a/process/Address_lib/process.js
+++ b/process/Address_lib/process.js
@@ -1,473 +1,474 @@
-import("system.swing");
-import("system.text");
-import("system.db");
-import("system.logging");
-import("system.vars");
-import("system.translate");
-import("Attribute_lib");
-import("Sql_lib");
-import("Util_lib");
-
-/*
-* Creates a Address Object
-* 
-* @param {String} pRelationID req relationid for which address should be retrieved
-* @param {String} pAddressID opt addressid for which address should be retrieved
-* @param {boolean} pPerson whether the address is from a person, not an organisation
-*  
-* @return {String} the formatted address
-*/
-
-function AddrObject( pRelationID, pPerson, pAddressID )
-{
-    this.Data = fetchAddressData( [ pRelationID ] , [["", "addressformat", ""]], pAddressID, pPerson );
-    this.fmt = this.Data[0][0][26]; 
-	
-    /*
-    * creates a formatted address
-    * 
-    * @param {boolean} pCountry whether the country should be displayed
-    * @param {String} pFormat a fixed format for the address
-    * 
-    * @return {String} formatted address
-    */
-    this.getFormattedAddress = function( pCountry, pFormat )
-    {	
-        return _formatAddrData( _getAddrData(  this.Data[0][0] ), pFormat, pCountry );
-    }
-}
-
-/*
-* creates address data
-* 
-* @param {String} pCondition req SQL-Where-Condition  
-* @param {String [[]]} pConfig req ( name, functionality, details )
-* @param {String} pSenderID opt UserRelationID
-* @param {String} pAddressID opt addressid
-* 
-* @return {[]}  Daten 
-*/
-function getAddressesData( pCondition, pConfig, pSenderID, pAddressID )
-{ 
-    var returndata = [];
-    var senderconfig = [];
-    var employeeconfig = [];
-    var config = [];
-    for ( var i = 0; i < pConfig.length; i++ )
-    {
-        var type = pConfig[i][1].split(".");
-        switch( type[0] )
-        {
-            case "employee":
-                employeeconfig.push([pConfig[i][0], type[1], pConfig[i][2]]);
-                break;
-            case "sender":
-                senderconfig.push([pConfig[i][0], type[1], pConfig[i][2]]);
-                break;
-            default:
-                config.push(pConfig[i]);
-                break;
-        } 
-    }
-    var data = getAddressData( pCondition, config, pAddressID );
-    if ( pSenderID == undefined )  pSenderID = vars.get("$global.user").relationid;
-    if ( senderconfig.length > 0 ) 
-        var senderdata = getAddressData( [ pSenderID ], senderconfig );
-    if ( employeeconfig.length > 0 ) 
-        var employeedata = getAddressData( [ vars.get("$global.user").relationid ], employeeconfig );
-    if ( data.length > 0 && ( senderconfig.length > 0 || employeeconfig.length > 0  ) )
-    { 
-        var ze = data[0];
-        if ( employeeconfig.length > 0 ) ze = ze.concat( employeedata[0] );
-        if ( senderconfig.length > 0 ) ze = ze.concat( senderdata[0] ); 
-        returndata.push(ze);
-        for ( i = 1; i < data.length; i++ )
-        {
-            ze = data[i];
-            if ( employeeconfig.length > 0 ) ze = ze.concat( employeedata[1] );
-            if ( senderconfig.length > 0 ) ze = ze.concat( senderdata[1] ); 
-            returndata.push(ze);
-        }
-        return returndata;
-    }
-    else return data;
-}
-
-/*
-* creates
-* 
-* @param {String} pCondition req SQL-Where-Condition  
-* @param {String [[]]} pConfig req ( name, functionality, details )
-* @param {String} AddressID opt addressid
-* 
-* @return {[]}  Daten 
-*/
-function getAddressData( pCondition, pConfig, AddressID )
-{ 
-    return setAddressData( fetchAddressData( pCondition, pConfig, AddressID ) );
-}
-
-/*
-* reads data from the database
-* 
-* @param {String} pCondition req SQL-Where-Condition  
-* @param {String [[]]} pConfig req ( name, functionality, details )
-* @param {String} AddressID opt addressid
-* @param {boolean} pPerson opt if private person
-* 
-* @return {[]}  data 
-*/
-function fetchAddressData( pCondition, pConfig, AddressID, pPerson )
-{ 
-    if ( typeof(pCondition) == "object") pCondition = "CONTACT.CONTACTID in ('" + pCondition.join("','") + "')";
-    if ( pConfig.length > 0 )
-    { 
-        var header = [];
-        var fields = [];
-        var output = [];
-        var pos = 0;
-        var posaddrfields = -1;
-        var functionCalls = [];
-        var addrfields = ["case when CONTACT.PERSON_ID is null then 1 else case when " + SqlMaskingUtils.prototype.trim("CONTACT.ORGANISATION_ID") + " = '0' then 2 else 3 end end", //0
-        "ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.COUNTRY", "ADDRESS.ADDRESSADDITION",  // 1-6
-        "ADDRESS.ADDRIDENTIFIER", "ADDRESS.DISTRICT", "ADDRESS.REGION", "ADDRESS.STATE", "CONTACT.DEPARTMENT", "CONTACT.CONTACTROLE", // 7-12
-        "CONTACT.POSITION", "CONTACT.LETTERSALUTATION", "ORGANISATION.NAME", "PERSON.FIRSTNAME", "PERSON.MIDDLENAME", "PERSON.LASTNAME",  // 13-18
-        "PERSON.SALUTATION", "PERSON.TITLE", "PERSON.TITLESUFFIX", // 19-21
-        "coalesce( CONTACT.LANGUAGE, (select C.LANGUAGE from CONTACT C where C.ORGANISATION_ID = CONTACT.ORGANISATION_ID and PERSON_ID is null))", // 22
-        "''", "''", "''", "(select ADDR_FORMAT from AB_COUNTRYINFO where ISO2 = ADDRESS.COUNTRY)", "ADDRESS.ADDR_TYPE"]; // 23-27
-											
-        for (var i=0; i < pConfig.length; i++ )
-        {
-            switch( pConfig[i][1] )
-            {
-                case "fieldname": // database fields
-                    fields.push( pConfig[i][2] );
-                    output.push([pos++, pConfig[i][1]]);
-                    header.push( pConfig[i][0] );
-                    break;
-                case "function": // adito SQL functions
-                    fields.push( evalScript("Address_lib.fetchAddressData", vars.resolveVariables(pConfig[i][2]), {}, ["Attribute_lib", "Sql_lib", "Keyword_lib", "Person_lib"], true) );
-                    output.push([pos++, pConfig[i][1]]);
-                    header.push( pConfig[i][0] );
-                    break;
-                case "afunction": // adito functions
-                    try
-                    {
-                        fields.push( "'" + evalScript("Address_lib.fetchAddressData", vars.resolveVariables(pConfig[i][2]), {}, ["Attribute_lib", "Sql_lib", "Keyword_lib", "Person_lib"], true).replace(new RegExp("'","g"), "''") + "'" ); 
-                        output.push([pos++, pConfig[i][1]]);
-                        header.push( pConfig[i][0] );
-                    }
-                    catch( err )
-                    {                      
-                        logging.log( err )
-                    }
-                    break;
-                case "select": // Subselects
-                    fields.push( "(" + vars.resolveVariables(pConfig[i][2]) + " )" );
-                    output.push([pos++, pConfig[i][1]]);
-                    header.push( pConfig[i][0] );
-                    break;
-                case "addressformat": // Addressformat
-                    if ( posaddrfields == -1 )
-                    {        
-                        var sortfields = ["ORGANISATION.NAME", "PERSON.LASTNAME"];
-                        fields.push( addrfields.join(", ") );
-                        posaddrfields = pos;
-                        pos += addrfields.length;								
-                    }
-                    output.push([posaddrfields, pConfig[i][1], pConfig[i][2]]);
-                    header.push( pConfig[i][0] );
-                    break;
-                case "resolveIDFunction":
-                    var configJSON = pConfig[i][2];
-                    fields.push( configJSON.rowIDField );
-
-                    functionCalls.push([pos,
-                        configJSON.resolveFunction,
-                        configJSON.imports,
-                        configJSON.localVars]);
-                                    
-                    output.push([pos++, pConfig[i][1]]);
-                    header.push( pConfig[i][0] );                
-                    break;
-            }
-        }
-        if (!pPerson) {           
-            var sqlstr =  "select " + fields.join(",") 
-            + " from CONTACT join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
-            + " left join PERSON on CONTACT.PERSON_ID = PERSON.PERSONID "
-            + " left join ADDRESS on CONTACT.ADDRESS_ID = ";
-        } else {
-            
-            sqlstr = "select " + fields.join(",")
-            + " from CONTACT join PERSON on CONTACT.PERSON_ID = PERSON.PERSONID "
-            + " left join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
-            + " left join ADDRESS on CONTACT.ADDRESS_ID = ";
-        }
-        
-        if ( AddressID != undefined && AddressID != "" )  sqlstr += "'" + AddressID + "'"; 
-        else sqlstr += "ADDRESS.ADDRESSID";
-        if ( pCondition != "" ) sqlstr += " where " + pCondition;
-        var data = db.table(sqlstr + (sortfields != undefined ? " order by " + sortfields.join(", ") : "" ));
-
-        // loop over all returned datasets
-        for( var j = 0; j < data.length; j++)
-        {
-            // loop over all possible resolveFunction entries
-            for( var k = 0; k < functionCalls.length; k++ )
-            {
-                // get the local variables, which should be present in the function call
-                var localVars = functionCalls[k][3];
-                // add the row id value to the localVars Object so the funtion can gather the data for this dataset
-                localVars.rowIDValue = data[j][ functionCalls[k][0] ];
-                // replace the row id with its base64 string
-                data[j][ functionCalls[k][0] ] = evalScript("Address_lib.fetchAddressData.resolveFunction", 
-                    vars.resolveVariables( functionCalls[k][1]+"()" ), 
-                    localVars, 
-                    functionCalls[k][2], // imports
-                    true);
-            }
-        }
-        
-        if ( data.length == 0 ) 
-        {   
-            logging.log("Address_lib: " +  pCondition, logging.ERROR);
-            data = [[]];
-            for ( i = 0; i < addrfields.length + fields.length; i++ )   data[0].push("Err.");
-        }
-        data = [ data, output, header, addrfields ];
-    }
-    return data;
-}
-
-/*
-* reads data from the database
-* 
-* @param {String [[]]} pData req array of data
-* 
-* @return {String [[]]}  data 
-*/
-function setAddressData( pData )
-{ 
-    var sqlresult = pData[0];
-    var data = [];
-    if ( sqlresult.length > 0 )
-    {
-        var output = pData[1]; 
-        var header = pData[2];
-        var addrfields = pData[3];
-        data.push( header );
-        for ( var i = 0; i < sqlresult.length; i++ )
-        {		
-            var addrdata = [];
-            var row = [];	
-            for ( var z = 0; z < header.length; z++ )
-            {
-                switch( output[z][1] )
-                {
-                    case "fieldname":
-                    case "function":
-                    case "afunction":
-                    case "resolveIDFunction":
-                    case "select":
-                        row[z] = sqlresult[i][output[z][0]];
-                        break;
-                    case "addressformat":
-                        if (addrdata.length == 0) addrdata = _getAddrData( sqlresult[i].slice(output[z][0], output[z][0] + addrfields.length) );
-                        row[z] = _formatAddrData( addrdata, output[z][2] );
-                        break;
-                }
-            }
-            data.push( row );
-        }
-    }
-    return data;
-}
-/*
-*
-* returns formatted address data
-*
-* @param {String [[]]} pData req data 
-*
-* @return {String [[]]} formatted data
-*/
-function _getAddrData( pData )
-{
-    var lettersalutation = pData[14];
-    var salutation = pData[19];
-    var sformat = "";
-    switch( Number(pData[0]) )
-    {
-        case 1:
-            if ( lettersalutation == "" ) 
-            {
-                sformat = _getSalutation( pData[22] );
-                if ( sformat != undefined && sformat[1] != "" ) lettersalutation = _formatAddrData( pData,  sformat[1] );
-                else lettersalutation = "Sehr geehrte Damen und Herren";
-            }
-            break;
-        case 2:
-            // private -> orgname deleted
-            pData[15] = "";
-        case 3:
-            sformat = _getSalutation( pData[22] + pData[19] + pData[20] );
-            //no language defined
-            if ( sformat == undefined )  sformat = _getSalutation( pData[19] + pData[20] );
-            // no language specific entry in salutation
-            if ( sformat == undefined || sformat[0] == "" || sformat[1] == "" )	sformat = ["{sa} {ti} {fn} {la}", "{sa} {ti} {ln}"];
-            salutation = _formatAddrData( pData,  sformat[0] );
-            // lettersalutation if none existent yet
-            if( lettersalutation == "" ) lettersalutation = _formatAddrData( pData, sformat[1] );
-    }
-
-    pData[23] = salutation;
-    pData[24] = lettersalutation;
-    pData[25] = _getCountryName(pData[5]);
-    return pData;
-}
-
-/*
-* returns a formatted salutation
-* 
-* @param {String} pSalutCode req salutation code
-* 
-* @return {String} translated salutation
-*/
-function _getSalutation( pSalutCode )
-{
-    var salut = new Object();
-    if (vars.exists("$global.Salutation")) {
-        salut = vars.get("$global.Salutation");
-    }
-    else
-    {	
-        var list = db.table("select LANGUAGE, SALUTATION, TITLE, HEADLINE, LETTERSALUTATION from SALUTATION" );
-        for ( var i = 0; i < list.length; i++ )	
-        {   
-            salut[list[i][0] + list[i][1] + list[i][2]] = [list[i][3], list[i][4]];
-            salut[list[i][1] + list[i][2]] = [list[i][3], list[i][4]];
-        }
-        vars.set("$global.Salutation", salut);
-    }
-    return salut[pSalutCode];
-}
-
-/*
-* returns country names 
-*
-* @param {String} pCountryCode req countrycode
-*
-* @return {String} translated countryname
-*/
-function _getCountryName(pCountryCode)
-{
-    var countryname = new Object();
-    if ( vars.exists("$global.CountryName")) countryname = vars.get("$global.CountryName");
-    else
-    {	
-        var list = db.table("select ISO2, NAME_NATIVE from AB_COUNTRYINFO" );
-        for (var i=0; i < list.length; i++ )	countryname[list[i][0]] = translate.text(list[i][1]);
-        vars.set("$global.CountryName", countryname);
-    }
-    return countryname[pCountryCode];
-}
-
-/*
-* returns a formatted address
-*
-* @param {String [[]]} pAddrData req Address data 
-* @param {String} pFormat opt given format
-* @param {boolean} pCountry if the country should be displayed
-*
-* @return {String} formatted address
-*/
-function _formatAddrData( pAddrData, pFormat, pCountry )
-{
-    var placeholerInfo = {
-        "street":       {dataPosition: 1},
-        "buildingno":   {dataPosition: 2},
-        "zip":          {dataPosition: 3},
-        "city":         {dataPosition: 4},
-        "district":     {dataPosition: 8},
-        "region":       {dataPosition: 9},
-        "state":        {dataPosition: 10},
-        "firstname":    {dataPosition: 16},
-        "middlename":   {dataPosition: 17},
-        "lastname":     {dataPosition: 18},
-        "saluation":    {dataPosition: 19},
-        "title":        {dataPosition: 20},
-        "suffix":       {dataPosition: 21},
-        "country":      {dataPosition: 25},
-        "organisation name":    {dataPosition: 15},
-        "salutation_name":      {dataPosition: 23},
-        "letter salutation":    {dataPosition: 24}
-    };
-
-    var format = pFormat || pAddrData[26];       
-    format = _mapFormatPlaceholderTitles(format, pAddrData, pCountry);
-    
-    var res = format;    
-    for (var placeholder in placeholerInfo)
-    {
-        var currentAddrData = pAddrData[placeholerInfo[placeholder].dataPosition];
-        if (currentAddrData != undefined)
-        {
-            res = res.replace(new RegExp("{" + placeholder + "}", "g"), currentAddrData);
-            res = res.replace(new RegExp("{" + placeholder.toUpperCase() + "}", "g"), currentAddrData.toUpperCase());
-        }
-    }
-
-    res = res.replace(/^\n/, "");  // CR am Anfang entfernen;
-    res = res.replace(/  /g, " "); // doppelte leerzeichen entfernen
-    res = res.replace(/\\n/ig, "\n");	// newline marker ersetzen
-    res = res.replace(/ *\n */g, "\n");// leerzeichen am ende und Anfang entfernen
-    res = res.replace(/\s(?=\s)/g, "");	// leerzeilen rauswerfen
-    return res;
-}
-
-/*
-* returns the new format 
-*
-* @param {String [[]]} pAddrData req Daten 
-* @param {String} pFormat req the format string
-* @param {boolean} pCountry if the country should be displayed
-*
-* @return {String} new formate
-* 
-N – Name - salutation
-O – Organisation - orgname
-A – Street Address Line(s) - address + buildingno
-D – Dependent locality - district / region
-C – City or Locality - city
-S – Administrative area - state
-Z – Zip or postal code - zip
-X – Sorting code - not available
-*/
-function _mapFormatPlaceholderTitles(pFormat, pAddrData, pCountry) 
-{
-    //gstatic-paceholders
-    pFormat = pFormat.replace(new RegExp("%N", "g"), "{salutation_name}");
-    pFormat = pFormat.replace(new RegExp("%A", "g"), "{address_street buildingno}");  
-    pFormat = pFormat.replace(new RegExp("%C", "g"), "{city}");
-    pFormat = pFormat.replace(new RegExp("%S", "g"), "{state}");
-    pFormat = pFormat.replace(new RegExp("%Z", "g"), "{zip}");
-    pFormat = pFormat.replace(new RegExp("%O", "g"), "{organisation_name}");
-    pFormat = pFormat.replace(new RegExp("%X", "g"), "");   
-    pFormat = pFormat.replace(new RegExp("%n", "g"), "\n");
-    
-    //shortform adito-placeholders
-    pFormat = pFormat.replace(new RegExp("{fn}", "g"), "{firstname}");
-    pFormat = pFormat.replace(new RegExp("{ln}", "g"), "{lpFormattname}");
-    pFormat = pFormat.replace(new RegExp("{ti}", "g"), "{title}");
-    pFormat = pFormat.replace(new RegExp("{sa}", "g"), "{salutation}");
-    
-    if (pAddrData[8] == pAddrData[9])
-        pFormat = pFormat.replace(new RegExp("%D", "g"), "{district}");
-    else
-        pFormat = pFormat.replace(new RegExp("%D", "g"), "{district} \n {region}");   
-    
-    if(pCountry == undefined || pCountry == null || pCountry == true)
-        pFormat = pFormat + "\n {country}";
-    
-    return pFormat;
+import("system.swing");
+import("system.text");
+import("system.db");
+import("system.logging");
+import("system.vars");
+import("system.translate");
+import("Attribute_lib");
+import("Sql_lib");
+import("Util_lib");
+import("DocumentTemplate_lib");
+
+/*
+* Creates a Address Object
+* 
+* @param {String} pRelationID req relationid for which address should be retrieved
+* @param {String} pAddressID opt addressid for which address should be retrieved
+* @param {boolean} pPerson whether the address is from a person, not an organisation
+*  
+* @return {String} the formatted address
+*/
+
+function AddrObject( pRelationID, pPerson, pAddressID )
+{
+    this.Data = fetchAddressData( [ pRelationID ] , [["", "addressformat", ""]], pAddressID, pPerson );
+    this.fmt = this.Data[0][0][26]; 
+	
+    /*
+    * creates a formatted address
+    * 
+    * @param {boolean} pCountry whether the country should be displayed
+    * @param {String} pFormat a fixed format for the address
+    * 
+    * @return {String} formatted address
+    */
+    this.getFormattedAddress = function( pCountry, pFormat )
+    {	
+        return _formatAddrData( _getAddrData(  this.Data[0][0] ), pFormat, pCountry );
+    }
+}
+
+/*
+* creates address data
+* 
+* @param {String} pCondition req SQL-Where-Condition  
+* @param {Object []} pConfig req ( name, functionality, details )
+* @param {String} pSenderID opt UserRelationID
+* @param {String} pAddressID opt addressid
+* 
+* @return {[]}  Daten 
+*/
+function getAddressesData( pCondition, pConfig, pSenderID, pAddressID )
+{ 
+    var returndata = [];
+    var senderconfig = [];
+    var employeeconfig = [];
+    var config = [];
+    for (let i = 0; i < pConfig.length; i++)
+    {
+        switch (pConfig[i].target)
+        {
+            case PlaceholderUtils.targets.EMPLOYEE:
+                employeeconfig.push(pConfig[i]);
+                break;
+            case PlaceholderUtils.targets.SENDER:
+                senderconfig.push(pConfig[i]);
+                break;
+            case PlaceholderUtils.targets.RECIPIENT:
+            default:
+                config.push(pConfig[i]);
+                break;
+        } 
+    }
+    var data = getAddressData(pCondition, config, pAddressID);
+    if (pSenderID == undefined)  pSenderID = vars.get("$global.user").relationid;
+    if (senderconfig.length > 0) 
+        var senderdata = getAddressData([pSenderID], senderconfig);
+    if (employeeconfig.length > 0) 
+        var employeedata = getAddressData([vars.get("$global.user").relationid], employeeconfig);
+    if (data.length > 0 && (senderconfig.length > 0 || employeeconfig.length > 0))
+    { 
+        var ze = data[0];
+        if (employeeconfig.length > 0) ze = ze.concat(employeedata[0]);
+        if (senderconfig.length > 0) ze = ze.concat(senderdata[0]); 
+        returndata.push(ze);
+        for (let i = 1; i < data.length; i++)
+        {
+            ze = data[i];
+            if (employeeconfig.length > 0) ze = ze.concat(employeedata[1]);
+            if (senderconfig.length > 0) ze = ze.concat(senderdata[1]); 
+            returndata.push(ze);
+        }
+        return returndata;
+    }
+    else return data;
+}
+
+/*
+* creates
+* 
+* @param {String} pCondition req SQL-Where-Condition  
+* @param {Placeholder[]} pConfig req array of placeholders
+* @param {String} AddressID opt addressid
+* 
+* @return {[]}  Daten 
+*/
+function getAddressData( pCondition, pConfig, AddressID )
+{ 
+    return setAddressData( fetchAddressData( pCondition, pConfig, AddressID ) );
+}
+
+/*
+* reads data from the database
+* 
+* @param {String} pCondition req SQL-Where-Condition  
+* @param {Placeholder[]} pConfig req array of placeholders
+* @param {String} AddressID opt addressid
+* @param {boolean} pPerson opt if private person
+* 
+* @return {Array} 2d-Array, structure: [[ data, output, header, addrfields ]]
+*/
+function fetchAddressData( pCondition, pConfig, AddressID, pPerson )
+{ 
+    if ( typeof(pCondition) == "object") pCondition = "CONTACT.CONTACTID in ('" + pCondition.join("','") + "')";
+    if ( pConfig.length > 0 )
+    { 
+        var header = [];
+        var fields = [];
+        var output = [];
+        var pos = 0;
+        var posaddrfields = -1;
+        var functionCalls = [];
+        var addrfields = ["case when CONTACT.PERSON_ID is null then 1 else case when " + SqlMaskingUtils.prototype.trim("CONTACT.ORGANISATION_ID") + " = '0' then 2 else 3 end end", //0
+        "ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.COUNTRY", "ADDRESS.ADDRESSADDITION",  // 1-6
+        "ADDRESS.ADDRIDENTIFIER", "ADDRESS.DISTRICT", "ADDRESS.REGION", "ADDRESS.STATE", "CONTACT.DEPARTMENT", "CONTACT.CONTACTROLE", // 7-12
+        "CONTACT.POSITION", "CONTACT.LETTERSALUTATION", "ORGANISATION.NAME", "PERSON.FIRSTNAME", "PERSON.MIDDLENAME", "PERSON.LASTNAME",  // 13-18
+        "PERSON.SALUTATION", "PERSON.TITLE", "PERSON.TITLESUFFIX", // 19-21
+        "coalesce( CONTACT.LANGUAGE, (select C.LANGUAGE from CONTACT C where C.ORGANISATION_ID = CONTACT.ORGANISATION_ID and PERSON_ID is null))", // 22
+        "''", "''", "''", "(select ADDR_FORMAT from AB_COUNTRYINFO where ISO2 = ADDRESS.COUNTRY)", "ADDRESS.ADDR_TYPE"]; // 23-27
+											
+        for (let i=0; i < pConfig.length; i++ )
+        {
+            switch( pConfig[i].type )
+            {
+                case PlaceholderUtils.types.SQLPART: //sql part
+                    fields.push( pConfig[i].valueDefinition ); //TODO: maybe do vars.resolveVariables
+                    output.push([pos++, pConfig[i].type]);
+                    header.push( pConfig[i].placeholderName );
+                    break;
+                case PlaceholderUtils.types.SQLPARTFUNCTION: // adito SQL functions
+                    fields.push(pConfig[i].valueDefinition.call());
+                    output.push([pos++, pConfig[i].type]);
+                    header.push( pConfig[i].placeholderName );
+                    break;
+                case "afunction": // adito functions
+                    try
+                    {
+                        fields.push( "'" + evalScript("Address_lib.fetchAddressData", vars.resolveVariables(pConfig[i].valueDefinition), {}, ["Attribute_lib", "Sql_lib", "Keyword_lib", "Person_lib"], true).replace(new RegExp("'","g"), "''") + "'" ); 
+                        output.push([pos++, pConfig[i].type]);
+                        header.push( pConfig[i].placeholderName );
+                    }
+                    catch( err )
+                    {                      
+                        logging.log( err )
+                    }
+                    break;
+                case "select": // Subselects
+                    fields.push( "(" + vars.resolveVariables(pConfig[i].valueDefinition) + " )" );
+                    output.push([pos++, pConfig[i].type]);
+                    header.push( pConfig[i].placeholderName );
+                    break;
+                case PlaceholderUtils.types.ADDRESSFORMAT:
+                    if ( posaddrfields == -1 )
+                    {        
+                        var sortfields = ["ORGANISATION.NAME", "PERSON.LASTNAME"];
+                        fields.push( addrfields.join(", ") );
+                        posaddrfields = pos;
+                        pos += addrfields.length;								
+                    }
+                    output.push([posaddrfields, pConfig[i].type, pConfig[i].valueDefinition]);
+                    header.push( pConfig[i].placeholderName );
+                    break;
+                case "resolveIDFunction":
+                    var configJSON = pConfig[i].valueDefinition;
+                    fields.push( configJSON.rowIDField );
+
+                    functionCalls.push([pos,
+                        configJSON.resolveFunction,
+                        configJSON.imports,
+                        configJSON.localVars]);
+                                    
+                    output.push([pos++, pConfig[i].type]);
+                    header.push( pConfig[i].placeholderName );                
+                    break;
+            }
+        }
+        if (!pPerson) {           
+            var sqlstr =  "select " + fields.join(",") 
+            + " from CONTACT join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
+            + " left join PERSON on CONTACT.PERSON_ID = PERSON.PERSONID "
+            + " left join ADDRESS on CONTACT.ADDRESS_ID = ";
+        } else {
+            
+            sqlstr = "select " + fields.join(",")
+            + " from CONTACT join PERSON on CONTACT.PERSON_ID = PERSON.PERSONID "
+            + " left join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
+            + " left join ADDRESS on CONTACT.ADDRESS_ID = ";
+        }
+        
+        if ( AddressID != undefined && AddressID != "" )  sqlstr += "'" + AddressID + "'"; 
+        else sqlstr += "ADDRESS.ADDRESSID";
+        if ( pCondition != "" ) sqlstr += " where " + pCondition;
+        var data = db.table(sqlstr + (sortfields != undefined ? " order by " + sortfields.join(", ") : "" ));
+
+        // loop over all returned datasets
+        for(let j = 0; j < data.length; j++)
+        {
+            // loop over all possible resolveFunction entries
+            for(let k = 0; k < functionCalls.length; k++ )
+            {
+                // get the local variables, which should be present in the function call
+                var localVars = functionCalls[k][3];
+                // add the row id value to the localVars Object so the funtion can gather the data for this dataset
+                localVars.rowIDValue = data[j][ functionCalls[k][0] ];
+                // replace the row id with its base64 string
+                data[j][ functionCalls[k][0] ] = evalScript("Address_lib.fetchAddressData.resolveFunction", 
+                    vars.resolveVariables( functionCalls[k][1]+"()" ), 
+                    localVars, 
+                    functionCalls[k][2], // imports
+                    true);
+            }
+        }
+        
+        if ( data.length == 0 ) 
+        {   
+            logging.log("Address_lib: " +  pCondition, logging.ERROR);
+            data = [[]];
+            for (let i = 0; i < addrfields.length + fields.length; i++ )   data[0].push("Err.");
+        }
+        data = [ data, output, header, addrfields ];
+    }
+    return data;
+}
+
+/*
+* reads data from the database
+* 
+* @param {String [[]]} pData req array of data
+* 
+* @return {String [[]]}  data 
+*/
+function setAddressData( pData )
+{ 
+    var sqlresult = pData[0];
+    var data = [];
+    if ( sqlresult.length > 0 )
+    {
+        var output = pData[1]; 
+        var header = pData[2];
+        var addrfields = pData[3];
+        data.push( header );
+        for ( var i = 0; i < sqlresult.length; i++ )
+        {		
+            var addrdata = [];
+            var row = [];	
+            for ( var z = 0; z < header.length; z++ )
+            {
+                switch( output[z][1] )
+                {
+                    case PlaceholderUtils.types.SQLPART:
+                    case PlaceholderUtils.types.SQLPARTFUNCTION:
+                    case "afunction":
+                    case "resolveIDFunction":
+                    case "select":
+                        row[z] = sqlresult[i][output[z][0]];
+                        break;
+                    case PlaceholderUtils.types.ADDRESSFORMAT:
+                        if (addrdata.length == 0) addrdata = _getAddrData( sqlresult[i].slice(output[z][0], output[z][0] + addrfields.length) );
+                        row[z] = _formatAddrData( addrdata, output[z][2] );
+                        break;
+                }
+            }
+            data.push( row );
+        }
+    }
+    return data;
+}
+/*
+*
+* returns formatted address data
+*
+* @param {String [[]]} pData req data 
+*
+* @return {String [[]]} formatted data
+*/
+function _getAddrData( pData )
+{
+    var lettersalutation = pData[14];
+    var salutation = pData[19];
+    var sformat = "";
+    switch( Number(pData[0]) )
+    {
+        case 1:
+            if ( lettersalutation == "" ) 
+            {
+                sformat = _getSalutation( pData[22] );
+                if ( sformat != undefined && sformat[1] != "" ) lettersalutation = _formatAddrData( pData,  sformat[1] );
+                else lettersalutation = "Sehr geehrte Damen und Herren";
+            }
+            break;
+        case 2:
+            // private -> orgname deleted
+            pData[15] = "";
+        case 3:
+            sformat = _getSalutation( pData[22] + pData[19] + pData[20] );
+            //no language defined
+            if ( sformat == undefined )  sformat = _getSalutation( pData[19] + pData[20] );
+            // no language specific entry in salutation
+            if ( sformat == undefined || sformat[0] == "" || sformat[1] == "" )	sformat = ["{sa} {ti} {fn} {la}", "{sa} {ti} {ln}"];
+            salutation = _formatAddrData( pData,  sformat[0] );
+            // lettersalutation if none existent yet
+            if( lettersalutation == "" ) lettersalutation = _formatAddrData( pData, sformat[1] );
+    }
+
+    pData[23] = salutation;
+    pData[24] = lettersalutation;
+    pData[25] = _getCountryName(pData[5]);
+    return pData;
+}
+
+/*
+* returns a formatted salutation
+* 
+* @param {String} pSalutCode req salutation code
+* 
+* @return {String} translated salutation
+*/
+function _getSalutation( pSalutCode )
+{
+    var salut = new Object();
+    if (vars.exists("$global.Salutation")) {
+        salut = vars.get("$global.Salutation");
+    }
+    else
+    {	
+        var list = db.table("select LANGUAGE, SALUTATION, TITLE, HEADLINE, LETTERSALUTATION from SALUTATION" );
+        for ( var i = 0; i < list.length; i++ )	
+        {   
+            salut[list[i][0] + list[i][1] + list[i][2]] = [list[i][3], list[i][4]];
+            salut[list[i][1] + list[i][2]] = [list[i][3], list[i][4]];
+        }
+        vars.set("$global.Salutation", salut);
+    }
+    return salut[pSalutCode];
+}
+
+/*
+* returns country names 
+*
+* @param {String} pCountryCode req countrycode
+*
+* @return {String} translated countryname
+*/
+function _getCountryName(pCountryCode)
+{
+    var countryname = new Object();
+    if ( vars.exists("$global.CountryName")) countryname = vars.get("$global.CountryName");
+    else
+    {	
+        var list = db.table("select ISO2, NAME_NATIVE from AB_COUNTRYINFO" );
+        for (var i=0; i < list.length; i++ )	countryname[list[i][0]] = translate.text(list[i][1]);
+        vars.set("$global.CountryName", countryname);
+    }
+    return countryname[pCountryCode];
+}
+
+/*
+* returns a formatted address
+*
+* @param {String [[]]} pAddrData req Address data 
+* @param {String} pFormat opt given format
+* @param {boolean} pCountry if the country should be displayed
+*
+* @return {String} formatted address
+*/
+function _formatAddrData( pAddrData, pFormat, pCountry )
+{
+    var placeholerInfo = {
+        "street":       {dataPosition: 1},
+        "buildingno":   {dataPosition: 2},
+        "zip":          {dataPosition: 3},
+        "city":         {dataPosition: 4},
+        "district":     {dataPosition: 8},
+        "region":       {dataPosition: 9},
+        "state":        {dataPosition: 10},
+        "firstname":    {dataPosition: 16},
+        "middlename":   {dataPosition: 17},
+        "lastname":     {dataPosition: 18},
+        "saluation":    {dataPosition: 19},
+        "title":        {dataPosition: 20},
+        "suffix":       {dataPosition: 21},
+        "country":      {dataPosition: 25},
+        "organisation_name":    {dataPosition: 15},
+        "salutation_name":      {dataPosition: 23},
+        "letter_salutation":    {dataPosition: 24}
+    };
+
+    var format = pFormat || pAddrData[26];       
+    format = _mapFormatPlaceholderTitles(format, pAddrData, pCountry);
+    
+    var res = format;    
+    for (var placeholder in placeholerInfo)
+    {
+        var currentAddrData = pAddrData[placeholerInfo[placeholder].dataPosition];
+        if (currentAddrData != undefined)
+        {
+            res = res.replace(new RegExp("{" + placeholder + "}", "g"), currentAddrData);
+            res = res.replace(new RegExp("{" + placeholder.toUpperCase() + "}", "g"), currentAddrData.toUpperCase());
+        }
+    }
+
+    res = res.replace(/^\n/, "");  // CR am Anfang entfernen;
+    res = res.replace(/  /g, " "); // doppelte leerzeichen entfernen
+    res = res.replace(/\\n/ig, "\n");	// newline marker ersetzen
+    res = res.replace(/ *\n */g, "\n");// leerzeichen am ende und Anfang entfernen
+    res = res.replace(/\s(?=\s)/g, "");	// leerzeilen rauswerfen
+    return res;
+}
+
+/*
+* returns the new format 
+*
+* @param {String [[]]} pAddrData req Daten 
+* @param {String} pFormat req the format string
+* @param {boolean} pCountry if the country should be displayed
+*
+* @return {String} new formate
+* 
+N – Name - salutation
+O – Organisation - orgname
+A – Street Address Line(s) - address + buildingno
+D – Dependent locality - district / region
+C – City or Locality - city
+S – Administrative area - state
+Z – Zip or postal code - zip
+X – Sorting code - not available
+*/
+function _mapFormatPlaceholderTitles(pFormat, pAddrData, pCountry) 
+{
+    //gstatic-paceholders
+    pFormat = pFormat.replace(new RegExp("%N", "g"), "{salutation_name}");
+    pFormat = pFormat.replace(new RegExp("%A", "g"), "{street} {buildingno}");  
+    pFormat = pFormat.replace(new RegExp("%C", "g"), "{city}");
+    pFormat = pFormat.replace(new RegExp("%S", "g"), "{state}");
+    pFormat = pFormat.replace(new RegExp("%Z", "g"), "{zip}");
+    pFormat = pFormat.replace(new RegExp("%O", "g"), "{organisation_name}");
+    pFormat = pFormat.replace(new RegExp("%X", "g"), "");   
+    pFormat = pFormat.replace(new RegExp("%n", "g"), "\n");
+    
+    //shortform adito-placeholders
+    pFormat = pFormat.replace(new RegExp("{fn}", "g"), "{firstname}");
+    pFormat = pFormat.replace(new RegExp("{ln}", "g"), "{lastname}");
+    pFormat = pFormat.replace(new RegExp("{ti}", "g"), "{title}");
+    pFormat = pFormat.replace(new RegExp("{sa}", "g"), "{salutation}");
+    
+    if (pAddrData[8] == pAddrData[9])
+        pFormat = pFormat.replace(new RegExp("%D", "g"), "{district}");
+    else
+        pFormat = pFormat.replace(new RegExp("%D", "g"), "{district} \n {region}");   
+    
+    if(pCountry == undefined || pCountry == null || pCountry == true)
+        pFormat = pFormat + "\n {country}";
+    
+    return pFormat;
 }
\ No newline at end of file
diff --git a/process/AttributeRegistry_basic/AttributeRegistry_basic.aod b/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
index d4917ea14ea0bb20d46d5ca2680e75daa034ce5c..a1e5d9cca7f5d5f9af88b8ab24090cd22e622ce9 100644
--- a/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
+++ b/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.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>
+<?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
index a132602bb79bc6490fc19480b8680a7036bc4dff..5d3a2d2ee894e1a690cfae628eea1ddafa00b9bc 100644
--- a/process/AttributeRegistry_basic/process.js
+++ b/process/AttributeRegistry_basic/process.js
@@ -12,4 +12,6 @@ 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
+$AttributeRegistry.deliveryTerm = function(){return "3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb";};
+$AttributeRegistry.targetGroup = function(){return "c7d28377-8cb1-4f92-a9ac-ed08041a782b";};
+$AttributeRegistry.targetGroup$competitior = function(){return "1d30d0ab-6103-4972-84c0-fd23eef15ca1";};
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 0b975f2f6813bdb4f5ce77dd57505edc57819ae5..beb413584f50890b2c3cd2a5ed64df8fb344a87f 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -29,12 +29,12 @@ function AttributeUtil () {}
  */
 AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFilteredAttributeIds, pAttributeCount)
 {
-    if (pObjectType == null)
+    if (pObjectType == null || (pFilteredAttributeIds && pFilteredAttributeIds.length == 0))
         return [];
     
     var attrSql = "select AB_ATTRIBUTEID from AB_ATTRIBUTE"
         + " join AB_ATTRIBUTEUSAGE  on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
-    attrCond = SqlCondition.begin()
+    var attrCond = SqlCondition.begin()
         .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
         .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
         .and("ATTRIBUTE_ACTIVE = 1");
@@ -52,11 +52,11 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
         }
     }
         
-    if (pFilteredAttributeIds != undefined && pFilteredAttributeIds.length > 0)
+    if (pFilteredAttributeIds)
     {
         var filteredIdsCondition = new SqlCondition();
-
-        pFilteredAttributeIds.forEach(function(id) 
+        var filteredIdChildren = AttributeUtil.getAllChildren(pFilteredAttributeIds);
+        pFilteredAttributeIds.concat(filteredIdChildren).forEach(function(id) 
         {
             this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
         }, filteredIdsCondition);
@@ -87,6 +87,8 @@ AttributeUtil.getFullAttributeName = function (pAttributeId, pSimpleName)
     
     if (!pAttributeId)
         return "";
+    if (pSimpleName)
+        return AttributeUtil.getSimpleAttributeName(pAttributeId);
     var attributeNames = [];
     var attribute;
     do {
@@ -108,7 +110,7 @@ AttributeUtil.getFullAttributeName = function (pAttributeId, pSimpleName)
         }
         else
             pAttributeId = "";
-    } while (pAttributeId && !pSimpleName);
+    } while (pAttributeId);
     
     return attributeNames.reverse().join(" / ");
 }
@@ -133,22 +135,24 @@ AttributeUtil.getSimpleAttributeName = function (pAttributeId)
 /**
  * returns the ids of all subordinated attributes of an attribute
  * 
- * @param {String} pAttributeId the id of the attribute
+ * @param {String|Array} pAttributeIds the id(s) of the attribute(s)
  * 
  * @result {String[]} array with the ids of every subordinated attribute
  */
-AttributeUtil.getAllChildren = function (pAttributeId)
+AttributeUtil.getAllChildren = function (pAttributeIds)
 {
     var childIds = [];
-    var attributes= [pAttributeId];
-    while (attributes.length > 0)
+    if (typeof(pAttributeIds) == "string")
+        pAttributeIds = [pAttributeIds];
+        
+    while (pAttributeIds.length > 0)
     {
-        attributes = db.array(db.COLUMN, SqlCondition.begin()
-            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+        pAttributeIds = db.array(db.COLUMN, SqlCondition.begin()
+            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + pAttributeIds.join("','") + "')")
             .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
         );
-        if (attributes.length > 0)
-            childIds = childIds.concat(attributes);
+        if (pAttributeIds.length > 0)
+            childIds = childIds.concat(pAttributeIds);
     }
     return childIds;
 }
diff --git a/process/Classification_lib/Classification_lib.aod b/process/Classification_lib/Classification_lib.aod
index 818373690075bf9196eb6e10c19f9c13ae3bd1fe..45628800c38b7d78a3bdf0105570b3fc0143c03c 100644
--- a/process/Classification_lib/Classification_lib.aod
+++ b/process/Classification_lib/Classification_lib.aod
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.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>
+<?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
index a3b74a2a54fc68a4df123cb29fef178db2f488c3..cb22a4d300ddb1e1f827dbcde5a0c0d04eb1cb3a 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -23,18 +23,15 @@ function ClassificationUtils() {}
 ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
 {
     var score = db.table(SqlCondition.begin()
-            .andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
-            .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.CLASSIFICATIONGROUP, 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.CLASSIFICATIONGROUP order by CLASSIFICATIONTYPE.CLASSIFICATIONGROUP asc"));
-
+                                     .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationType)
+                                     .andPrepareIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pClassificationGroup)
+                                     .buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONGROUP, case when sum(score) is not null then sum(score) else 0 end from CLASSIFICATIONTYPE "
+                                                + db.translateStatement(SqlCondition.begin()
+                                                                                    .andPrepare("CLASSIFICATION.OBJECT_TYPE", pObjectType)
+                                                                                    .andPrepare("CLASSIFICATION.OBJECT_ROWID", pObjectRowid)
+                                                                                    .buildSql("left join CLASSIFICATION on CLASSIFICATIONTYPEID = CLASSIFICATIONTYPE_ID and", "1=2", "", false))
+                                                + "left join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE_ID = CLASSIFICATIONSCOREID", "1=2",
+                                                "group by CLASSIFICATIONGROUP order by CLASSIFICATIONGROUP"))
     var scores = {};
     score.forEach(function(pRow)
     {
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 634c4f89da956bc8051b0099e5f24544b6819e61..4acb61c1fa2ec39af73cbaf26ffa5e7eddf08117 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -23,7 +23,15 @@ function ContextUtils() {}
  */
 ContextUtils.getCurrentContextId = function()
 {
-    return vars.getString("$sys.currentcontextname");
+    var entityName = vars.getString("$sys.currententityname");
+    // TODO: replace with Core-method instead of switch-case!!!
+
+    // TODO: workaround: remove "entity" and add "context". This is a Workaround and has to be changed (see above todo)!
+    return entityName.substr(0, entityName.length-7);
+
+
+    
+   // return vars.getString("$sys.currentcontextname");
 }
 
 /**
diff --git a/process/Country_lib/Country_lib.aod b/process/CountryInfo_lib/CountryInfo_lib.aod
similarity index 78%
rename from process/Country_lib/Country_lib.aod
rename to process/CountryInfo_lib/CountryInfo_lib.aod
index 294e20f8843c7cf1c88e5824f93b1fac4a0af8f3..d078970229a859484e2ed6c577f386f33d404ae5 100644
--- a/process/Country_lib/Country_lib.aod
+++ b/process/CountryInfo_lib/CountryInfo_lib.aod
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
-  <name>Country_lib</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <process>%aditoprj%/process/Country_lib/process.js</process>
-  <variants>
-    <element>LIBRARY</element>
-  </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>CountryInfo_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/CountryInfo_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/Country_lib/process.js b/process/CountryInfo_lib/process.js
similarity index 97%
rename from process/Country_lib/process.js
rename to process/CountryInfo_lib/process.js
index e6d27683051774ad6e0a02ffc138297904d896a3..67f674c97d8e655ddf53b3ecdf639d6a2dbf4892 100644
--- a/process/Country_lib/process.js
+++ b/process/CountryInfo_lib/process.js
@@ -1,30 +1,30 @@
-import("system.db");
-import("system.translate");
-import("Sql_lib");
-
-/**
- * provides functions for miscellaneous interactions with countrydata
- * Do not create an instance of this!
- *
- * @class
- * @static
- */
-function CountryUtils() {}
-
-/**
-* loads the translated latin name of an entry within the countryinfos by a provided ISO2-code
-*
-* @param {String} pIso2 the uppercase ISO2 code whoes latin name shall be retriefed, e.g."DE"
-* @param {String} [pLocale=current client/server language] specifies the locale for translating 
-*
-* @return {String} the translated country name in the latin version
-*
-*/
-CountryUtils.getLatinNameByIso2 = function(pIso2, pLocale)
-{
-    var countryName = db.cell(SqlCondition.begin()
-                                          .andPrepare("AB_COUNTRYINFO.ISO2", pIso2)
-                                          .buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
-    countryName = pLocale ? translate.text(countryName, pLocale) : translate.text(countryName);
-    return countryName;
+import("system.db");
+import("system.translate");
+import("Sql_lib");
+
+/**
+ * provides functions for miscellaneous interactions with countrydata
+ * Do not create an instance of this!
+ *
+ * @class
+ * @static
+ */
+function CountryUtils() {}
+
+/**
+* loads the translated latin name of an entry within the countryinfos by a provided ISO2-code
+*
+* @param {String} pIso2 the uppercase ISO2 code whoes latin name shall be retriefed, e.g."DE"
+* @param {String} [pLocale=current client/server language] specifies the locale for translating 
+*
+* @return {String} the translated country name in the latin version
+*
+*/
+CountryUtils.getLatinNameByIso2 = function(pIso2, pLocale)
+{
+    var countryName = db.cell(SqlCondition.begin()
+                                          .andPrepare("AB_COUNTRYINFO.ISO2", pIso2)
+                                          .buildSql("select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO"));
+    countryName = pLocale ? translate.text(countryName, pLocale) : translate.text(countryName);
+    return countryName;
 };
\ No newline at end of file
diff --git a/process/DataCaching_lib/process.js b/process/DataCaching_lib/process.js
index 715ad6e2fdd22ab0b8fa410f3f035d8bfdc51f3d..b154d8f222b03fe30815c11695c22885c1ae9896 100644
--- a/process/DataCaching_lib/process.js
+++ b/process/DataCaching_lib/process.js
@@ -1,11 +1,24 @@
 import("system.vars");
+import("system.project");
 
-
+/**
+ * object for caching data if possible on the targetsystem
+ * currently caching is only available within the client-context-side and not on the servers side
+ * 
+ * on client side it's done with the helb of a $global.***-variable
+ * 
+ * @class 
+ * 
+ * @param {String} pIdentifiyingName name to identify the DataCache. This MUST be unique for one data representation (e.g. key-value pair for all Languages with key ISO2-code and value the ISO3-Code). this will affect the storage-name (=name of the global variable on the client for example)
+ * @param {bool} [pKeepPerLanguage=false] if true the data is kept per locale (different storing for each requested language), false when not (every language is sharin the same stoarge because only untranslated data is kept)
+ * @param {String} [pLocaleOverride=current language] sometimes a special locale is required, use this parameter to specify it
+ * 
+ */
 function CachedData(pIdentifiyingName, pKeepPerLanguage, pLocaleOverride)
 {
     this.identifyingName = pIdentifiyingName;
-    this.keepPerLanguage = pKeepPerLanguage;
-    
+    this.keepPerLanguage = (pKeepPerLanguage == true);
+
     this.runningOnServer = vars.getString("$sys.isserver") == "true";
     if (pLocaleOverride)
         this.locale = pLocaleOverride;
@@ -15,15 +28,53 @@ function CachedData(pIdentifiyingName, pKeepPerLanguage, pLocaleOverride)
         this.locale = (this.keepPerLanguage ? vars.get("$sys.clientlocale") : "_anyLanguage_");
 }
 
+/**
+ * creates a new instance of CachedData and then loads data into that CachedData
+ * 
+ * @param {String} pIdentifiyingName name to identify the DataCache. This MUST be unique for one data representation (e.g. key-value pair for all Languages with key ISO2-code and value the ISO3-Code). this will affect the storage-name (=name of the global variable on the client for example)
+ * @param {bool} [pKeepPerLanguage=false] if true the data is kept per locale (different storing for each requested language), false when not (every language is sharin the same stoarge because only untranslated data is kept)
+ * @param {String} [pLocaleOverride=current language] sometimes a special locale is required, use this parameter to specify it
+ * @param {Function} pDataCallbackFunction function that is called to load the data. this functions gets 2 params: 1. if the data has to be translated 2. the locale to translate
+ * 
+ * @return {Object} returns the data you wanted (of the pDataCallbackFunction)
+ * 
+ * @static
+ */
 CachedData.make = function(pIdentifiyingName, pKeepPerLanguage, pDataCallbackFunction)
 {
     return (new CachedData(pIdentifiyingName, pKeepPerLanguage, null)).load(pDataCallbackFunction);
 }
 
+/**
+ * loads data into a DataCache;
+ * You can decide which data shall be loaded via the callback-function
+ * if data is already loaded an error is thrown
+ * 
+ * @param {Function} pDataCallbackFunction function that is called to load the data. this functions gets 2 params: 
+ *                                          1. if the data has to be translated 
+ *                                          2. the locale to translate
+ *                                          If the function returns null, the Cache is unloaded instead
+ * 
+ * @return {Object} returns the data you wanted (of the pDataCallbackFunction)
+ * 
+ */
 CachedData.prototype.load = function(pDataCallbackFunction)
 {
+    var cachingEnabled = true;
+    
     //currently it's not possible to cache the data within the serer-context, so instead the Data-function is called everytime 
     if (this.runningOnServer)
+        cachingEnabled = false;
+    else 
+    {
+        try 
+        {
+            if (JSON.parse(project.getInstanceConfigValue("custom.dataCaching.client.forceDisable")) == true)
+                cachingEnabled = false;
+        } catch (ex) {/* ignore */}
+    }
+
+    if (!cachingEnabled)
         return pDataCallbackFunction.call(this, this.keepPerLanguage, this.locale);
     else
     {
@@ -38,20 +89,37 @@ CachedData.prototype.load = function(pDataCallbackFunction)
         
         data = pDataCallbackFunction.call(this, this.keepPerLanguage, this.locale);
         if (data == null)
-            throw new Error("use unload instead");
+        {
+            this.unload();
+            return null;
+        }
         vars.set(varname, data);
         this._register();
         return data;
     }
 };
 
+/**
+ * unloads data from the DataCache so it can be loaded again into the DataCache
+ *  
+ * @return returns always as much as Jon Snow knows: nothin' (null)
+ */
 CachedData.prototype.unload = function()
 {
+    //currently it's not possible to cache the data within the serer-context, so basically everything is always in an unloaded state
+    if (this.runningOnServer)
+        return null;
+    
     var varname = this.getVariableName();
     vars.set(varname, null);
     this._unregister();
+    return null;
 }
 
+/**
+ * builds the variable-name and returns it
+ * @return {String} name of the variable where the data is stored
+ */
 CachedData.prototype.getVariableIdentifier = function()
 {
     //keep data per user in a global var to assure that translations and grants are correctly applied
@@ -60,26 +128,25 @@ CachedData.prototype.getVariableIdentifier = function()
     return res;
 };
 
+/**
+ * determines the value of a data-storage-variable
+ * @return {Object} value of the data storage
+ */
 CachedData.prototype.getVariableName = function()
 {
     var res = this.getVariableIdentifier() + "." + this.locale;
     return res;
 };
 
-//functions for registry of variables; reserver for later functionality
+//functions for registry of variables; reserved for later functionality in the future
 CachedData.prototype._register = function(){};
 CachedData.prototype._unregister = function(){};
 
+/**
+ * reserved for future; this function is not used currently
+ * @return {String} name of the DataCache-Variable-Registry
+ */
 CachedData.getRegistryName = function()
 {
     return "$global.CachedDataRegistry";
-};
-
-CachedData.getRegistry = function()
-{
-    var registryVarname = CachedData.getRegistryName();
-    if (vars.exists(registryVarname))
-        return vars.get(registryVarname);
-    else
-        return [];
 };
\ No newline at end of file
diff --git a/process/DocumentTemplate_lib/DocumentTemplate_lib.aod b/process/DocumentTemplate_lib/DocumentTemplate_lib.aod
index 82d25994946ab514e179795cb31ed67c2dc3e914..9f4fede55f117c4fea142e84087e26eb4bd91be1 100644
--- a/process/DocumentTemplate_lib/DocumentTemplate_lib.aod
+++ b/process/DocumentTemplate_lib/DocumentTemplate_lib.aod
@@ -3,4 +3,7 @@
   <name>DocumentTemplate_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <process>%aditoprj%/process/DocumentTemplate_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
 </process>
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index e92069a69a6a11d3a1cf14fb7e579e3dea1b07d7..209f427347d35b9dc4a7f6185953ef17cf8103fc 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -1,488 +1,295 @@
+import("Employee_lib");
+import("KeywordRegistry_basic");
+import("Document_lib");
+import("KeywordData_lib");
+import("Sql_lib");
 import("Address_lib");
 import("system.process");
 import("system.vars");
 import("system.db");
-import("system.swing");
 import("system.util");
 import("system.pack");
 import("system.fileIO");
 import("system.translate");
-import("system.question");
 import("system.datetime");
-import("system.logging");
 import("system.text");
-import("system.eMath");
 import("system.mail");
-
+import("Keyword_lib");
 
 /**
- * Provides functions for document templates
+ * Object for working with document templates
  */
-function DocumentTemplateUtils () {}
-
-
-
-
-/*
-* Liefert ausgewählte DocumentID zurück
-*
-* @param {Integer []} pType req DocumentenTypes
-* @param {String} pLanguage opt Sprache
-* @param {String} pTemplateName opt Name der Vorlage
-* @param {Boolean} pOnlyHTML opt default: false; sollen nur Vorlagen zur Auswahl stehen, die nach der neuen Vorlagen-Methode einen HTML Text hinterlegt haben
-*
-* @return {Obj} { id, name, language, attachments:[[Name, Data]], template:{filename, data},
-*                 exportoption:{fieldids, open, file, fieldseperator, fieldlimit, recordseperator} };
-*       oder {Boolean:false} wenn keine Vorlage vorhanden ist oder ausgewählt wurde
-*/
-DocumentTemplateUtils.chooseTemplate = function (pType, pLanguage, pTemplateName, pOnlyHTML)
+function DocumentTemplate (pTemplateContent, pType)
 {
-    var langcondition = "";
-    var templatelist;
-    var templatename = ""
-    var condition = "AOTYPE in (" + pType.join(", ") + ")";
-    if ( pLanguage != undefined && pLanguage != "" )
-    {
-        langcondition = " and LANG = " + pLanguage;
-    }
-    if ( pTemplateName != undefined && pTemplateName != "" )
-    {
-        condition += " and NAME like '" + pTemplateName + "%'";
-    }
-    // die zum Frame gehörigen und die Vorlagen ohne Zugehörigkeit anzuzeigen
-    if ( vars.exists("$image.Frame") )
-    {
-        var fd = new FrameData();
-        var frame = fd.getData("id", vars.get("$image.Frame").Id, ["name"]);
-        condition += 	" and ( DOCUMENTID in (select ROW_ID from ATTRLINK join ATTR on ATTRID = VALUE_ID and OBJECT_ID = 9 and ATTRNAME = '" + frame + "')"
-        + " or DOCUMENTID not in (select ROW_ID from ATTRLINK join ATTR on ATTRID = ATTRLINK.ATTR_ID and OBJECT_ID = 9 and  ATTRNAME = 'Doku Vorlagen Verwendung')) ";
-    }
-    condition = getGrantCondition( "DOCUMENT", condition);
-    templatelist = db.array(db.COLUMN, "select NAME from DOCUMENT where " + (pOnlyHTML != undefined && pOnlyHTML == true ? " HTMLTEXT is not null and " : "") + condition + langcondition + " order by NAME");
-     var questionText = "";
-    if ( templatelist[0] == undefined || pLanguage == "" ) // keine passende Sprache beim Kontakt hinterlegt
-    {
-        // Benutzer wählt sich jetzt seine gewünschte Sprache aus...
-        questionText = translate.text("Keine Vorlage in der gewünschten Sprache gefunden.\nBitte eine Sprache auswählen.");
-        var availableLangs =  db.array(db.COLUMN, "select distinct(keyname1) from keyword join document on document.lang = keyword.keyvalue where" + getKeyTypeSQL("SPRACHE"));
-        if(vars.get("$sys.scope") == "vaadin")
-        {
-            // Liest die verfügbaren Sprachen aus, die in den Dokumenten vorhanden sind, und zwar ausgeschrieben
-            availableLangs = db.table("select distinct(keyname1), keyname1 from keyword join document on document.lang = keyword.keyvalue where" + getKeyTypeSQL("SPRACHE"));
-            //@TODO evtl noch ein Label in den Dialog zur Textanzeige?
-            pLanguage = openCMBDialog( questionText, availableLangs).cmb_Data;
-        }
-        else
-        {
-            pLanguage = swing.askQuestion(questionText, swing.QUESTION_COMBOBOX, "|" + availableLangs.join("|"));
-        }
-        if (pLanguage == null ) return false;
-        // ...und JDito setzt die ausgeschriebene Sprache wieder in das Keyword um, z.B. 'de'
-        pLanguage = db.cell("select distinct(lang) from document join keyword on keyword.keyname1 = '" + pLanguage + "' and keyword.keyvalue = document.lang where" + getKeyTypeSQL("SPRACHE"));
-        langcondition = " and LANG = " + pLanguage;
-
-        templatelist = db.array(db.COLUMN, "select NAME from DOCUMENT where " + condition + langcondition + " order by NAME");
-    }
+    this.content = pTemplateContent;
+    this.type = pType;
+}
 
-    if (templatelist.length > 1)
-    {
-        questionText = translate.text("Vorlage wählen");
-        if(vars.get("$sys.scope") == "vaadin")
-        {
-            templatelistChoose = db.table("select NAME, NAME from DOCUMENT where "
-                + (pOnlyHTML != undefined && pOnlyHTML == true ? " HTMLTEXT is not null and " : "")
-                + condition + langcondition + " order by NAME");
-            templatename =  openCMBDialog(questionText, templatelistChoose).cmb_Data;
-        }
-        else
-        {
-            templatename = swing.askQuestion(questionText, swing.QUESTION_COMBOBOX, "|" + templatelist.join("|"));
-        }
-        if (templatename == null)return false;
-    }
-    else templatename = templatelist[0];
-                                       // 0     1      2         3            4             5            6             7              8               9               10          11
-    var data = db.array(db.ROW, "select NAME, LANG, HTMLTEXT, FIELDIDS, OPENWITHEXPORT, EXPORTFILE, FIELDSEPERATOR, FIELDLIMIT, RECORDSEPERATOR, DOCUMENTID, MODULEEXPORTQUERY, AOTYPE "
-        + " from DOCUMENT where NAME = '" + templatename + "' and " + condition + langcondition);
+/**
+ * The types a DocumentTemplate can have. Depending on the type,
+ * the correct method for replacing the placeholders can be chosen
+ */
+DocumentTemplate.types = {
+    TXT : "TXT",
+    HTML : "HTML",
+    EML : "EML",
+    ODT : "ODT",
+    DOCX : "DOCX"
+};
 
-    if (data.length > 0)
-    {   
-        // if type is 7, it uses exportfields. They use the table DOCUMENTLINK and not the column FIELDIDS
-        if (data[11] == 7)
-        {
-            data[3] = getLinkedKeywords(data[9]);
-        }
-        
-        var template = false;
-        // get metadata for attachments
-        var metadata = db.getBinaryMetadata("DOCUMENT", "Vorlage", data[9], false, null);
-        var attachments = [];
-        // fill rows of [ filname, bindata ] into the array
-        for( var i = 0; i < metadata.length; i++ )
-        {
-            attachments.push( [ metadata[i].filename, db.getBinaryContent(metadata[i].id, null) ] );
-        }
-        
-        if ( data[2] != "" )  // Vorlage aus HTML-Text
-        {
-            template =
-            {
-                data:data[2]
-            };
-        }
-        else if ( attachments.length > 0 )   // Vorlage aus Anhang
-        {
-            template =
-            {
-                filename: attachments[0][0],
-                data: attachments[0][1]
-            };
-            //do not add the documents text to the attachments
-            attachments = attachments.filter(function (row){
-                //use filename and the b64-date because the user is able to control whether the message-text should be in the attachments or not,
-                //by simply adding the message-text in another document
-                return row[0] + "/" + row[1] != template.filename + "/" + template.data;
-            });
-        }
-        var exportoption = {
-            fieldids:data[3],
-            open:data[4],
-            file:data[5],
-            fieldseperator:data[6],
-            fieldlimit:data[7],
-            recordseperator: data[8],
-            exportquery: data[10]
-        };
-        return {
-            id:data[9],
-            aotype:data[11],
-            name:data[0],
-            language:data[1],
-            template:template,
-            attachments:attachments,
-            exportoption:exportoption
-        };
-    }
-    else return false;
+DocumentTemplate.loadTemplate = function (pTemplateId)
+{
+    var alias = "_____SYSTEMALIAS";
+    var templateDocument = db.getBinaryMetadata("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, false, alias, null);
+    if (!templateDocument[0])
+        return null;
+    var binaryId = templateDocument[0][db.BINARY_ID];
+    var type = DocumentUtil.getFileExtensionFromUpload(templateDocument[0][db.BINARY_FILENAME]);
+    var typeMap = {
+        txt : DocumentTemplate.types.TXT,
+        html : DocumentTemplate.types.HTML,
+        eml : DocumentTemplate.types.EML,
+        odt : DocumentTemplate.types.ODT,
+        docx : DocumentTemplate.types.DOCX
+    };
+    type = typeMap[type]; //choose the document type depending on the file extension
+    if (binaryId)
+        return new DocumentTemplate(util.decodeBase64String(db.getBinaryContent(binaryId, alias)), type);
+    return null;
 }
 
-/*
-* ersetzt die Platzhalter in ODT-Datei
-*
-* @param {String} pCondition req Condition
-* @param {String} pODTFile req Filename des odt-Datei
-* @param {String} pAddressID opt ID von der die Adressdaten geholt werden
-* @param {[]} pAdditionalData opt zusätzliche Daten
-*
-* pAdditionalData =  {Fields: ["RELID", "Platzhalter1","Platzhalter2"],
-*                     SQLStr: "select RELATION_ID, ADDR, MEDIUM_ID from COMM",
-*     statt SQLStr    Data: [[]],
-*		      ID: "RELATION_ID" };
-*
-* @param {[]} pTableData opt Tabellendaten
-*
-* pTableData = [{  Table: "ADDR",
-*                  Fields: ["RELID", "Type","Strasse","PLZ","Ort","Staat","Land"],
-*                  SQLStr: "select RELATION_ID, ADDR_TYPE, " + concat(["ADDRESS", "BUILDINGNO"]) + ", ZIP, CITY, STATE, NAME_DE from ADDRESS join COUNTRYINFO on COUNTRY = ISO2",
-*     statt SQLStr Data: [[]],
-*     optional     SQLOrder: "STATE, ZIP",
-*                  ID: "RELATION_ID" }];
-*
-* @return {void}
-*/
-DocumentTemplateUtils.replaceODTFile = function ( pCondition, pODTFile, pAddressID, pAdditionalData, pTableData )
+DocumentTemplate.prototype.toString = function ()
 {
-    var i;
-    var textS;
-    var ti;
-    var z;
-    if ( pTableData == undefined ) pTableData = [];
-    if ( pAdditionalData == undefined ) pAdditionalData = {};
-    // Configuration für die Platzhalter
-    var config = [["RELATIONID","fieldname","RELATION.RELATIONID"]]
-    config = config.concat( db.table("select KEYNAME1, KEYNAME2, KEYDETAIL from KEYWORD where " + getKeyTypeSQL("EXPORTFIELDS")));
-    var senderRelId = getSendRelID();
-    if (senderRelId == null)
-        return false;
-    var addrdata = getAddressesData( pCondition, config, senderRelId, pAddressID );
-    if ( addrdata.length > 1 )
-    {
-        var relationids = [];
-        for (i=1; i < addrdata.length; i++ )	relationids.push(addrdata[i][0]);
-        // pTableData aufbereiten
-        for (ti = 0; ti < pTableData.length; ti++)
-        {
-            if( pTableData[ti].SQLStr != undefined )
-            {
-                if ( pTableData[ti].ID != undefined ) pTableData[ti].SQLStr += " where " + pTableData[ti].ID + " in ('" + relationids.join("','") + "')";
-                if ( pTableData[ti].SQLOrder != undefined ) pTableData[ti].SQLStr += " order by " + pTableData[ti].SQLOrder;
-                pTableData[ti].Data = db.table(pTableData[ti].SQLStr );
-            }
-            pTableData[ti].TableData =  [];
-            for (i=0; i < pTableData[ti].Data.length; i++ )
-            {
-                if ( pTableData[ti].TableData[pTableData[ti].Data[i][0]] == undefined )  pTableData[ti].TableData[pTableData[ti].Data[i][0]] = [];
-                pTableData[ti].TableData[pTableData[ti].Data[i][0]].push( pTableData[ti].Data[i] );
-            }
-        }
-        // pAdditionalData aufbereiten
-        if ( pAdditionalData.SQLStr != undefined )
-        {
-            if ( pAdditionalData.ID != undefined ) pAdditionalData.SQLStr += " where " + pAdditionalData.ID + " in ('" + relationids.join("','") + "')";
-            pAdditionalData.Data = db.table( pAdditionalData.SQLStr );
-        }
-        pAdditionalData.AddData =  [];
-        if ( pAdditionalData.Data != undefined )
-            for (i=0; i < pAdditionalData.Data.length; i++ )	pAdditionalData.AddData[pAdditionalData.Data[i][0]] = pAdditionalData.Data[i];
-
-        // ersetzen Platzhalter in content.xml
-
-        textS = util.decodeBase64String(pack.getFromZip(pODTFile, "content.xml"));
-        var bodybegin = textS.indexOf("<office:body>");
-        var bodyend =  textS.indexOf("</office:body>") + 14;
-        var body = textS.substring( bodybegin, bodyend );
-        var lastbody = textS.substr( bodyend );
-        textS = textS.substring( 0, bodybegin );
-        for (i = 1; i < addrdata.length; i++)
-        {
-            var bulkbody = body;
-            for (z = 0; z < addrdata[0].length; z++)
-            {
-                bulkbody = bulkbody.replace( new RegExp( getDefaultODTplaceholer(addrdata[0][z]), "ig"),
-                    addrdata[i][z].replace( new RegExp( "\n", "ig"), "<text:line-break/>").replace( new RegExp( "&", "ig"), "&amp;") );
-            }
-            if ( pAdditionalData.AddData[addrdata[i][0]] != undefined )
-            {
-                bulkbody = relaceAdditionValues( bulkbody, pAdditionalData.Fields, pAdditionalData.AddData[addrdata[i][0]], "" );
-            }
-            // Tabellen füllen
-            for (ti = 0; ti < pTableData.length; ti++)
-            {
-                var tablepos = bulkbody.indexOf( getDefaultODTplaceholer(pTableData[ti].Table, true));
-                if ( tablepos != -1 )
-                {
-                    var tablebegin = bulkbody.lastIndexOf("<table:table-row", tablepos);
-                    var tableend =  bulkbody.indexOf("</table:table-row>", tablepos ) + 18;
-                    var lasttable =  bulkbody.substr( tableend );
-                    var tablerow = bulkbody.substring( tablebegin, tableend );
-                    bulkbody = bulkbody.substring( 0, tablebegin );
-                    var tabledata = pTableData[ti].TableData[addrdata[i][0]];
-                    if ( tabledata != undefined )
-                    {
-                        for (var tz = 0; tz < tabledata.length; tz++)
-                        {
-                            var table = tablerow;
-                            bulkbody += relaceAdditionValues( table, pTableData[ti].Fields, tabledata[tz], pTableData[ti].Table + "." );
-                        }
-                    }
-                    bulkbody += lasttable;
-                }
-            }
-            textS += bulkbody;
-        }
-        textS +=  lastbody;
-        pack.addToZip(pODTFile, "content.xml", util.encodeBase64String(textS))
-        // ersetzen Platzhalter in styles.xml
-        var styles = util.decodeBase64String(pack.getFromZip(pODTFile, "styles.xml"));
-        for (z = 0; z < addrdata[0].length; z++)
-        {
-            styles = styles.replace( new RegExp( getDefaultODTplaceholer(addrdata[0][z]), "ig"),
-                addrdata[1][z].replace( new RegExp( "\n", "ig"), "<text:line-break/>").replace( new RegExp( "&", "ig"), "&amp;") );
-        }
-        if ( pAdditionalData.AddData[addrdata[1][0]] != undefined )
-        {
-            styles = relaceAdditionValues( styles, pAdditionalData.Fields, pAdditionalData.AddData[addrdata[1][0]], "" );
-        }
-        pack.addToZip(pODTFile, "styles.xml", util.encodeBase64String(styles));
-        return true;
-    }
-    return false;
+    return this.content;
+}
 
-    function relaceAdditionValues( pText, pFields, pValues, pTable )
+/**
+ * returns the template content with replaced placeholders
+ * 
+ * @param {Object} pReplacements map, the structure is {placeholder : value}
+ */
+DocumentTemplate.prototype.getReplacedContent = function (pReplacements)
+{
+    switch (this.type)
     {
-        for (var sp = 0; sp < pFields.length; sp++)
-        {
-            var ph = pFields[sp];
-            var value = pValues[sp].toString();
-            if ( typeof( ph ) == "object")
-            {
-                ph = pFields[sp][0];
-                if ( value != "" )
-                    switch( pFields[sp][1] )  // Formatierung
-                    {
-                        case "date":
-                            value = datetime.toDate(value, pFields[sp][2]);
-                            break;
-                        case "long":
-                            value = text.formatLong(value, pFields[sp][2]);
-                            break;
-                        case "double":
-                            value = text.formatDouble(value, translate.text(pFields[sp][2]), true);
-                            break;
-                    }
-            }
-            pText = pText.replace( new RegExp(getDefaultODTplaceholer(pTable + ph) , "ig"),
-                value.replace( new RegExp( "\n", "ig"), "<text:line-break/>").replace( new RegExp( "&", "ig"), "&amp;") );
-        }
-        return pText;
+        case DocumentTemplate.types.HTML:
+            for (let i in pReplacements)
+                pReplacements[i] = text.replaceAll(pReplacements[i], {"\n" : "<br>"});
+        case DocumentTemplate.types.TXT:
+            return text.replaceAll(this.content, pReplacements);
+        case DocumentTemplate.types.EML:
+            return this._getReplacedEML(pReplacements);
+        case DocumentTemplate.types.ODT:
+            return this._getReplacedODT(pReplacements);
+        case DocumentTemplate.types.DOCX:
+            return this._getReplacedDOCX(pReplacements);
+        default:
+            return null;
     }
 }
 
-/*
-* Liefert Vorlage mit ersetzen Platzhalter durch den jeweiligen Text.
-*
-* @param {String} pContactId req RELATIONID der relation, von der die Adressdaten geholt werden - SQL where condition für getAddressesData()
-* @param {Integer[]} pDocuType req OATYPE der Vorlage
-* @param {String} pLanguage opt Sprache
-* @param {String} pAddressID opt pAddressID
-* @param {String} pSenderID opt UserRelationID
-* @param {String} pTemplateName opt Name der Vorlage
-* @param {[]} pAdditionalValues opt Weitere Platzhalter mit Werten
-*
-* @return {Obj} { id, name, language, attachments:[[Name, Data]], template:{filename, data},
-*                 exportoption:{fieldids, open, file, fieldseperator, fieldlimit, recordseperator} }
-*       oder {Boolean:false} wenn keine Vorlage vorhanden ist oder ausgewählt wurde
-*/
-DocumentTemplateUtils.getTextTemplate = function ( pContactId, pDocuType, pLanguage, pAddressID, pSenderID, pTemplateName, pAdditionalValues )
+DocumentTemplate.prototype.getReplacedContentByContactId = function (pContactId)
 {
-    var value = "";
-    var document = chooseTemplate( pDocuType, pLanguage, pTemplateName );
-    if ( !document )  return false;
-
-    if ( pAdditionalValues == undefined )  pAdditionalValues = "";
-    var html = document.template.data.substr(0, 6) == "<html>"
-    if ( document.template.filename != undefined )
-        document.template.data = decode64(document.template.data);
-
-    // Configuration für die Platzhalter
-    var config = db.table("select KEYNAME1, KEYNAME2, KEYDETAIL from KEYWORD where " + getKeyTypeSQL("EXPORTFIELDS"));
-    var addrdata = getAddressesData( [pContactId], config, pSenderID, pAddressID );
-    for (var i = 0; i < addrdata[0].length; i++)
-    {
-        if (html) value = addrdata[1][i].replace( new RegExp( "\n", "ig"), "<br>" );
-        else 	value = addrdata[1][i];
-        document.template.data = document.template.data.replace( new RegExp( "@@" + addrdata[0][i], "ig"), value );
-    }
-    for (i = 0; i < pAdditionalValues.length; i++)
+    var config = PlaceholderUtils.getPlaceholders();
+    var addressData = getAddressesData([pContactId], config, EmployeeUtils.getCurrentContactId()); //TODO: add sender selection
+    var replacements = {};
+    for (let i = 0, l = addressData[0].length; i < l; i++)
     {
-        document.template.data = document.template.data.replace( new RegExp( "@@" + pAdditionalValues[i][0], "ig"), pAdditionalValues[i][1] );
+        replacements[addressData[0][i]] = addressData[1][i];
     }
-    return document;
+    return this.getReplacedContent(replacements);
 }
 
-
-
-/*
- * transforms a given placeholerformat into the ODT-placeholer thats in the ODT
- * if you have to change this (e.g. to @@) you can do this at this 1 position
- *
- * @param {String} pPlaceholderName req name of the placeholer, e.g. "Anrede"
- * @param {bool} pOnlyStart opt if set to true only the leading-symbols are added
- *
- * @return {String} placeholder with placeholder-symbols, e.g. "{@Anrede@}"
- */
-DocumentTemplateUtils.getDefaultODTplaceholer = function (pPlaceholderName, pOnlyStart)
+DocumentTemplate.prototype._getReplacedEML = function (pReplacements)
 {
-    if (pOnlyStart)
-        return "{@" + pPlaceholderName;
-    return "{@" + pPlaceholderName + "@}";
+    var email = mail.parseRFC(this.content);
+    
 }
 
+
 /*
  * replaces a given Odt-File on the server and returns the replaced base64-file
  *
- * @param {String} pTemplateData req base64-encoded input file with placeholders
- * @param {String} pTemplateName req name of the input file
  * @param {String|String[]} pAddrDataCondition req a SQL-Condition or an Array of Relation-Ids for reducing the default-placeholders
  * @param {String} pAddressID opt if you want to use the standard address you can pass undefined, otherwise you need to specify a Address-Id
- * @param {Object} pAdditionalData opt additional placeholders with data (e.g. offercode); for format check the example
- * @param {Object[]} pTableData opt data for odt-tables; for format check the example
  *
  * @return {String} base64-encoded replaced file
- *
- * @example
- * //examples for additionalData:
- * //2 Methods: 1) SQL 2) Array - no matter what you're using: the first column has to be the RELATIONID-Value
- * //1) you can use a SQL-Statement for passing Data
- * additionalData = {
- * 	 Fields: ["RELID", "myPlaceholder 1","myPlaceholder N"]
- * 	,SQLStr: "select RELATION_ID, ADDR, MEDIUM_ID from COMM"
- * };
- * //if you pass the (optional) property "ID" a condition with ID in <<relationids>> is added to the SQL-Data-query:
- * additionalData.ID = "COMM.RELATION_ID";
- *
- *
- * //2) another option is to pass data as a 2D-Array like this
- * additionalData = {
- * 	 Fields: ["RELID", "myPlaceholder 1","myPlaceholder N"]
- * 	,Data: [
- * 		 ["myRelIdValue 1", "my Value 1", "my Value N"]
- * 		,["myRelIdValue M", "my other Value 1", "my other Value N"]
- * 	]
- * };
- *
- *
- * //examples for tableData:
- * //you can define multible data-sources
- * tableData =  [];
- * //2 Methods: 1) SQL 2) Array - no matter what you're using: the first column has to be the RELATIONID-Value
- * //the placeholder can be accessed by <<Table>>.<<Field>>
- * //1) if you use a SQL-Statement for defining the data you've got some optional properties
- * var sqlSource = {
- * 	 Table: "ADDR"
- * 	,Fields: ["RELID", "Type", "Strasse", "PLZ", "Ort", "Staat", "Land"],
- * 	,SQLStr: "select RELATION_ID, ADDR_TYPE, " + concat(["ADDRESS", "BUILDINGNO"]) + ", ZIP, CITY, STATE, NAME_DE from ADDRESS join COUNTRYINFO on COUNTRY = ISO2"
- * };
- * //if you pass the (optional) property "ID" a condition with ID in <<relationids>> is added to the SQL-Data-query:
- * sqlSource.ID = "ADDRESS.RELATION_ID";
- *
- * //if you pass the (optional) property "SQLOrder" an order-by clause is added
- * sqlSource.SQLOrder = "ADDRESS.ADDR_TYPE asc, ADDRESS.ZIP desc";
- *
- * tableData.push(sqlSource);
- *
- * //2) pass data as an Array like this
- * var arraySource = {
- * 	 Table: "myTablePrefix"
- * 	,Fields: ["RELID", "myPlaceholder 1","myPlaceholder N"]
- * 	,Data: [
- * 		 ["myRelIdValue 1", "my Value 1", "my Value N"]
- * 		,["myRelIdValue M", "my other Value 1", "my other Value N"]
- * 	]
- * }
- * tableData.push(arraySource);
- *
  */
-DocumentTemplateUtils.getReplacedODT = function (pTemplateData, pTemplateName, pAddrDataCondition, pAddressID, pAdditionalData, pTableData)
+DocumentTemplate.prototype._getReplacedODT = function (pAddrDataCondition, pAddressID)
 {
-    //save the file on the server, replace it on the server file system, then load it because that works for neon and swing
+    //save the file on the server so it can be unzipped via pack.getFromZip
     var serverFilePath = vars.get("$sys.servertemp") + "/clientid_" + vars.get("$sys.clientid")
-        + "/" + util.getNewUUID() + "/" + pTemplateName.replace(/\\/g, "/");
+        + "/" + util.getNewUUID();
 
-    fileIO.storeData(serverFilePath, pTemplateData, util.DATA_BINARY, false);
-    if ( ! replaceODTFile(pAddrDataCondition, serverFilePath, pAddressID, pAdditionalData, pTableData ))
+    fileIO.storeData(serverFilePath, this.content, util.DATA_BINARY, false);
+    if (!_replaceODTFile(pAddrDataCondition, serverFilePath, pAddressID))
         return null;
 
     var replacedFileData = fileIO.getData(serverFilePath, util.DATA_BINARY);
     fileIO.remove(serverFilePath);
 
     return replacedFileData;
+    
+    /*
+    * ersetzt die Platzhalter in ODT-Datei
+    *
+    * @param {String} pCondition req Condition
+    * @param {String} pODTFileName req Filename des odt-Datei
+    * @param {String} pAddressID opt ID von der die Adressdaten geholt werden
+    *
+    * @return {Boolean}
+    */
+    function _replaceODTFile (pCondition, pODTFileName, pAddressID)
+    {
+        // Configuration für die Platzhalter
+        var config = PlaceholderUtils.getPlaceholders(); //["RELATIONID","fieldname","RELATION.RELATIONID"]
+        var senderRelId = EmployeeUtils.getCurrentContactId();
+        if (senderRelId == null)
+            return false;
+        var addrdata = getAddressesData(pCondition, config, senderRelId, pAddressID);
+        if (addrdata.length > 1)
+        {
+            var relationids = [];
+            for (let i = 1; i < addrdata.length; i++ )	
+                relationids.push(addrdata[i][0]);
+
+            // ersetzen Platzhalter in content.xml
+
+            var textS = util.decodeBase64String(pack.getFromZip(pODTFileName, "content.xml"));
+            var bodybegin = textS.indexOf("<office:body>");
+            var bodyend =  textS.indexOf("</office:body>") + 14;
+            var body = textS.substring( bodybegin, bodyend );
+            var lastbody = textS.substr( bodyend );
+            textS = textS.substring( 0, bodybegin );
+            for (let i = 1; i < addrdata.length; i++)
+            {
+                var bulkbody = body;
+                for (let ii = 0; ii < addrdata[0].length; ii++)
+                {
+                    bulkbody = bulkbody.replace(new RegExp(getDefaultODTplaceholer(addrdata[0][ii]), "ig"),
+                        addrdata[i][ii].replace(/\n/ig, "<text:line-break/>").replace(/&/ig, "&amp;") );
+                }
+                textS += bulkbody;
+            }
+            textS +=  lastbody;
+            pack.addToZip(pODTFile, "content.xml", util.encodeBase64String(textS))
+            // ersetzen Platzhalter in styles.xml
+            var styles = util.decodeBase64String(pack.getFromZip(pODTFileName, "styles.xml"));
+            for (let i = 0; i < addrdata[0].length; i++)
+            {
+                styles = styles.replace(new RegExp( getDefaultODTplaceholer(addrdata[0][i]), "ig"),
+                    addrdata[1][i].replace(/\n/ig, "<text:line-break/>").replace(/&/ig, "&amp;"));
+            }
+            pack.addToZip(pODTFile, "styles.xml", util.encodeBase64String(styles));
+            return true;
+        }
+        return false;
+    }
 }
 
 /*
  * This function is used to replace placeholders via DocXTemplater
- * @param {String} pInputB64 - BASE64 coded String of the document, which holds the placeholders
- * @param {Object} pPlaceholder - Must contain an object, which holds the placeholders
+ * 
+ * @param {Object} pReplacements - Must contain an object, which holds the placeholders
  * 
  * @return {String} returns the modified document in a BASE64 coded string
  */
-DocumentTemplateUtils.getReplacedDocXDocumentB64 = function (pInputB64, pPlaceholder)
+DocumentTemplate.prototype._getReplacedDOCX = function (pReplacements)
 {
     //this is executed as a process because of better performance
     var documentData = process.execute("getDocxDocument_serverProcess", {
-        templateb64: pInputB64
-       ,placeholderConfig: JSON.stringify(pPlaceholder)//process.execute is only able to handle strings
+        templateb64: this.content,
+        placeholderConfig: JSON.stringify(pReplacements) //process.execute is only able to handle strings
     });
 
     return documentData;
 }
+
+/**
+ * Provides functions for document templates
+ */
+function DocumentTemplateUtils () {}
+
+/**
+ * loads a document template and replaces the placeholders
+ */
+DocumentTemplateUtils.getSingleReplacedDocument = function (pTemplateId, pContactId)
+{
+    var template = DocumentTemplate.loadTemplate(pTemplateId);
+    return template.getReplacedTextByContactId(pContactId);
+}
+
+/**
+ * @return {Object} map with placeholders and their definition
+ */
+DocumentTemplateUtils._getPlaceholderConfig = function ()
+{
+    return KeywordData.getKeywordAttributeRelations($KeywordRegistry.textPlaceholder());
+}
+
+
+function PlaceholderUtils () {}
+
+PlaceholderUtils.types = {
+    ADDRESSFORMAT : "ADDRESSFORMAT",
+    SQLPART : "SQLPART",
+    SQLPARTFUNCTION : "SQLPARTFUNCTION"
+};
+PlaceholderUtils.targets = {
+    RECIPIENT : "RECIPIENT",
+    SENDER : "SENDER",
+    EMPLOYEE : "EMPLOYEE"
+};
+
+/**
+ * Returns the placeholder with the required prefix and postfix added.
+ * This function defines the format for placeholders.
+ */
+PlaceholderUtils.formatPlaceholder = function (pPlaceholder)
+{
+    return "@@" + pPlaceholder + "@@";
+}
+
+
+PlaceholderUtils.getPlaceholders = function () 
+{
+    function Placeholder (pName, pType, pValueDef, pTarget) 
+    {
+        this.placeholderName = PlaceholderUtils.formatPlaceholder(pName);
+        this.type = pType;
+        this.target = pTarget || PlaceholderUtils.targets.RECIPIENT;
+        this.valueDefinition = pValueDef;
+    }
+    
+    function _addAddressFormat (pName, pFormat, pTarget)
+    {
+        placeholders.push(new Placeholder(pName, PlaceholderUtils.types.ADDRESSFORMAT, pFormat, pTarget));
+    }
+    
+    function _addSqlPart (pName, pSqlPart, pAddBraces)
+    {
+        placeholders.push(new Placeholder(pName, PlaceholderUtils.types.SQLPART, pAddBraces ? "(" + pSqlPart + ")" : pSqlPart));
+    }
+    
+    function _addSqlPartFunction (pName, pSqlPartFunction, pTarget)
+    {
+        placeholders.push(new Placeholder(pName, PlaceholderUtils.types.SQLPARTFUNCTION, pSqlPartFunction, pTarget));
+    }
+    
+    var placeholders = [];
+    
+    _addAddressFormat("address", "{street} {buildingno}");
+    _addAddressFormat("zipCode", "{zip}");
+    _addAddressFormat("city", "{city}");
+    _addAddressFormat("district", "{district}");
+    _addAddressFormat("region", "{region}");
+    _addAddressFormat("country", "{country}");
+    _addAddressFormat("letterSalutation", "{letter_salutation}");
+    _addAddressFormat("fullAddress", "");
+    _addAddressFormat("senderOrgname", "{organisation_name}", PlaceholderUtils.targets.SENDER);
+    _addAddressFormat("senderAddress", "{street} {buildingno}", PlaceholderUtils.targets.SENDER);
+    _addAddressFormat("senderZipCity", "{country} - {zip} {city}", PlaceholderUtils.targets.SENDER);
+    _addAddressFormat("senderFullAddress", "", PlaceholderUtils.targets.SENDER);
+    
+    return placeholders;
+}
diff --git a/process/Email_lib/Email_lib.aod b/process/Email_lib/Email_lib.aod
index 6022256dea0248db39f796a2a79b0e55178d4044..6f306cf32f3d68ebc6f7137ec84773aa04b3a5fb 100644
--- a/process/Email_lib/Email_lib.aod
+++ b/process/Email_lib/Email_lib.aod
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.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>
+<?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
index c1e2613524f614b90b0eeb2bbb60aaaf4ef38f30..c43437496fa0846d3a518ca3a744fa2fea84c6df 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -3,6 +3,7 @@ import("system.text");
 import("system.db");
 import("system.util");
 import("Communication_lib");
+import("DocumentTemplate_lib");
 import("system.neon");
 import("system.mail");
 
@@ -15,15 +16,16 @@ function EmailUtils () {}
  * In Thunderbird the mail is opened in view mode and you've to manually "edit as new"
  * 
  * @param {String|Array} pToRecipients mailaddresses of the recipients, can either be a 1D-Array with several addresses or a string with one address
- * @param {String} pContactId contactId of the sender. the standard mailadress of the contact is used as sender-address
+ * @param {String} pSenderContactId contactId of the sender. the standard mailadress of the contact is used as sender-address
  * @param {String} [pTemplateId] if a document-template shall be used, give the templateId here
+ * @param {String} [pRecipientContactId] contactId of the recipient, required to fill placeholders
  */
-EmailUtils.openMailTemplate = function (pToRecipients, pContactId, pTemplateId)
+EmailUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId)
 {
     var email = new Email(pToRecipients);
-    email.setSender(pContactId);
+    email.setSender(pSenderContactId);
     if (pTemplateId)
-        email.setTemplate(pTemplateId);
+        email.setTemplate(pTemplateId, pRecipientContactId);
 
     email.downloadEML();
 }
@@ -70,17 +72,14 @@ function Email (pToRecipients, pSender, pSubject, pBody, pCcRecipients, pBccReci
  * loads a document template into the mail body
  * 
  * @param {String} pTemplateId the id of the template
+ * @param {String} pContactId the id of the template
  */
-Email.prototype.setTemplate = function (pTemplateId)
+Email.prototype.setTemplate = function (pTemplateId, pContactId)
 {
-    var alias = "_____SYSTEMALIAS";
-    var templateDocument = db.getBinaryMetadata("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, false, alias, null);
-    if (!templateDocument[0])
-        return null;
-    var binaryId = templateDocument[0][db.BINARY_ID];
-    if (binaryId)
-        this.body = util.decodeBase64String(db.getBinaryContent(binaryId, alias));
-    return null;
+    var template = DocumentTemplate.loadTemplate(pTemplateId);
+    //TODO: also set other properties if the template is a eml
+    if (template)
+        this.body = template.getReplacedContentByContactId(pContactId);
 }
 
 /**
diff --git a/process/Importer_lib/process.js b/process/Importer_lib/process.js
index a693e85cf7ed62c81e6dfed7f74471cd8b759a70..fe2913476193d23a48cf7eef1dc743a965d00756 100644
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
@@ -7,7 +7,6 @@ import("system.fileIO");
 import("system.swing");
 import("system.util");
 import("system.text");
-import("ErrorHandling_lib");
 import("ImporterCustomMappingFunctions_lib");
 import("ImporterMappingFunctions_lib");
 
@@ -402,7 +401,7 @@ function Importer(pConfig)
                     {
                         logging.log(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex)
                         this.writeLog(this.LogLevels.Error, "Exception in mapping function [" + fname + "] for input row " + this.recordCounts.total+ " - " + this.Config.Mapping[i][1]["Target"]);                       
-                        recordStack.exception = errorHandling.getClearMessage(ex)+  " -  Column: " + this.Config.Mapping[i][1]["Target"];
+                        recordStack.exception = logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true) +  " -  Column: " + this.Config.Mapping[i][1]["Target"];
                         skip = true;
 
                     }
@@ -650,7 +649,7 @@ function Importer(pConfig)
                         this.writeLog(this.LogLevels.Error, "Error at " + (insertSuccessfull ? "" : "Insert") + (updateSuccessfull ? "": "Update") + ":" + logging.toLogString(ex));
                         logging.log(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex)
                         this.recordCounts.skip++;
-                        recordStack.exception = errorHandling.getClearMessage(ex);
+                        recordStack.exception = logging.toLogString(ex["rhinoException"] != undefined ? ex["rhinoException"] : ex, true);
                         
                         if(this.insertArray.length > 0 && !insertSuccessfull) {
                             this.writeLog(this.LogLevels.Info, "Insert array: " + JSON.stringify(this.insertArray, null, " "));
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index 9d1a84dfd365c167a37d28f0f59fbe371f386686..7bc239fd0d40352a3a2b577a3680141c5d013d8e 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -9,11 +9,11 @@ import("Sql_lib");
 function JditoFilterHelper (pColumns, pFilter) 
 {
     var columnMap = {};
-    pColumns.forEach(function (row, i)
+    for (let i = 0, l = pColumns.length; i < l; i++)
     {
-        if (row)
-            columnMap[row] = i;
-    });
+        if (pColumns[i])
+            columnMap[pColumns[i]] = i;
+    }
     this._columnMap = columnMap;
     this._filter = pFilter;
 }
@@ -101,7 +101,7 @@ function JditoFilterUtils () {}
  * @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.userfilter
+ * @param {String|Object} pFilter the value of vars.get($local.filter).filter
  * 
  * @return {Array} the filtered records
  */
@@ -133,10 +133,11 @@ JditoFilterUtils.filterRecords = function (pColumns, pRecords, pFilter)
  *      
  * @example
  * var condition = SqlCondition.begin();
- * if (vars.exists("$local.userfilter") && vars.get("$local.userfilter"))
+ * if (vars.exists("$local.filter") && vars.get("$local.filter"))
  * {
- *     var filter = vars.get("$local.userfilter");
- *     condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE")));
+ *     var filter = vars.get("$local.filter");
+ *     if (filter.filter)
+ *      condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter.filter, "AB_ATTRIBUTE")));
  * }
  * var attributeSql = condition.buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE");
  * 
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 4dd51001554d5c3a77823c584e694c2802bbaba1..f97b3dd58f8ae7b669e05217b93612467b14057f 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -48,12 +48,14 @@ $KeywordRegistry.taskStatus$ended = function(){return "7c9d6681-6cf5-4395-b276-3
 
 $KeywordRegistry.taskType = function(){return "TaskType";};
 $KeywordRegistry.taskType$Task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
+$KeywordRegistry.taskType$bugTicket = function(){return "f3da0edd-49d9-4061-98c1-8fda8631be7e";};
+$KeywordRegistry.taskType$supportTicket = function(){return "7bf77721-470f-4cdf-a6af-452bf05a405b";};
 
 $KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
 $KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
 
 $KeywordRegistry.quantityUnit = function(){return "QuantityUnit";};
-$KeywordRegistry.salesprojectMemberRole = function(){return "SalesprojectMemberRole";};
+$KeywordRegistry.MemberRole = function(){return "MemberRole";};
 $KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource";};
 $KeywordRegistry.salesorderState = function(){return "SalesorderState";};
 $KeywordRegistry.salesprojectWonLost = function(){return "SalesprojectWonLost";};
@@ -79,7 +81,7 @@ $KeywordRegistry.taskPriority$medium = function(){return "4467b33c-3a68-4c8b-ba4
 $KeywordRegistry.taskPriority$high = function(){return "1e42f183-fb97-415f-9917-b43ca159fde4";};
 $KeywordRegistry.taskProgress = function(){return "TaskProgress";};
 $KeywordRegistry.taskProgress$0 = function(){return "ec92271b-eac2-4ec2-be24-ab4abde7e939";};
-$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState";};
+$KeywordRegistry.CompetitionState = function(){return "CompetitionState";};
 $KeywordRegistry.objectRelationType = function(){return "ObjectRelationType";};
 $KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm";};
 $KeywordRegistry.paymentTerm = function(){return "PaymentTerm";};
@@ -100,4 +102,6 @@ $KeywordRegistry.classificationType$salesproject = function(){return "968eafa3-3
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.personGender$other = function(){return "o";};
 $KeywordRegistry.permissionCondType = function(){return "PermissionCondType";};
-$KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
\ No newline at end of file
+$KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
+
+$KeywordRegistry.textPlaceholder = function(){return "textPlaceholder";};
\ No newline at end of file
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 12e4083b349d6f5aa5d14f18eacf803987962141..cfbdd41b26221e321be5d66857b72a28f8ba9136 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -1,3 +1,4 @@
+import("KeywordRegistry_basic");
 import("KeywordData_lib");
 import("system.vars");
 import("system.SQLTYPES");
@@ -76,6 +77,27 @@ KeywordUtils.getAttributeRelationsByKey = function(pKeyId, pContainerName)
         return data[pKeyId];
 };
 
+/**
+ * return a specific attribute. Only call if you need only one. If you need more than one use getAttributeRelationsByKey()
+ * 
+ * @param {String} pKeyId the key of an element within a containerName - this is the value that is stored in the reference-table (e.g. "DE")
+ * @param {String} pContainerName specifies the type of the keyword and therefore the list elements;
+ *                                  e.g. "COUNTRY"; use an entry of the $KeywordRegistry here
+ * @param {String} pAttrName The Attribute name you need
+ * @param {String} [pDefault=null] the default value, if the attribute doesn't exist. If not specified, null will be used.
+ * 
+ * @return {Object} the value or pDefault
+ */
+KeywordUtils.getAttributeRelation = function(pKeyId, pContainerName, pAttrName, pDefault)
+{
+    var attributes = KeywordUtils.getAttributeRelationsByKey(pKeyId, pContainerName);
+    if (attributes && attributes[pAttrName] != null)
+    {
+        return attributes[pAttrName];
+    }
+    return pDefault ? pDefault : null;
+};
+
 /**
 * provides a distinctive list of all keyword-container-names in the system
 * 
@@ -83,6 +105,9 @@ KeywordUtils.getAttributeRelationsByKey = function(pKeyId, pContainerName)
 */
 KeywordUtils.getContainerNames = function()
 {
+    //do not cache this list since
+    // a) the list can easly change when a new container is created
+    // b) where this is called it's not relevant in terms of performance
     var list = db.array(db.COLUMN, "select distinct AB_KEYWORD_ENTRY.CONTAINER from AB_KEYWORD_ENTRY order by AB_KEYWORD_ENTRY.CONTAINER asc");
     return list;
 };
@@ -117,9 +142,10 @@ KeywordUtils.getEntryNamesByContainer = function(pContainerName, pLocale)
 */
 KeywordUtils.getEntryNamesAndIdsByContainer = function(pContainerName, pLocale)
 {
+    //TODO: this can be propably removed when the "Salesproject_entity.REASONS.dropDownProcess.js" is replaced by a consumer
     var sql = SqlCondition.begin()
                           .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
-                          .buildSql("select AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", null, "order by AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
+                          .buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", null, "order by AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
                           
     var list = db.table(sql).map(function (elem){
         elem[1] = pLocale ? translate.text(elem[1], pLocale) : translate.text(elem[1]);
@@ -139,6 +165,7 @@ KeywordUtils.getEntryNamesAndIdsByContainer = function(pContainerName, pLocale)
  */
 KeywordUtils.exists = function(pKeyId, pContainerName)
 {
+    //a check if a keyword exists should always be on the origin data and not the cache, so do not cache here
     var sql = SqlCondition.begin()
                           .andPrepare("AB_KEYWORD_ENTRY.KEYID", pKeyId)
                           .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
diff --git a/process/Notification_lib/process.js b/process/Notification_lib/process.js
index 3b87c821178df7a03a021f0322e5be6d61a503c1..31db73ecfdc83ea1e38849c4f6b3eb6999daa893 100644
--- a/process/Notification_lib/process.js
+++ b/process/Notification_lib/process.js
@@ -20,6 +20,5 @@ NotificationUtil.chooseRightPrio = function(pForcedPrio, pTypeObject)
     if(defaultPrio && defaultPrio != "NONE")
         prio = defaultPrio;
     
-//    logging.log("lib prio: " + prio);
     return prio;
 }
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 74283a23c2230be304a4e970830aa984e2cc19f7..775014bc6015e74f03439a0f807c51e6da9b34c0 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -106,7 +106,8 @@ OfferUtils.openOfferReport = function (pOfferID)
         "VAT", 
         sqlUtil.isNull("VERSNR", "0"),
         sqlUtil.isNull("OFFERCODE", "0"), 
-        "SALESPROJECT_ID" //12
+        "OBJECT_ROWID", //12
+        "FOOTER" //13
     ];
    
     var offerSql = SqlCondition.begin()
@@ -143,7 +144,7 @@ OfferUtils.openOfferReport = function (pOfferID)
     var offerItemSql = SqlCondition.begin()
         .andPrepare("OFFERITEM.OFFER_ID", pOfferID)
         .buildSql(
-            "select " + offerItemFields.join(", ") + " from OFFERITEM join PRODUCT on PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID", 
+            "select " + offerItemFields.join(", ") + " from OFFERITEM left join PRODUCT on PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID", 
             "1 = 0"
         );
     var itemData = db.table(offerItemSql);
@@ -195,6 +196,7 @@ OfferUtils.openOfferReport = function (pOfferID)
             item[5],        //itemposition
             item[6],        //productcode
             offerData[8],   //header 
+            offerData[13],   //footer 
             text.formatDouble(item[9], translate.text("#,##0"), true),          //quantity
             text.formatDouble(item[10], translate.text("#,##0.00"), true),      //price
             text.formatDouble(item[11], translate.text("0.00"), true),          //discount
@@ -227,7 +229,7 @@ OfferUtils.openOfferReport = function (pOfferID)
         "DeliveryConditions" : translate.text("Deliveryspecification", language),
         "OFFERPers" : (AddressUtils.getLetterSalutation() + ",").toString(), // TODO: AddrObject implementieren (addrobj.formatAddress("{ls},");)
         "Articlenumber" : translate.text("Articlenumber", language),
-        "OFFERAddr" : translate.text(offerData[0], language),
+        "OFFERAddr" : translate.text(offerData[0].trim(), language),
         "PlusSalestax" : translate.text("Plus Salestax", language),
         "Unitprice" : translate.text("Unitprice", language),
         "directlyResponsible" : translate.text("Directly responsible:", language),
@@ -267,14 +269,15 @@ OfferUtils.openOfferReport = function (pOfferID)
             "OFFERITEM_ITEMPOSITION", 
             "PRODUCT_PRODUCTCODE", //8
             "OFFER_HEADER", 
+            "OFFER_FOOTER", 
             "OFFERITEM_QUANTITY", 
             "OFFERITEM_PRICE", 
-            "OFFERITEM_DISCOUNT", //12
+            "OFFERITEM_DISCOUNT", //13
             "OFFER_VERSNR", 
             "OFFER_OFFERCODE", 
             "OFFERITEM_VAT", 
-            "ITEMSUM", // 16
-            "OFFERITEM_UNITTEXT" //17
+            "ITEMSUM", // 17
+            "OFFERITEM_UNITTEXT"
         ])
         .add(itemData));
     offerReport.openReport();
@@ -288,11 +291,12 @@ OfferUtils.openOfferReport = function (pOfferID)
  * @param {String} pLanguage
  * @param {String} [pCurrency=""]
  * @param {String} [pHeader=""]
+ * @param {String} [pFooter=""]
  * @param {String} [pDeliveryTerm=""]
  * @param {String} [pPaymentTerm=""]
  * @param {String} [pSalesprojectId=""]
  */
-OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader, pDeliveryTerm, pPaymentTerm, pSalesprojectId)
+OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader, pFooter, pDeliveryTerm, pPaymentTerm, pSalesprojectId)
 {
     var params = {
         "ContactId_param" : pContactId,
@@ -300,6 +304,7 @@ OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHe
         "OfferOriginal_Id_param" : pOfferId,
         "OfferCurrency_param" : pCurrency || "",
         "OfferHeader_param" : pHeader || "",
+        "OfferFooter_param" : pFooter || "",
         "OfferDeliveryTerm_param" : pDeliveryTerm || "",
         "OfferPaymentTerm_param" : pPaymentTerm || "",
         "SalesprojectId_param" : pSalesprojectId || ""
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 0dfe9541988348a0245357430c4c6724ad5135b7..0818e818157e53e530f7d6fef22d6ec40220aae2 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -390,12 +390,28 @@ SqlCondition.prototype._prepare = function(field, value, cond, fieldType) {
     
     if (typeof field === 'string')
     {
-        alias = field;
+        var pointPos = field.indexOf(".");
+        
+        if (pointPos > 0 && pointPos < field.length-1)
+        {
+            alias = field;
+        }
+        else
+        {
+            throw new Error(translate.withArguments("${SQL_LIB_FIELD_WRONG_FORMAT} field: %0", [field]));
+        }
     }
     else
     {
-        alias = field[2] + "." + field[1];
-        field = field[0] + "." + field[1];
+        if (field.length == 3)
+        {
+            alias = field[2] + "." + field[1];
+            field = field[0] + "." + field[1];
+        }
+        else
+        {
+            throw new Error(translate.withArguments("${SQL_LIB_FIELD_WRONG_FORMAT} field: %0", [field.toSource()]));
+        }
     }
     
     var type;
@@ -1371,7 +1387,7 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
     return resSql;
 };
 
-SqlUtils.exportToLiquibase = function(pAuthor, pTableName, pColumns, pNewUUIDForIndexes) 
+SqlUtils.exportToLiquibase = function(pAuthor, pTableName, pColumns, pNewUUIDForIndexes, pCondition) 
 {
     if(!pNewUUIDForIndexes) 
         pNewUUIDForIndexes = []
@@ -1381,7 +1397,7 @@ SqlUtils.exportToLiquibase = function(pAuthor, pTableName, pColumns, pNewUUIDFor
     xmlData.changeSet.@author = pAuthor
     xmlData.changeSet.@id = util.getNewUUID()
     
-    var dbData = db.table("select " + pColumns.join(", ") + " from " + pTableName);
+    var dbData = db.table("select " + pColumns.join(", ") + " from " + pTableName + " " + (pCondition ? pCondition : ""));
     var types = db.getColumnTypes(pTableName, pColumns);
     
     dbData.forEach(function(pRow) {
@@ -1407,17 +1423,19 @@ SqlUtils.exportToLiquibase = function(pAuthor, pTableName, pColumns, pNewUUIDFor
             var col = <column/>;
             col.@name = pColumns[i];
         
-            if (SQLTYPES.isNumberType(types[i]))
-                col.@valueNumeric = value;
-            else
-                col.@value = value;
+            // do not add value if null
+            if (value)
+            {               
+                if (SQLTYPES.isNumberType(types[i]))
+                    col.@valueNumeric = value;
+                else
+                    col.@value = value;
+            }
         
             node.appendChild(col);
         }
         this.appendChild(node);
     }, xmlData.changeSet);
-
-    //xmlData.changeSet.push(<insert>6</insert>);
     
     return xmlData.toXMLString()
 };
diff --git a/process/Turnover_lib/process.js b/process/Turnover_lib/process.js
index 884ee0da64c94eb068f264c3872ef0857745a1d9..d7747ebd9dabeb7b24059e5da0a5e53d94be0254 100644
--- a/process/Turnover_lib/process.js
+++ b/process/Turnover_lib/process.js
@@ -57,9 +57,9 @@ TurnoverUtil.getForecastData = function (pMaxYear, pYearCount)
 
     // load data
     var data = db.table(SqlCondition.begin()
-                                    .andPrepare("SALESPROJECT_FORECAST.DATE_START", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
-                                    .andPrepare("SALESPROJECT_FORECAST.DATE_START", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
-                                    .buildSql("select '" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName from SALESPROJECT_FORECAST", "1=2", " group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum"))
+                                    .andPrepare("FORECAST.DATE_START", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
+                                    .andPrepare("FORECAST.DATE_START", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
+                                    .buildSql("select '" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName from FORECAST", "1=2", " group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum"))
     
     return data;
 }
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 7ccfd120e934b9569404e38ac3da5af0d5f1fe25..7120f0e2ee9bc23d8fdc9b3de06c0680f1f923ab 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -177,28 +177,18 @@ ArrayUtils.sort2d = function(targetArray, index, sortAsc, isNumber) {
 }
 
 /**
-* sorts an array up to 6 columns with sortorder
+* sorts an array with columns
 *
-* @param {Array} targetArray req the array with data
-* @param {Integer} us req  the Sortorder for Column 1 = Param u (1=asc, -1=desc)
-* @param {Integer} u req the 1 Column
-* @param {Integer} vs opt  the Sortorder for Column 2 = Param v (1=asc, -1=desc)
-* @param {Integer} v opt the 2 Column
-* @param {Integer} ws opt  the Sortorder for Column 3 = Param w (1=asc, -1=desc)
-* @param {Integer} w opt the 3 Column
-* @param {Integer} xs opt  the Sortorder for Column 4 = Param x (1=asc, -1=desc)
-* @param {Integer} x opt the 4 Column
-* @param {Integer} ys opt  the Sortorder for Column 5 = Param y (1=asc, -1=desc)
-* @param {Integer} y opt the 5 Column
-* @param {Integer} zs opt  the Sortorder for Column 6 = Param z (1=asc, -1=desc)
-* @param {Integer} z opt the 6 Column
+* @param {Array} targetArray the array with data
+* @param {Array} sortOrder array with the format [columnIndex1, sortDescending1, columnIndex2, sortDescending2, ...],
+*                           the columnIndex must be an integer, sortDescending must be boolean (true -> descending, just like db.DESCENDING)
+* @example
+* ArrayUtils.sortMulti(rows, [1, true, 2, true, 5, false]);
 *
 * @return {void}
 */
-ArrayUtils.sortMulti = function(targetArray, us, u, vs, v, ws, w, xs, x, ys, y, zs, z) {
+ArrayUtils.sortMulti = function(targetArray, sortOrder) {
     /*
-     * sort of a two dim array, up to 6 columns
-     *
      * @param {String} a req value 1, first compared element
      * @param {String} b req value 2, sencond compared element
      *
@@ -220,74 +210,27 @@ ArrayUtils.sortMulti = function(targetArray, us, u, vs, v, ws, w, xs, x, ys, y,
 
             return( a == b ) ? 0 : ( a > b ) ? 1 : -1;
         }
-
-
-        var swap=0;
-
-        if (isNaN(a[u] - b[u])) // if there is a string in the first compared element
-            if( isNaN(a[u]) && isNaN(b[u]) ) // if both are strings,
-                swap = stringComparison(a[u], b[u]); // then: true - false = 1; false - true = -1
-            else
-                swap = (isNaN(a[u]) ? 1 : -1);
-        else
-            swap = (a[u] - b[u]);
-
-        if ((v == undefined) || (swap != 0))
-            return swap * us;
-        else
-        if (isNaN(a[v] - b[v]))
-            if ((isNaN(a[v])) && (isNaN(b[v])))
-                swap =  stringComparison(a[v], b[v]);
-            else
-                swap = (isNaN(a[v]) ? 1 : -1);
-        else
-            swap = (a[v] - b[v]);
-
-        if ((w == undefined) || (swap != 0))
-            return swap * vs;
-        else
-        if (isNaN(a[w] - b[w]))
-            if ((isNaN(a[w])) && (isNaN(b[w])))
-                swap =  stringComparison(a[w], b[w]);
-            else
-                swap = (isNaN(a[w]) ? 1 : -1);
-        else
-            swap = (a[w] - b[w]);
-
-        if ((x == undefined) || (swap != 0))
-            return swap * ws;
-        else
-        if (isNaN(a[x] - b[x]))
-            if ((isNaN(a[x])) && (isNaN(b[x])))
-                swap =  stringComparison(a[x], b[x]);
-            else
-                swap = (isNaN(a[x]) ? 1 : -1);
-        else
-            swap = (a[x] - b[x]);
-
-        if ((y == undefined) || (swap != 0))
-            return swap * xs;
-        else
-        if (isNaN(a[y] - b[y]))
-            if ((isNaN(a[y])) && (isNaN(b[y])))
-                swap =  stringComparison(a[y], b[y]);
-            else
-                swap = (isNaN(a[y]) ? 1 : -1);
-        else
-            swap = (a[y] - b[y]);
-
-        if ((z == undefined) || (swap != 0))
-            return swap * ys;
-        else
-        if(isNaN(a[z] - b[z]))
-            if((isNaN(a[z])) && (isNaN(b[z])))
-                swap =  stringComparison(a[z], b[z]);
+        
+        var swap = 0;
+        
+        for (let i = 0, l = sortOrder.length; i < l; i += 2)
+        {
+            let colIndex = sortOrder[i];
+            let sortDesc = sortOrder[i+1];
+            if (swap || colIndex == undefined || sortDesc == undefined)
+                return swap;
+            
+            if (isNaN(a[colIndex] - b[colIndex]))
+                if ((isNaN(a[colIndex])) && (isNaN(b[colIndex])))
+                    swap =  stringComparison(a[colIndex], b[colIndex]);
+                else
+                    swap = (isNaN(a[colIndex]) ? 1 : -1);
             else
-                swap = (isNaN(a[z]) ? 1 : -1);
-        else
-            swap = (a[z] - b[z]);
-
-        return swap * zs;
+                swap = (a[colIndex] - b[colIndex]);
+            
+            swap *= (sortDesc ? -1 : 1);
+        }
+        return swap;
     }
 
     targetArray.sort(sortFn);
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 2bf0c1e4d64115044c486b0907f9c19fb064bd05..24c3432f752201906042cda4cfe644175d1cebc7 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -131,7 +131,7 @@ WsValidationType.get = function(pKey)
         var defaultResult = [[{}, pValue]];
         defaultResult[0][0][this.paramName] = pValue;
         resultAddresses = resultAddresses.concat(defaultResult);
-        
+                
         return resultAddresses.map(function(pAddress, pIndex)
                     {
                         pAddress[0].index = pIndex;
@@ -235,7 +235,6 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
  */
 WsValidationUtils.setAddressFields = function(pFieldToSetToValue)
 {
-    logging.log(vars.getString("$this.value"))
     try 
     {
         var data = JSON.parse(vars.getString("$this.value"));
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index 8fd2ad75279694ea9c067facd3d94529a8580c1e..43a42089fbc78d4874774963a932817151c38e57 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -1,7 +1,6 @@
 import("system.result");
 import("system.vars");
 import("system.swing");
-import("system.logging");
 import("system.fileIO");
 import("system.util");
 
diff --git a/process/indexsearch_patternextension/indexsearch_patternextension.aod b/process/indexsearch_patternextension/indexsearch_patternextension.aod
index 44786e98684ee3028b4ef80a8809e874a45f7ba2..3917e2a4e1335e8771643089fff4e1457d43e447 100644
--- a/process/indexsearch_patternextension/indexsearch_patternextension.aod
+++ b/process/indexsearch_patternextension/indexsearch_patternextension.aod
@@ -1,5 +1,5 @@
-<?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>indexsearch_patternextension</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>indexsearch_patternextension</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+</process>
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 73ddba779c2d566c916218ba5f236a4640ce9b54..c4ff328081458c7bf0754f0dc165116b5393aa63 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -1,481 +1,491 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
-	<property name="ireport.zoom" value="2.1435888100000016"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<parameter name="myAddr" class="java.lang.String"/>
-	<parameter name="Pos" class="java.lang.String"/>
-	<parameter name="Articledescription" class="java.lang.String"/>
-	<parameter name="Articlenumber" class="java.lang.String"/>
-	<parameter name="Unitprice" class="java.lang.String"/>
-	<parameter name="Amount" class="java.lang.String"/>
-	<parameter name="VAT" class="java.lang.String"/>
-	<parameter name="Date" class="java.lang.String"/>
-	<parameter name="Number" class="java.lang.String"/>
-	<parameter name="PaymentConditions" class="java.lang.String"/>
-	<parameter name="DeliveryConditions" class="java.lang.String"/>
-	<parameter name="Discount" class="java.lang.String"/>
-	<parameter name="Total" class="java.lang.String"/>
-	<parameter name="Sum" class="java.lang.String"/>
-	<parameter name="PlusSalestax" class="java.lang.String"/>
-	<parameter name="OFFERAddr" class="java.lang.String"/>
-	<parameter name="OFFERPers" class="java.lang.String"/>
-	<parameter name="OfferPaymentTerm" class="java.lang.String"/>
-	<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
-	<parameter name="responsible" class="java.lang.String"/>
-	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\adito\\0.0\\project\\basic 2019\\report\\Offer_report\\"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
-	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
-	<parameter name="TOTAL" class="java.lang.String"/>
-	<parameter name="adito.image.myLogo" class="java.lang.String"/>
-	<parameter name="printDiscount" class="java.lang.String"/>
-	<parameter name="directlyResponsible" class="java.lang.String"/>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="OFFERITEM_QUANTITY" class="java.lang.String"/>
-	<field name="OFFERITEM_PRICE" class="java.lang.String"/>
-	<field name="OFFERITEM_DISCOUNT" class="java.lang.String"/>
-	<field name="OFFER_OFFERCODE" class="java.lang.String"/>
-	<field name="OFFER_CURRENCY" class="java.lang.String"/>
-	<field name="OFFER_OFFERDATE" class="java.lang.String"/>
-	<field name="OFFER_OFFERID" class="java.lang.String"/>
-	<field name="OFFERITEM_INFO" class="java.lang.String"/>
-	<field name="OFFERITEM_ASSIGNEDTO" class="java.lang.String"/>
-	<field name="OFFERITEM_VAT" class="java.lang.String"/>
-	<field name="OFFERITEM_ITEMNAME" class="java.lang.String"/>
-	<field name="OFFERITEM_OPTIONAL" class="java.lang.String"/>
-	<field name="OFFERITEM_ITEMPOSITION" class="java.lang.String"/>
-	<field name="OFFERITEM_UNITTEXT" class="java.lang.String"/>
-	<field name="PRODUCT_PRODUCTCODE" class="java.lang.String"/>
-	<field name="OFFER_HEADER" class="java.lang.String"/>
-	<field name="ITEMSUM" class="java.lang.String"/>
-	<field name="OFFER_VERSNR" class="java.lang.String"/>
-	<sortField name="OFFER_OFFERID"/>
-	<sortField name="OFFERITEM_ITEMPOSITION"/>
-	<group name="OFFERID" isStartNewPage="true">
-		<groupExpression><![CDATA[$F{OFFER_OFFERID}]]></groupExpression>
-		<groupHeader>
-			<band height="75">
-				<textField isStretchWithOverflow="true">
-					<reportElement x="20" y="0" width="177" height="48" uuid="b3b876cf-b4ce-4569-ae30-04ddc7690f9f"/>
-					<textElement>
-						<font/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{OFFERAddr}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="372" y="0" width="60" height="15" uuid="98f1140c-7c34-47fb-b4e8-cb3af8c29a80"/>
-					<textElement>
-						<font/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Number}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="372" y="16" width="60" height="15" uuid="acd6017f-fa7c-43fb-9a7b-3a42b63a34cf"/>
-					<textElement>
-						<font/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Date}]]></textFieldExpression>
-				</textField>
-				<textField pattern="dd.MM.yyyy">
-					<reportElement x="432" y="16" width="64" height="15" uuid="2329be0e-9970-416f-af01-812d1d60676b"/>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{OFFER_OFFERDATE}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement x="372" y="35" width="183" height="15" uuid="67e65fc6-2a2a-4ab8-8485-2ad08c7e8168"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true">
-					<reportElement x="372" y="50" width="183" height="22" uuid="159be5de-8473-415d-8d1e-bffa46e4764a"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{responsible}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="432" y="0" width="64" height="15" uuid="99c69604-7df6-432e-a492-6c31d8bd67fd"/>
-					<textElement textAlignment="Right">
-						<font size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="372" y="35" width="183" height="15" uuid="9f7aeac2-3844-43ee-bc8b-b11f8701b83e">
-						<printWhenExpression><![CDATA[!$P{responsible}.equals("")]]></printWhenExpression>
-					</reportElement>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{directlyResponsible}]]></textFieldExpression>
-				</textField>
-			</band>
-			<band height="20">
-				<textField>
-					<reportElement x="20" y="0" width="535" height="20" uuid="944d2cf1-3037-4d45-b6d3-9e43af16bf4a"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{OFFERPers}]]></textFieldExpression>
-				</textField>
-			</band>
-			<band height="20">
-				<textField isStretchWithOverflow="true">
-					<reportElement x="20" y="0" width="535" height="20" uuid="8d10af04-82a4-4344-ae98-de42c82a674e"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{OFFER_HEADER}]]></textFieldExpression>
-				</textField>
-			</band>
-			<band height="42">
-				<staticText>
-					<reportElement x="358" y="23" width="27" height="15" isRemoveLineWhenBlank="true" uuid="a81f864d-b418-4f1d-9410-2eb7ac8cff60">
-						<printWhenExpression><![CDATA[!$P{printDiscount}.equals("0")]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[%]]></text>
-				</staticText>
-				<textField>
-					<reportElement x="389" y="24" width="63" height="15" uuid="3f7bbaf4-2239-47ca-a3ca-a6693387bad4"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{OFFER_CURRENCY}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="496" y="11" width="57" height="12" uuid="85ff401c-24a9-4b83-9aa8-655db56119e4"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Sum}]]></textFieldExpression>
-				</textField>
-				<line>
-					<reportElement x="14" y="40" width="541" height="1" uuid="17007e05-77b0-4572-bcd1-3486e58cfb53"/>
-				</line>
-				<textField>
-					<reportElement x="59" y="11" width="63" height="12" uuid="e37dd329-c082-4dfd-afa5-f1fe0bd96f4c"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Articlenumber}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="389" y="11" width="63" height="12" uuid="754450e2-04ac-45d5-a0a0-64ea42c86431"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Unitprice}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="345" y="11" width="40" height="12" isRemoveLineWhenBlank="true" uuid="91319825-d02b-4a0d-9234-8342b8518c61">
-						<printWhenExpression><![CDATA[!$P{printDiscount}.equals("0")]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Discount}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="20" y="11" width="39" height="12" uuid="d483ee1c-9ae8-4929-ba15-069e8743d676"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Pos}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="279" y="11" width="54" height="12" uuid="3bb98c33-f62c-444f-b706-49d4dd54cf35"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Amount}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="454" y="11" width="38" height="12" uuid="592adef7-0b85-4304-8d6e-6640a157a7ee"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{VAT}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement x="454" y="24" width="38" height="15" uuid="57199603-485e-453a-8380-d3b85488883c"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<text><![CDATA[%]]></text>
-				</staticText>
-				<textField>
-					<reportElement x="496" y="24" width="57" height="15" uuid="6a4866ee-2bdd-40f5-b600-280615be2c1b"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{OFFER_CURRENCY}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="122" y="11" width="156" height="12" uuid="0dbb9e83-463b-45e4-a702-2d1699220383"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Articledescription}]]></textFieldExpression>
-				</textField>
-				<line>
-					<reportElement x="14" y="6" width="541" height="1" uuid="c19244a8-cbd9-4a8a-b2e4-25e6aa6d730d"/>
-				</line>
-			</band>
-		</groupHeader>
-		<groupFooter>
-			<band height="24">
-				<line>
-					<reportElement x="356" y="4" width="196" height="1" uuid="228a3e86-96b6-470f-b9d8-9c566a0f1065"/>
-				</line>
-				<textField pattern="#,##0.00;-#,##0.00">
-					<reportElement x="452" y="6" width="100" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{SUMITEMSUM}]]></textFieldExpression>
-				</textField>
-			</band>
-			<band height="18">
-				<subreport>
-					<reportElement isPrintRepeatedValues="false" x="355" y="2" width="196" height="15" isRemoveLineWhenBlank="true" uuid="8683c745-01bf-44aa-af62-a6ba881a9edd"/>
-					<subreportParameter name="PlusSalestax">
-						<subreportParameterExpression><![CDATA[$P{PlusSalestax}]]></subreportParameterExpression>
-					</subreportParameter>
-					<dataSourceExpression><![CDATA[((net.sf.jasperreports.engine.data.JRMapArrayDataSource)$P{adito.datasource.subdata}).cloneDataSource()]]></dataSourceExpression>
-					<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "reportData_subreport1.jasper"]]></subreportExpression>
-				</subreport>
-			</band>
-			<band height="33">
-				<textField>
-					<reportElement x="20" y="13" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
-						<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
-					</reportElement>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="122" y="13" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{OfferPaymentTerm}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="402" y="8" width="90" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
-					<textElement textAlignment="Right">
-						<font size="8" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY}]]></textFieldExpression>
-				</textField>
-				<line>
-					<reportElement x="356" y="2" width="196" height="1" uuid="8973e664-cfc0-4b52-bd0d-c80a49910da2"/>
-				</line>
-				<line>
-					<reportElement x="356" y="30" width="196" height="1" uuid="982cac61-6b87-4439-93cb-6c89fcc7932c"/>
-					<graphicElement>
-						<pen lineWidth="3.0" lineStyle="Double"/>
-					</graphicElement>
-				</line>
-				<textField pattern="###0.00;-###0.00">
-					<reportElement x="491" y="8" width="59" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
-					<textElement textAlignment="Right">
-						<font size="8" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
-				</textField>
-			</band>
-			<band height="41">
-				<textField>
-					<reportElement x="20" y="0" width="100" height="20" uuid="75b328c0-4ab1-478d-afb8-0ed8974da1af">
-						<printWhenExpression><![CDATA[!$P{OfferDeliveryTerm}.equals("")]]></printWhenExpression>
-					</reportElement>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{DeliveryConditions}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="122" y="0" width="100" height="20" uuid="41f6ab85-0948-4529-969a-5cade6279d42"/>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{OfferDeliveryTerm}]]></textFieldExpression>
-				</textField>
-			</band>
-		</groupFooter>
-	</group>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<pageHeader>
-		<band height="112" splitType="Stretch">
-			<frame>
-				<reportElement x="0" y="76" width="555" height="20" uuid="850e70ca-0d97-469b-8aff-f3715c1ee79e"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textField>
-					<reportElement x="0" y="0" width="555" height="20" forecolor="#999999" uuid="10be47d9-5d11-4115-857e-94ef762faa34"/>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{myAddr}]]></textFieldExpression>
-				</textField>
-			</frame>
-			<image scaleImage="RetainShape" hAlign="Center">
-				<reportElement x="181" y="0" width="175" height="50" uuid="84c9d77c-29e4-4e8d-a6d9-4fe07d2090cf"/>
-				<imageExpression><![CDATA[$P{adito.image.myLogo}]]></imageExpression>
-			</image>
-		</band>
-	</pageHeader>
-	<detail>
-		<band height="16" splitType="Stretch">
-			<printWhenExpression><![CDATA[$F{OFFERITEM_ASSIGNEDTO}.equals(null) || $F{OFFERITEM_ASSIGNEDTO}.equals("")]]></printWhenExpression>
-			<textField>
-				<reportElement x="20" y="0" width="39" height="15" uuid="67a9deac-8a11-45cf-aa43-d400a322c995"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMPOSITION}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="59" y="0" width="63" height="15" uuid="39d2d6c3-5658-4f9b-b94a-352291faee3f"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{PRODUCT_PRODUCTCODE}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="122" y="0" width="156" height="15" uuid="b0a5ce7d-8c01-41e5-8a59-bae7ec156590"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMNAME}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="">
-				<reportElement x="345" y="0" width="40" height="15" isRemoveLineWhenBlank="true" uuid="dab4d8da-3af4-4d4d-b78d-a2e97b17271a">
-					<printWhenExpression><![CDATA[!$F{OFFERITEM_DISCOUNT}.equals("0,00") && !$F{OFFERITEM_DISCOUNT}.equals("0.00")]]></printWhenExpression>
-				</reportElement>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_DISCOUNT}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement x="389" y="0" width="63" height="15" uuid="07d63f2e-b070-4807-a572-5282737310f0"/>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_PRICE}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0.00;###0.00-">
-				<reportElement x="454" y="0" width="38" height="15" uuid="65d761f9-8f8e-41f6-9d36-d9fb7e0ec4bd"/>
-				<textElement textAlignment="Right">
-					<font size="8" isBold="false" isUnderline="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[!$F{OFFERITEM_VAT}.equals(null)? $F{OFFERITEM_VAT} : ""]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0;-###0">
-				<reportElement x="282" y="0" width="51" height="15" uuid="bd119f1f-b7f2-4df2-a807-2acbbbc19b74"/>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_QUANTITY}.toString() + ' ' + $F{OFFERITEM_UNITTEXT}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="495" y="0" width="56" height="15" uuid="fad75a99-d1f2-4ea5-8644-305d2d426be4">
-					<printWhenExpression><![CDATA[!$F{OFFERITEM_OPTIONAL}.equals("1")]]></printWhenExpression>
-				</reportElement>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{ITEMSUM}]]></textFieldExpression>
-			</textField>
-		</band>
-		<band height="15">
-			<printWhenExpression><![CDATA[!$F{OFFERITEM_ASSIGNEDTO}.equals(null) && !$F{OFFERITEM_ASSIGNEDTO}.equals("")]]></printWhenExpression>
-			<textField>
-				<reportElement x="122" y="0" width="156" height="15" forecolor="#999999" uuid="ae45c708-344e-4a7d-8756-de306f3ec922"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMNAME}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="20" y="0" width="39" height="15" forecolor="#999999" uuid="842be130-b034-43dc-9f4f-fec826c01520"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMPOSITION}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0;-###0">
-				<reportElement x="282" y="0" width="51" height="15" forecolor="#999999" uuid="4337f5ec-5d87-403e-a6fd-d7036ae210b5"/>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_QUANTITY}.toString() + ' ' + $F{OFFERITEM_UNITTEXT}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="59" y="0" width="63" height="15" forecolor="#999999" uuid="5ccc825d-3f26-4679-abaf-ab4966edcd3f"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{PRODUCT_PRODUCTCODE}]]></textFieldExpression>
-			</textField>
-		</band>
-		<band height="18">
-			<textField isStretchWithOverflow="true">
-				<reportElement x="59" y="0" width="371" height="15" isRemoveLineWhenBlank="true" forecolor="#000000" uuid="1956ea3b-ba35-40ee-9924-33bcef054a9c"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{OFFERITEM_INFO}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<pageFooter>
-		<band height="39">
-			<textField pattern="EEEEE dd MMMMM yyyy">
-				<reportElement x="347" y="19" width="91" height="20" forecolor="#999999" uuid="8fea5314-3746-4a74-82bc-8a994c3cc7d8"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="438" y="19" width="71" height="20" forecolor="#999999" uuid="1c40bae7-b031-423d-b0ad-0b360955f4a9"/>
-				<textElement textAlignment="Right">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement x="509" y="19" width="37" height="20" forecolor="#999999" uuid="55b24967-df04-442c-8aa3-0418f25f0eef"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement x="0" y="7" width="555" height="1" forecolor="#999999" uuid="b649fb53-037f-483c-a66b-8f987581a4fc"/>
-			</line>
-		</band>
-	</pageFooter>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
+	<property name="ireport.zoom" value="2.1435888100000016"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="202"/>
+	<parameter name="myAddr" class="java.lang.String"/>
+	<parameter name="Pos" class="java.lang.String"/>
+	<parameter name="Articledescription" class="java.lang.String"/>
+	<parameter name="Articlenumber" class="java.lang.String"/>
+	<parameter name="Unitprice" class="java.lang.String"/>
+	<parameter name="Amount" class="java.lang.String"/>
+	<parameter name="VAT" class="java.lang.String"/>
+	<parameter name="Date" class="java.lang.String"/>
+	<parameter name="Number" class="java.lang.String"/>
+	<parameter name="PaymentConditions" class="java.lang.String"/>
+	<parameter name="DeliveryConditions" class="java.lang.String"/>
+	<parameter name="Discount" class="java.lang.String"/>
+	<parameter name="Total" class="java.lang.String"/>
+	<parameter name="Sum" class="java.lang.String"/>
+	<parameter name="PlusSalestax" class="java.lang.String"/>
+	<parameter name="OFFERAddr" class="java.lang.String"/>
+	<parameter name="OFFERPers" class="java.lang.String"/>
+	<parameter name="OfferPaymentTerm" class="java.lang.String"/>
+	<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
+	<parameter name="responsible" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["C:\\adito\\0.0\\project\\basic 2019\\report\\Offer_report\\"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
+	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
+	<parameter name="TOTAL" class="java.lang.String"/>
+	<parameter name="adito.image.myLogo" class="java.lang.String"/>
+	<parameter name="printDiscount" class="java.lang.String"/>
+	<parameter name="directlyResponsible" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="OFFERITEM_QUANTITY" class="java.lang.String"/>
+	<field name="OFFERITEM_PRICE" class="java.lang.String"/>
+	<field name="OFFERITEM_DISCOUNT" class="java.lang.String"/>
+	<field name="OFFER_OFFERCODE" class="java.lang.String"/>
+	<field name="OFFER_CURRENCY" class="java.lang.String"/>
+	<field name="OFFER_OFFERDATE" class="java.lang.String"/>
+	<field name="OFFER_OFFERID" class="java.lang.String"/>
+	<field name="OFFERITEM_INFO" class="java.lang.String"/>
+	<field name="OFFERITEM_ASSIGNEDTO" class="java.lang.String"/>
+	<field name="OFFERITEM_VAT" class="java.lang.String"/>
+	<field name="OFFERITEM_ITEMNAME" class="java.lang.String"/>
+	<field name="OFFERITEM_OPTIONAL" class="java.lang.String"/>
+	<field name="OFFERITEM_ITEMPOSITION" class="java.lang.String"/>
+	<field name="OFFERITEM_UNITTEXT" class="java.lang.String"/>
+	<field name="PRODUCT_PRODUCTCODE" class="java.lang.String"/>
+	<field name="OFFER_HEADER" class="java.lang.String"/>
+	<field name="ITEMSUM" class="java.lang.String"/>
+	<field name="OFFER_VERSNR" class="java.lang.String"/>
+	<field name="OFFER_FOOTER" class="java.lang.String"/>
+	<sortField name="OFFER_OFFERID"/>
+	<sortField name="OFFERITEM_ITEMPOSITION"/>
+	<group name="OFFERID" isStartNewPage="true">
+		<groupExpression><![CDATA[$F{OFFER_OFFERID}]]></groupExpression>
+		<groupHeader>
+			<band height="75">
+				<textField isStretchWithOverflow="true">
+					<reportElement x="20" y="0" width="177" height="48" uuid="b3b876cf-b4ce-4569-ae30-04ddc7690f9f"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{OFFERAddr}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="372" y="0" width="60" height="15" uuid="98f1140c-7c34-47fb-b4e8-cb3af8c29a80"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Number}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="372" y="16" width="60" height="15" uuid="acd6017f-fa7c-43fb-9a7b-3a42b63a34cf"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Date}]]></textFieldExpression>
+				</textField>
+				<textField pattern="dd.MM.yyyy">
+					<reportElement x="432" y="16" width="64" height="15" uuid="2329be0e-9970-416f-af01-812d1d60676b"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_OFFERDATE}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="372" y="35" width="183" height="15" uuid="67e65fc6-2a2a-4ab8-8485-2ad08c7e8168"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="372" y="50" width="183" height="22" uuid="159be5de-8473-415d-8d1e-bffa46e4764a"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{responsible}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="432" y="0" width="64" height="15" uuid="99c69604-7df6-432e-a492-6c31d8bd67fd"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_OFFERCODE} + "-" + $F{OFFER_VERSNR}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="372" y="35" width="183" height="15" uuid="9f7aeac2-3844-43ee-bc8b-b11f8701b83e">
+						<printWhenExpression><![CDATA[!$P{responsible}.equals("")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{directlyResponsible}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="20">
+				<textField>
+					<reportElement x="20" y="0" width="535" height="20" uuid="944d2cf1-3037-4d45-b6d3-9e43af16bf4a"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{OFFERPers}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="20">
+				<textField isStretchWithOverflow="true">
+					<reportElement x="20" y="0" width="535" height="20" uuid="8d10af04-82a4-4344-ae98-de42c82a674e"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_HEADER}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="42">
+				<staticText>
+					<reportElement x="358" y="23" width="27" height="15" isRemoveLineWhenBlank="true" uuid="a81f864d-b418-4f1d-9410-2eb7ac8cff60">
+						<printWhenExpression><![CDATA[!$P{printDiscount}.equals("0")]]></printWhenExpression>
+					</reportElement>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[%]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="389" y="24" width="63" height="15" uuid="3f7bbaf4-2239-47ca-a3ca-a6693387bad4"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_CURRENCY}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="496" y="11" width="57" height="12" uuid="85ff401c-24a9-4b83-9aa8-655db56119e4"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Sum}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="14" y="40" width="541" height="1" uuid="17007e05-77b0-4572-bcd1-3486e58cfb53"/>
+				</line>
+				<textField>
+					<reportElement x="59" y="11" width="63" height="12" uuid="e37dd329-c082-4dfd-afa5-f1fe0bd96f4c"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Articlenumber}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="389" y="11" width="63" height="12" uuid="754450e2-04ac-45d5-a0a0-64ea42c86431"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Unitprice}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="345" y="11" width="40" height="12" isRemoveLineWhenBlank="true" uuid="91319825-d02b-4a0d-9234-8342b8518c61">
+						<printWhenExpression><![CDATA[!$P{printDiscount}.equals("0")]]></printWhenExpression>
+					</reportElement>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Discount}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="20" y="11" width="39" height="12" uuid="d483ee1c-9ae8-4929-ba15-069e8743d676"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Pos}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="279" y="11" width="54" height="12" uuid="3bb98c33-f62c-444f-b706-49d4dd54cf35"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Amount}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="454" y="11" width="38" height="12" uuid="592adef7-0b85-4304-8d6e-6640a157a7ee"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{VAT}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="454" y="24" width="38" height="15" uuid="57199603-485e-453a-8380-d3b85488883c"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[%]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="496" y="24" width="57" height="15" uuid="6a4866ee-2bdd-40f5-b600-280615be2c1b"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_CURRENCY}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="122" y="11" width="156" height="12" uuid="0dbb9e83-463b-45e4-a702-2d1699220383"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Articledescription}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="14" y="6" width="541" height="1" uuid="c19244a8-cbd9-4a8a-b2e4-25e6aa6d730d"/>
+				</line>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="24">
+				<line>
+					<reportElement x="356" y="4" width="196" height="1" uuid="228a3e86-96b6-470f-b9d8-9c566a0f1065"/>
+				</line>
+				<textField pattern="#,##0.00;-#,##0.00">
+					<reportElement x="452" y="6" width="100" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{SUMITEMSUM}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="18">
+				<subreport>
+					<reportElement isPrintRepeatedValues="false" x="355" y="2" width="196" height="15" isRemoveLineWhenBlank="true" uuid="8683c745-01bf-44aa-af62-a6ba881a9edd"/>
+					<subreportParameter name="PlusSalestax">
+						<subreportParameterExpression><![CDATA[$P{PlusSalestax}]]></subreportParameterExpression>
+					</subreportParameter>
+					<dataSourceExpression><![CDATA[((net.sf.jasperreports.engine.data.JRMapArrayDataSource)$P{adito.datasource.subdata}).cloneDataSource()]]></dataSourceExpression>
+					<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "reportData_subreport1.jasper"]]></subreportExpression>
+				</subreport>
+			</band>
+			<band height="33">
+				<textField>
+					<reportElement x="20" y="13" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
+						<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="122" y="13" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{OfferPaymentTerm}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="402" y="8" width="90" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
+					<textElement textAlignment="Right">
+						<font size="8" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="356" y="2" width="196" height="1" uuid="8973e664-cfc0-4b52-bd0d-c80a49910da2"/>
+				</line>
+				<line>
+					<reportElement x="356" y="30" width="196" height="1" uuid="982cac61-6b87-4439-93cb-6c89fcc7932c"/>
+					<graphicElement>
+						<pen lineWidth="3.0" lineStyle="Double"/>
+					</graphicElement>
+				</line>
+				<textField pattern="###0.00;-###0.00">
+					<reportElement x="491" y="8" width="59" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
+					<textElement textAlignment="Right">
+						<font size="8" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="20">
+				<textField>
+					<reportElement x="20" y="0" width="100" height="20" uuid="75b328c0-4ab1-478d-afb8-0ed8974da1af">
+						<printWhenExpression><![CDATA[!$P{OfferDeliveryTerm}.equals("")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{DeliveryConditions}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="122" y="0" width="100" height="20" uuid="41f6ab85-0948-4529-969a-5cade6279d42"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{OfferDeliveryTerm}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="20">
+				<printWhenExpression><![CDATA[($F{OFFER_FOOTER} != null && !$F{OFFER_FOOTER}.trim().isEmpty())]]></printWhenExpression>
+				<textField isStretchWithOverflow="true">
+					<reportElement x="20" y="0" width="530" height="20" uuid="2a2d0fe8-9c83-43b7-913d-a551a9879608"/>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_FOOTER}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="20"/>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<pageHeader>
+		<band height="112" splitType="Stretch">
+			<frame>
+				<reportElement x="0" y="76" width="555" height="20" uuid="850e70ca-0d97-469b-8aff-f3715c1ee79e"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textField>
+					<reportElement x="0" y="0" width="555" height="20" forecolor="#999999" uuid="10be47d9-5d11-4115-857e-94ef762faa34"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textFieldExpression><![CDATA[$P{myAddr}]]></textFieldExpression>
+				</textField>
+			</frame>
+			<image scaleImage="RetainShape" hAlign="Center">
+				<reportElement x="181" y="0" width="175" height="50" uuid="84c9d77c-29e4-4e8d-a6d9-4fe07d2090cf"/>
+				<imageExpression><![CDATA[$P{adito.image.myLogo}]]></imageExpression>
+			</image>
+		</band>
+	</pageHeader>
+	<detail>
+		<band height="16" splitType="Stretch">
+			<printWhenExpression><![CDATA[$F{OFFERITEM_ASSIGNEDTO}.equals(null) || $F{OFFERITEM_ASSIGNEDTO}.equals("")]]></printWhenExpression>
+			<textField>
+				<reportElement x="20" y="0" width="39" height="15" uuid="67a9deac-8a11-45cf-aa43-d400a322c995"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMPOSITION}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="59" y="0" width="63" height="15" uuid="39d2d6c3-5658-4f9b-b94a-352291faee3f"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{PRODUCT_PRODUCTCODE}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="122" y="0" width="156" height="15" uuid="b0a5ce7d-8c01-41e5-8a59-bae7ec156590"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMNAME}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="">
+				<reportElement x="345" y="0" width="40" height="15" isRemoveLineWhenBlank="true" uuid="dab4d8da-3af4-4d4d-b78d-a2e97b17271a">
+					<printWhenExpression><![CDATA[!$F{OFFERITEM_DISCOUNT}.equals("0,00") && !$F{OFFERITEM_DISCOUNT}.equals("0.00")]]></printWhenExpression>
+				</reportElement>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_DISCOUNT}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00;-#,##0.00">
+				<reportElement x="389" y="0" width="63" height="15" uuid="07d63f2e-b070-4807-a572-5282737310f0"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_PRICE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0.00;###0.00-">
+				<reportElement x="454" y="0" width="38" height="15" uuid="65d761f9-8f8e-41f6-9d36-d9fb7e0ec4bd"/>
+				<textElement textAlignment="Right">
+					<font size="8" isBold="false" isUnderline="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[!$F{OFFERITEM_VAT}.equals(null)? $F{OFFERITEM_VAT} : ""]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0;-###0">
+				<reportElement x="282" y="0" width="51" height="15" uuid="bd119f1f-b7f2-4df2-a807-2acbbbc19b74"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_QUANTITY}.toString() + ' ' + $F{OFFERITEM_UNITTEXT}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="495" y="0" width="56" height="15" uuid="fad75a99-d1f2-4ea5-8644-305d2d426be4">
+					<printWhenExpression><![CDATA[!$F{OFFERITEM_OPTIONAL}.equals("1")]]></printWhenExpression>
+				</reportElement>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{ITEMSUM}]]></textFieldExpression>
+			</textField>
+		</band>
+		<band height="15">
+			<printWhenExpression><![CDATA[!$F{OFFERITEM_ASSIGNEDTO}.equals(null) && !$F{OFFERITEM_ASSIGNEDTO}.equals("")]]></printWhenExpression>
+			<textField>
+				<reportElement x="122" y="0" width="156" height="15" forecolor="#999999" uuid="ae45c708-344e-4a7d-8756-de306f3ec922"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMNAME}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="20" y="0" width="39" height="15" forecolor="#999999" uuid="842be130-b034-43dc-9f4f-fec826c01520"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_ITEMPOSITION}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0;-###0">
+				<reportElement x="282" y="0" width="51" height="15" forecolor="#999999" uuid="4337f5ec-5d87-403e-a6fd-d7036ae210b5"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_QUANTITY}.toString() + ' ' + $F{OFFERITEM_UNITTEXT}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="59" y="0" width="63" height="15" forecolor="#999999" uuid="5ccc825d-3f26-4679-abaf-ab4966edcd3f"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{PRODUCT_PRODUCTCODE}]]></textFieldExpression>
+			</textField>
+		</band>
+		<band height="18">
+			<textField isStretchWithOverflow="true">
+				<reportElement x="59" y="0" width="371" height="15" isRemoveLineWhenBlank="true" forecolor="#000000" uuid="1956ea3b-ba35-40ee-9924-33bcef054a9c"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{OFFERITEM_INFO}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<pageFooter>
+		<band height="39">
+			<textField pattern="EEEEE dd MMMMM yyyy">
+				<reportElement x="347" y="19" width="91" height="20" forecolor="#999999" uuid="8fea5314-3746-4a74-82bc-8a994c3cc7d8"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="438" y="19" width="71" height="20" forecolor="#999999" uuid="1c40bae7-b031-423d-b0ad-0b360955f4a9"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="509" y="19" width="37" height="20" forecolor="#999999" uuid="55b24967-df04-442c-8aa3-0418f25f0eef"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="7" width="555" height="1" forecolor="#999999" uuid="b649fb53-037f-483c-a66b-8f987581a4fc"/>
+			</line>
+		</band>
+	</pageFooter>
+</jasperReport>