diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index e49dccc3c73aae94950bf4bf11553c95fe43a3ad..12d0865aebe1c4bc81cb8563000a34e896ec8998 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -23,4 +23,4 @@
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 6407da1b96ade99cd89fd172be15282552aca01d..d2f38c17d694f7f0ff0e6aac6b4fb5110b8e7774 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -19,9 +19,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -32,9 +32,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -47,7 +47,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -58,9 +58,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -73,7 +73,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -84,9 +84,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -99,7 +99,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -112,7 +112,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -125,7 +125,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -138,7 +138,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -149,9 +149,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -172,7 +172,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -183,9 +183,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -196,9 +196,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -211,7 +211,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -231,9 +231,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -246,7 +246,7 @@
                 <columnType v="12" />
                 <size v="31" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -257,9 +257,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="-5" />
-                <size v="19" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -270,9 +270,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -283,9 +283,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -298,7 +298,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -311,7 +311,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -324,7 +324,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -337,7 +337,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -350,7 +350,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -363,7 +363,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -374,9 +374,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -389,7 +389,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -402,7 +402,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -415,7 +415,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -428,7 +428,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -447,9 +447,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -462,7 +462,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -473,9 +473,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -486,9 +486,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -501,7 +501,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -512,9 +512,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -525,9 +525,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -538,9 +538,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -551,9 +551,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -564,9 +564,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -579,7 +579,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -592,7 +592,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -605,7 +605,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -616,9 +616,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -631,7 +631,7 @@
                 <columnType v="12" />
                 <size v="32" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -644,7 +644,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -657,7 +657,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -668,9 +668,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -691,7 +691,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -704,7 +704,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -717,7 +717,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -730,7 +730,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -743,7 +743,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -756,7 +756,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -769,7 +769,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -782,7 +782,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -795,7 +795,7 @@
                 <columnType v="12" />
                 <size v="2000" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -814,9 +814,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -827,9 +827,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -842,7 +842,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -855,7 +855,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -868,7 +868,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -881,7 +881,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -894,7 +894,7 @@
                 <columnType v="12" />
                 <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -905,9 +905,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -928,7 +928,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -939,9 +939,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -952,9 +952,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -967,7 +967,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -978,9 +978,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -993,7 +993,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1004,9 +1004,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1019,9 +1019,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
-                <index v="true" />
+                <index v="false" />
                 <title></title>
                 <description></description>
               </entityFieldDb>
@@ -1032,7 +1032,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1045,7 +1045,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1058,7 +1058,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1071,7 +1071,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1084,7 +1084,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1095,9 +1095,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2004" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1118,7 +1118,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1131,7 +1131,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1144,7 +1144,7 @@
                 <columnType v="12" />
                 <size v="16" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1157,7 +1157,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <title></title>
@@ -1170,7 +1170,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1190,9 +1190,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1205,7 +1205,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1218,7 +1218,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1231,7 +1231,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1244,7 +1244,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1255,9 +1255,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1268,9 +1268,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1283,7 +1283,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1294,9 +1294,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1307,9 +1307,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1328,9 +1328,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1343,7 +1343,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1356,7 +1356,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1367,9 +1367,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1382,7 +1382,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1395,7 +1395,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -1408,7 +1408,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1419,9 +1419,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1432,9 +1432,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1445,9 +1445,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1458,9 +1458,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1473,7 +1473,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1486,7 +1486,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1499,7 +1499,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -1532,7 +1532,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1546,7 +1546,7 @@
                 <columnType v="12" />
                 <size v="15" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1560,7 +1560,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1572,9 +1572,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1586,9 +1586,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1602,7 +1602,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1616,7 +1616,7 @@
                 <columnType v="12" />
                 <size v="1023" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1628,9 +1628,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1642,9 +1642,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1658,7 +1658,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1670,9 +1670,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1686,7 +1686,7 @@
                 <columnType v="12" />
                 <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1700,7 +1700,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1714,7 +1714,7 @@
                 <columnType v="12" />
                 <size v="256" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1748,7 +1748,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1762,7 +1762,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1776,7 +1776,7 @@
                 <columnType v="1" />
                 <size v="1" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1790,7 +1790,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1804,7 +1804,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1818,7 +1818,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1852,7 +1852,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1866,7 +1866,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1880,7 +1880,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1911,10 +1911,10 @@
                 <name>CONDTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1926,9 +1926,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1942,7 +1942,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -1956,7 +1956,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -1990,7 +1990,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2004,7 +2004,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2018,7 +2018,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2052,7 +2052,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2063,10 +2063,10 @@
                 <name>ASSIGNABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2080,7 +2080,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2092,9 +2092,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2108,7 +2108,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2140,9 +2140,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2154,9 +2154,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2170,7 +2170,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2182,9 +2182,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2198,7 +2198,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2210,9 +2210,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2224,9 +2224,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2256,12 +2256,12 @@
               <entityFieldDb>
                 <name>DATAID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -2274,7 +2274,7 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2286,9 +2286,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
-                <size v="2147483647" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2302,7 +2302,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2314,9 +2314,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2350,9 +2350,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2362,9 +2362,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2378,9 +2378,9 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2628,9 +2628,9 @@
                 <columnType v="1" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2642,9 +2642,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2656,9 +2656,9 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -2764,9 +2764,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2778,9 +2778,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2792,9 +2792,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2808,7 +2808,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2822,7 +2822,7 @@
                 <columnType v="12" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2834,9 +2834,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2850,7 +2850,7 @@
                 <columnType v="12" />
                 <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -2864,7 +2864,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2878,7 +2878,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2890,9 +2890,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2906,7 +2906,7 @@
                 <columnType v="12" />
                 <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2918,9 +2918,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -2940,9 +2940,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2953,9 +2953,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2968,7 +2968,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -2981,7 +2981,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title></title>
@@ -2994,7 +2994,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3007,7 +3007,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3020,7 +3020,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3033,7 +3033,7 @@
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3044,9 +3044,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3057,9 +3057,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3070,9 +3070,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
-                <size v="10" />
+                <size v="0" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3083,9 +3083,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <title></title>
@@ -3118,7 +3118,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -3132,7 +3132,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3146,7 +3146,7 @@
                 <columnType v="12" />
                 <size v="256" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3160,7 +3160,7 @@
                 <columnType v="1" />
                 <size v="46" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3194,7 +3194,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3208,7 +3208,7 @@
                 <columnType v="12" />
                 <size v="64" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3222,7 +3222,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -3236,6 +3236,1324 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_ICONS</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>BINDATA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <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="93" />
+                <size v="0" />
+                <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="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <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="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ICON_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</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>USER_NEW</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>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_MAILREPOSIT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>FLAGGED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FOLDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECEIVEDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECIPIENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="2046" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SEEN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENTDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUBJECT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_MAILREPOSIT_HASH</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>MAILHASH</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="31" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILINFO</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_CALENDARSYNC</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>LASTMODIFIED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MASTERUID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SLAVEUID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUSER</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_UIDRESOLVER</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>ENTRY_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ENTRY_UID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ENTRY_USER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_FARM</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLIENTS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FARMVERSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="12" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LICENSE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENCODING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SERVERID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKLOAD</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_FARM_CLIENT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>CHARACTERISTIC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CLIENTID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SERVERID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USERNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_AUDIT</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>ACOLUMNNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ALIAS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATABLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>AUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_BLOB</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_CLOB</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATASETNEWVALUE_STRING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1023" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTIME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGWRITERUID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SQLACTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_SYNCSLAVES</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <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="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEVICEID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="40" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTERVALL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LASTSYNC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SLAVEUID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_XMPP_OFFLINESTANZA</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STANZA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_XMPP_HISTORY</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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>ATIMESTAMP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHATMARKER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="16" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID_FROM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>JID_TO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MSGMARKER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MSGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="16" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STANZA</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_VERSIONHISTORY</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="0" />
+            <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_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="0" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OPERATION_DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OPERATION_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TABLE_NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VERSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 1cdffd7223648bab029e0f8bcb9024abe867b04a..67fea87c6b342c576f58aa9afbaeaec8940b567c 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -336,6 +336,10 @@
                 <name>District</name>
                 <kind v="10077" />
               </entityNode>
+              <entityNode>
+                <name>SalesprojectPhaseDefinition</name>
+                <kind v="10077" />
+              </entityNode>
             </childNodes>
           </entityNode>
         </childNodes>
diff --git a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a2e7566be13d80bdeb1b4a29dc61ecfaec1fb4ff
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
@@ -0,0 +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.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>ChecklistEntryValue_entity</name>
+  <title>Checklist entries</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQL</icon>
+  <imageProcess>%aditoprj%/entity/ChecklistEntryValue_entity/imageProcess.js</imageProcess>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>CHECKLISTENTRYVALUEID</name>
+    </entityField>
+    <entityField>
+      <name>CHECKLISTENTRY_ID</name>
+      <title>Checklist entry</title>
+      <state>READONLY</state>
+      <displayValueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>OBJECT_ROWID</name>
+    </entityField>
+    <entityField>
+      <name>OBJECT_TYPE</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/object_type/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>IS_FULFILLED</name>
+      <contentType>BOOLEAN</contentType>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+    </entityField>
+    <entityParameter>
+      <name>ObjectRowId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ChecklistId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>ChecklistEntryValues</name>
+      <titlePlural>Checklist entries</titlePlural>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7eae9b1e-cea7-4688-898a-754dba82eac7</name>
+          <entityName>ChecklistEntry_entity</entityName>
+          <fieldName>ChecklistEntryValues</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>d4bddebc-b38b-46dc-8bb8-5ffa4fbdf627</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>ChecklistEntryValues</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityParameter>
+      <name>Verifier_param</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/verifier_param/valueProcess.js</valueProcess>
+    </entityParameter>
+    <entityParameter>
+      <name>VerifierFnName_param</name>
+    </entityParameter>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityActionGroup>
+      <name>setChecklistEntryCompleted</name>
+      <state>AUTO</state>
+      <stateProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/stateProcess.js</stateProcess>
+      <children>
+        <entityActionField>
+          <name>setCompleted</name>
+          <title>Set completed</title>
+          <onActionProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>NEON:MQL</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityField>
+      <name>type</name>
+      <title>Type</title>
+      <valueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/type/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onUpdate>%aditoprj%/entity/ChecklistEntryValue_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CHECKLISTENTRY_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CHECKLISTENTRYVALUEID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>IS_FULFILLED.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>USER_NEW.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a0b46b8b1fe9519eeec33585163ca74d1a2ebab
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/checklistentry_id/displayValueProcess.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("ChecklistEntryRegistry_basic");
+import("Util_lib");
+import("Sql_lib");
+
+
+var checklistEntryId = vars.get("$field.CHECKLISTENTRY_ID");
+var verfierFnName = newSelect("TITLE", "Data_alias")
+                            .from("CHECKLISTENTRY")
+                            .where("CHECKLISTENTRY.CHECKLISTENTRYID", checklistEntryId)
+                            .cell();
+var verifierFn = $ChecklistEntryRegistry[verfierFnName];
+var displayValue;
+
+if (Utils.isFunction(verifierFn))
+    displayValue = verifierFn().title;
+else{
+    displayValue = translate.text(verfierFnName);
+}
+
+result.string(displayValue);
+
+
diff --git a/entity/ChecklistEntryValue_entity/entityfields/object_type/valueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf41a5d0a18af79415a71643a793880b25ec5ec0
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/object_type/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js b/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4684843918c7813b0de9c2057d3b93650301dacf
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+
+newWhere("CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID", "$field.CHECKLISTENTRYVALUEID")
+    .updateFields({"IS_FULFILLED":1});
+        
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/stateProcess.js b/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e756de19ae758e0f6d61a377c1f25181a31d598
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+
+if (vars.get("$field.type") == $KeywordRegistry.checklistEntryType$auto())
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
+
+if (vars.get("$field.type") == $KeywordRegistry.checklistEntryType$manual())
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/entityfields/type/displayValueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..574355fa5aa6c81739dff0c6bc2884eed8ac0829
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/type/displayValueProcess.js
@@ -0,0 +1,7 @@
+import("Keyword_lib");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.checklistEntryType(), vars.get("$field.type")));
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/entityfields/type/valueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..08c466c3be65f8e64bb5f7d594ce20fca8db8891
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/type/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+
+var checklistEntryId = vars.get("$field.CHECKLISTENTRY_ID");
+
+if (checklistEntryId)
+{
+    var type = newSelect("TYPE")
+                .from("CHECKLISTENTRY")
+                .where("CHECKLISTENTRY.CHECKLISTENTRYID", checklistEntryId)
+                .cell(); 
+
+    result.string(type);
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/entityfields/verifier_param/valueProcess.js b/entity/ChecklistEntryValue_entity/entityfields/verifier_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd99ebeed2027694251b6959689c55508a87b6bb
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/entityfields/verifier_param/valueProcess.js
@@ -0,0 +1,14 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+import("ChecklistEntryRegistry_basic");
+
+
+var fnName = vars.get("$param.VerifierFnName_param");
+var objectRowId = vars.get("$param.ObjectRowId_param");
+var isFulfilledFn = $ChecklistEntryRegistry[fnName];
+
+if (Utils.isFunction(isFulfilledFn))
+    result.string(isFulfilledFn().verifierFn(objectRowId));
+
+
diff --git a/entity/ChecklistEntryValue_entity/imageProcess.js b/entity/ChecklistEntryValue_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..de02e652cc1d7938b9675e6e39e10f2e0b1d04c3
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/imageProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.result");
+
+
+var image;
+var isFulfilled = vars.get("$field.IS_FULFILLED");
+
+if (isFulfilled == 1)
+{
+    image = "NEON:MQL";
+}
+
+result.string(image);
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4727ac92281bcd2d31273ffa81fe95efe7a12786
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,95 @@
+import("system.result");
+import("system.vars");
+import("system.util");
+import("system.db");
+import("KeywordRegistry_basic");
+import("Util_lib");
+import("Sql_lib");
+
+
+var newUid;
+var isExistent;
+var checklistEntryIds = [];
+var preparedStatements = [];
+var checklistEntryValues = [];
+var manualChecklistEntries = [];
+var manualChecklistEntryValues = [];
+var cols = ["CHECKLISTENTRYVALUEID", "CHECKLISTENTRY_ID", "OBJECT_ROWID", "OBJECT_TYPE", 
+                "IS_FULFILLED", "USER_NEW", "USER_EDIT", "DATE_NEW", "DATE_EDIT"];
+
+var checklistId = vars.get("$param.ChecklistId_param");
+var objectRowId = vars.get("$param.ObjectRowId_param");
+//var objectType = vars.get("$param.ObjectType_param"); - necessary?
+var checklistEntries = [];
+if (checklistId)
+{
+    checklistEntries = newSelect("CHECKLISTENTRYID, CHECKLIST_ID, TITLE, TYPE, USER_NEW, USER_EDIT, DATE_NEW, DATE_EDIT")
+                            .from("CHECKLISTENTRY")
+                            .where("CHECKLISTENTRY.CHECKLIST_ID", checklistId)
+                            .table();
+                            
+    checklistEntries.forEach(function(pRow){
+        if (pRow[0]) 
+        {
+            checklistEntryIds.push(pRow[0]);
+        }
+    });
+}
+
+for (i = 0; i < checklistEntries.length; i++) 
+{
+    for (j = 0; j < checklistEntries[i].length; j++) 
+    {
+        checklistEntryValues[i] = new Array(10);
+
+        if (checklistEntries[i][3] == $KeywordRegistry.checklistEntryType$auto())
+        {
+            newUid = util.getNewUUID();
+            vars.set("$param.VerifierFnName_param", checklistEntries[i][2]);
+            checklistEntryValues[i] = [newUid, checklistEntries[i][0], newUid, "", vars.get("$sys.date"), 
+                                        Utils.toBoolean(vars.get("$param.Verifier_param")) ? 1 : 0, objectRowId,
+                                        "", "null", vars.get("$sys.user")];
+        }
+        else 
+        {
+            isExistent = newSelect("CHECKLISTENTRYVALUEID, CHECKLISTENTRY_ID, CHECKLISTENTRYVALUEID,\n\
+                                                DATE_EDIT, DATE_NEW, IS_FULFILLED, OBJECT_ROWID, OBJECT_TYPE, USER_EDIT, USER_NEW")
+                                    .from("CHECKLISTENTRYVALUE")
+                                    .where("CHECKLISTENTRYVALUE.CHECKLISTENTRY_ID", checklistEntries[i][0])
+                                    .and("CHECKLISTENTRYVALUE.OBJECT_ROWID", objectRowId)
+                                    .arrayRow();
+            if (isExistent.length > 0)
+            {
+                checklistEntryValues[i] = isExistent;
+            }
+            else
+            {
+                newUid = util.getNewUUID();
+                checklistEntryValues[i] = [newUid, checklistEntries[i][0], newUid, "", vars.get("$sys.date"), "0", objectRowId, "", 
+                                            "null", vars.get("$sys.user")];
+                isExistent = preparedStatements.some(function(pPreparedStatement){
+                    return pPreparedStatement[3].includes(checklistEntries[i][0]) && pPreparedStatement[3].includes(objectRowId);
+                });
+                
+                if (!isExistent)
+                {
+                    preparedStatements.push(["CHECKLISTENTRYVALUE", 
+                                            cols,
+                                            db.getColumnTypes("CHECKLISTENTRYVALUE", cols),
+                                            [checklistEntryValues[i][0],
+                                                checklistEntryValues[i][1],
+                                                checklistEntryValues[i][6],
+                                                checklistEntryValues[i][7],
+                                                checklistEntryValues[i][5].toString(),
+                                                checklistEntryValues[i][9],
+                                                checklistEntryValues[i][8],
+                                                checklistEntryValues[i][4],
+                                                checklistEntryValues[i][3]]]);
+                }
+            }
+        }
+    }
+} 
+
+db.inserts(preparedStatements, "Data_alias");
+result.object(checklistEntryValues);
\ No newline at end of file
diff --git a/entity/ChecklistEntryValue_entity/recordcontainers/jdito/onUpdate.js b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..666ee575b4538a2df8721203cf2feaea2a61158e
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,10 @@
+import("Sql_lib");
+import("system.vars");
+
+var changed = vars.get("$local.changed");
+
+if(changed)
+{
+    newWhere("CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID", "$field.CHECKLISTENTRYVALUEID")
+        .updateFields({"IS_FULFILLED" : vars.get("$field.IS_FULFILLED")});
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod b/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..22d41d9dd884232153e5ae210c532b72df52a8c3
--- /dev/null
+++ b/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>ChecklistEntry_entity</name>
+  <title>Checklist entries</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQL</icon>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>CHECKLISTENTRYID</name>
+      <displayValueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/checklistentryid/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Title</title>
+      <dropDownProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js</dropDownProcess>
+      <displayValueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <dropDownProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js</dropDownProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>ChecklistEntries</name>
+      <dependencies>
+        <entityDependency>
+          <name>84d5df6b-1aff-4ab2-88a5-fd3b591916ce</name>
+          <entityName>Checklist_entity</entityName>
+          <fieldName>ChecklistEntries</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>9134e842-dac3-4f09-9e03-f71827b15fcf</name>
+          <entityName>SalesprojectPhaseDefinition_entity</entityName>
+          <fieldName>ChecklistEntries</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>CHECKLIST_ID</name>
+      <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/checklist_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ChecklistUid_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>ChecklistEntryValues</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ChecklistEntryValue_entity</entityName>
+        <fieldName>ChecklistEntryValues</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ChecklistId_param</name>
+          <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentryuid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ChecklistEntryType_param</name>
+          <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentrytype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CHECKLISTENTRYID.value</name>
+          <recordfield>CHECKLISTENTRY.CHECKLISTENTRYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CHECKLISTENTRY.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CHECKLISTENTRY.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>CHECKLISTENTRY.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TYPE.value</name>
+          <recordfield>CHECKLISTENTRY.TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CHECKLISTENTRY.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CHECKLISTENTRY.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CHECKLIST_ID.value</name>
+          <recordfield>CHECKLISTENTRY.CHECKLIST_ID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>65224b99-e70c-49fb-955e-ee5bca837d6c</name>
+          <tableName>CHECKLISTENTRY</tableName>
+          <primaryKey>CHECKLISTENTRYID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ChecklistEntry_entity/entityfields/checklist_id/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/checklist_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..31aabdc692618a256df1bd91be2ae64c0cad7d99
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/checklist_id/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$param.ChecklistUid_param"));
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/checklistentryid/displayValueProcess.js b/entity/ChecklistEntry_entity/entityfields/checklistentryid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentrytype_param/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentrytype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ea6cd9699911073e0808318a9964c2cfa6bcabc
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentrytype_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.TYPE"));
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentryuid_param/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentryuid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db36b115945826bd4ba67b94ed06f99fb4e2daf5
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/checklistentryvalues/children/checklistentryuid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.CHECKLISTENTRYID"));
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/date_edit/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1325e54818a2ef8aef43c452e840cf0e00a340b
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..557358ecb61b3de637a1a916a37929ca88fc9563
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js b/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9d9117ecefc66d14394164cab6b1ca390a67c50
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("KeywordRegistry_basic");
+
+var title = vars.get("$field.TITLE");
+
+if (vars.get("$field.TYPE") == $KeywordRegistry.checklistEntryType$manual())
+{
+    result.string(translate.text(title));
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js b/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a7f1a267bc366a0da3a7c3a5a68cc21f418479a
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/title/dropDownProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("ChecklistEntryRegistry_basic");
+
+
+if (vars.get("$field.TYPE") == $KeywordRegistry.checklistEntryType$auto())
+{
+    result.object($ChecklistEntryRegistry.getEntryList());
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js b/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3b2df2523349e9e5fe6e9ac8d8b8f712aed3bec
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/type/dropDownProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.object({"MANUAL":translate.text("Manually"), "AUTO":translate.text("Automatically")});
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..de5a4ba34e5e6a1abd7ba5be9d69d59f7f05330f
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js b/entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2c237153fee057be773b3a43d34c443734039e5
--- /dev/null
+++ b/entity/ChecklistEntry_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js b/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c25101de02357ff096464daebd0cb512ce138c8
--- /dev/null
+++ b/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+
+var checklistId = vars.get("$param.ChecklistUid_param");
+var cond = newWhere();
+
+if (checklistId) 
+{
+    cond.and("CHECKLISTENTRY.CHECKLIST_ID", checklistId);
+}
+else
+{
+    cond.and("1 = 2");
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Checklist_entity/Checklist_entity.aod b/entity/Checklist_entity/Checklist_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b0e4120919d1d45da413523b4211b2614aee6def
--- /dev/null
+++ b/entity/Checklist_entity/Checklist_entity.aod
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>Checklist_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQC</icon>
+  <siblings />
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>CHECKLISTID</name>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Checklists</name>
+      <documentation>%aditoprj%/entity/Checklist_entity/entityfields/checklists/documentation.adoc</documentation>
+    </entityProvider>
+    <entityConsumer>
+      <name>ChecklistEntries</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ChecklistEntry_entity</entityName>
+        <fieldName>ChecklistEntries</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CHECKLISTID.value</name>
+          <recordfield>CHECKLIST.CHECKLISTID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>CHECKLIST.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>CHECKLIST.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>CHECKLIST.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>CHECKLIST.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>6151d9b7-6253-459b-953d-027710b120d7</name>
+          <tableName>CHECKLIST</tableName>
+          <primaryKey>CHECKLISTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Checklist_entity/entityfields/checklists/documentation.adoc b/entity/Checklist_entity/entityfields/checklists/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Checklist_entity/entityfields/date_edit/valueProcess.js b/entity/Checklist_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1325e54818a2ef8aef43c452e840cf0e00a340b
--- /dev/null
+++ b/entity/Checklist_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/Checklist_entity/entityfields/date_new/valueProcess.js b/entity/Checklist_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..557358ecb61b3de637a1a916a37929ca88fc9563
--- /dev/null
+++ b/entity/Checklist_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/Checklist_entity/entityfields/user_edit/valueProcess.js b/entity/Checklist_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..de5a4ba34e5e6a1abd7ba5be9d69d59f7f05330f
--- /dev/null
+++ b/entity/Checklist_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/Checklist_entity/entityfields/user_new/valueProcess.js b/entity/Checklist_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2c237153fee057be773b3a43d34c443734039e5
--- /dev/null
+++ b/entity/Checklist_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 8e08714b5b06f1bad56c3ccc46180c98b2834bb9..bf268433896166578abaca1690ac9bf8828d0e21 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -174,7 +174,7 @@
       <name>KeywordPhases</name>
       <dependency>
         <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
+        <entityName>ChecklistEntryValue_entity</entityName>
         <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 05f9a02634c74252636b1d88133b199ed6d5938e..f383615eacc92d4fc32d003efc8a50758297d222 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -320,12 +320,6 @@
           <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>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
           <entityName>Task_entity</entityName>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 588b0ea8bfcf2eaaa0af530ae3eeebb14d2c03e6..f23b992662fc5e5a3e3fdbd5051297a8a4b2b55d 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -436,6 +436,7 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <isFilterable v="true" />
+      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/Member_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
diff --git a/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..45e202711ccfea29c3cb7b2998bd17d41cf6c287
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>SalesprojectPhaseDefinition_entity</name>
+  <title>Salesproject phases</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:LIST_UL</icon>
+  <siblings />
+  <iconIdProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/iconIdProcess.js</iconIdProcess>
+  <imageProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/imageProcess.js</imageProcess>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>SALESPROJECTPHASETRAITDEFINITIONID</name>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PHASE</name>
+      <title>Phase</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/dropDownProcess.js</dropDownProcess>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/onValidation.js</onValidation>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectUid_param</name>
+      <expose v="false" />
+    </entityParameter>
+    <entityParameter>
+      <name>SalesprojectPhaseId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>SalesprojectPhaseDefinitions</name>
+      <lookupIdfield>SALESPROJECTPHASETRAITDEFINITIONID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>1d8760d0-186d-411d-a84e-dc82556ad722</name>
+          <entityName>SalesprojectPhaseTrait_entity</entityName>
+          <fieldName>SalesprojectPhaseDefinitions</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityFieldGroup>
+      <name>SalesprojectPhaseFullname</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/salesprojectphasefullname/valueProcess.js</valueProcess>
+      <fields>
+        <element>PHASE</element>
+      </fields>
+    </entityFieldGroup>
+    <entityConsumer>
+      <name>ChecklistEntries</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ChecklistEntry_entity</entityName>
+        <fieldName>ChecklistEntries</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ChecklistUid_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CHECKLIST_ID</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>traitCount</name>
+      <title>Traits</title>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <onDBInsert>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CHECKLIST_ID.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.CHECKLIST_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.PHASE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHASE.displayValue</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.PHASE</recordfield>
+          <expression>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECTPHASETRAITDEFINITIONID.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.SALESPROJECTPHASEDEFINITIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>6b48c807-5948-41ff-a5b5-b1556db01c3e</name>
+          <tableName>SALESPROJECTPHASEDEFINITION</tableName>
+          <primaryKey>SALESPROJECTPHASEDEFINITIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d1a3077043fd3b0444e1f1a87839cc1d5844519
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/checklist_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.util");
+
+
+if (!vars.get("$field.CHECKLIST_ID")) 
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..91d7fc39bc8d5ad5a55eb72f53dff893886aac9e
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/checklistentries/children/checklistuid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.CHECKLIST_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b3fffc0c63f47083ae49e08b9b746227c628443
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4e0581883113b47c4aa2ecf96fcb2258bf87768
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/displayValueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..909b87ff774205c98165542547d1286c455092f8
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")));
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/dropDownProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..268d3b2dc5db832a404d50b25a958a9e216b8d27
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/dropDownProcess.js
@@ -0,0 +1,27 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("Sql_lib");
+
+
+var salesprojectPhases = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.salesprojectPhase());
+var dropDownEntries = [];
+var counter = 0;
+
+var exisitingPhases = newSelect("PHASE")
+                        .from("SALESPROJECTPHASEDEFINITION")
+                        .arrayColumn();
+
+salesprojectPhases.forEach(function(pSalesprojectPhase){
+    
+    var isExistent = exisitingPhases.includes(pSalesprojectPhase[0]);
+    
+    if (!isExistent || (vars.get("$field.PHASE") == pSalesprojectPhase[0])) {
+        dropDownEntries[counter] = [pSalesprojectPhase[0], pSalesprojectPhase[1]];
+    }
+    
+    counter++;
+});
+
+result.object(dropDownEntries);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/onValidation.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..61a58a68724cade1ca65ed289ed9a56594c2ab5c
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/phase/onValidation.js
@@ -0,0 +1,24 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("system.neon");
+import("Sql_lib");
+
+
+var thisValue = vars.get("$this.value");
+
+if(thisValue != null && thisValue != "" && 
+    vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW &&
+    thisValue != vars.get("$field.PHASE"))
+{
+   var isExistent = newSelect("COUNT(*)")
+                    .from("SALESPROJECTPHASEDEFINITION")
+                    .where("SALESPROJECTPHASEDEFINITION.SALESPROJECTPHASE", localValue)
+                    .cell();
+    
+    if (isExistent > 0)
+    {
+        result.string(translate.text("For this salesproject phase are already traits defined."));
+    }
+}
+                    
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/salesprojectphasefullname/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/salesprojectphasefullname/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..75192dbbe5da1c412c31fb25d1849b2b6572b455
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/salesprojectphasefullname/valueProcess.js
@@ -0,0 +1,36 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+var salesprojectPhase = vars.get("$field.PHASE");
+var longForm = "";
+
+switch(salesprojectPhase){
+    case $KeywordRegistry.salesprojectPhase$mal():
+        longForm = "Marketing Accepted Lead";
+        break;
+    case $KeywordRegistry.salesprojectPhase$mql():
+        longForm = "Marketing Qualified Lead";
+        break;
+    case $KeywordRegistry.salesprojectPhase$nego():
+        longForm = "Negotiation";
+        break;
+    case $KeywordRegistry.salesprojectPhase$nqc():
+        longForm = "Non Qualified Contact";
+        break;
+    case $KeywordRegistry.salesprojectPhase$offer():
+        longForm = "Offer";
+        break;
+    case $KeywordRegistry.salesprojectPhase$sal():
+        longForm = "Sales Accepted Lead";
+        break;
+    case $KeywordRegistry.salesprojectPhase$sqo():
+        longForm = "Sales Qualified Offer";
+        break;
+    case $KeywordRegistry.salesprojectPhase$mqc():
+        longForm = "Marketing Qualified Contact";
+        break;
+}
+
+result.string(longForm);
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2430c974f84383660f14bef9d6b4a6d943eae10
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/traitcount/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+
+var traitCounting = newSelect("COUNT(*)")
+                        .from("CHECKLISTENTRY")
+                        .where("CHECKLISTENTRY.CHECKLIST_ID", vars.get("$field.CHECKLIST_ID"))
+                        .cell();
+
+result.string(traitCounting);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a55cb327464d6def9b94735913c25ffb5e4328ef
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1411b9ac93e217a76a876371a2609ff9464f4997
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/iconIdProcess.js b/entity/SalesprojectPhaseDefinition_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b647759848390c03032e49219e04c68b5f8cf93f
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.PHASE").substr(vars.getString("$field.PHASE").indexOf("PHASE",0)+5, vars.getString("$field.PHASE").length).trim());
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/onDBInsert.js b/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2501480abe5308c33ececdd86eb5f91ab7c59ed
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.entities");
+
+var rowData = vars.get("$local.rowdata");
+var creatingConf = entities.createConfigForAddingRows()
+                                .entity("Checklist_entity")
+                                .fieldValues({
+                                    "CHECKLISTID" : rowData["SALESPROJECTPHASEDEFINITION.CHECKLIST_ID"],
+                                    "USER_NEW" : vars.get("$sys.user"),
+                                    "DATE_NEW" : vars.get("$sys.date")
+                                });
+entities.createRow(creatingConf);
diff --git a/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c566f14a5d945b383ff38cbe41f3b3dc01cb1c9f
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+var resolvingSql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECTPHASEDEFINITION.SALESPROJECTPHASE");
+//var sql = "case when SALESPROJECT_PHASE = '" + $KeywordRegistry.salesprojectPhase$offer() + "' THEN 'Offer' ELSE (" + resolvingSql.toString() + ") end";
+
+result.string(resolvingSql);
diff --git a/entity/SalesprojectPhaseTrait_entity/SalesprojectPhaseTrait_entity.aod b/entity/SalesprojectPhaseTrait_entity/SalesprojectPhaseTrait_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4531ef3cf55f9dc68eec7692d8b0f65c1a8507e8
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/SalesprojectPhaseTrait_entity.aod
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>SalesprojectPhaseTrait_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:PUZZLE</icon>
+  <siblings />
+  <titlePlural>Traits</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <lookupIdfield>SALESPROJECTPHASETRAITID</lookupIdfield>
+      <dependencies>
+        <entityDependency>
+          <name>0fdad3f9-2d6e-42a5-8257-9ca14b635ec3</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>SalesprojectPhaseTraits</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>SALESPROJECTPHASETRAITID</name>
+    </entityField>
+    <entityField>
+      <name>TRAIT</name>
+      <title>Trait</title>
+      <dropDownProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/trait/dropDownProcess.js</dropDownProcess>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/trait/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValueChange.js</onValueChange>
+      <onValidation>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>VALUE</name>
+      <documentation>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/value/documentation.adoc</documentation>
+      <title>Value</title>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/value/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/value/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>salesprojectPhaseId</name>
+    </entityField>
+    <entityConsumer>
+      <name>SalesprojectPhaseDefinitions</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SalesprojectPhaseDefinition_entity</entityName>
+        <fieldName>SalesprojectPhaseDefinitions</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>SalesprojectPhaseTraits</name>
+      <lookupIdfield>SALESPROJECTPHASETRAITID</lookupIdfield>
+    </entityProvider>
+    <entityField>
+      <name>SALESPROJECTPHASEDEFINITION_ID</name>
+      <consumer>SalesprojectPhaseDefinitions</consumer>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinition_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>SalesprojectPhaseDefinitionUid_param</name>
+      <expose v="true" />
+      <mandatory v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>IsManualTrait_param</name>
+    </entityParameter>
+    <entityField>
+      <name>IS_FULFILLED</name>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+      <title>Type</title>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/entityfields/type/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/SalesprojectPhaseTrait_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECTPHASETRAITID.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.SALESPROJECTPHASETRAITID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TRAIT.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.TRAIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>VALUE.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.VALUE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALESPROJECTPHASEDEFINITION_ID.value</name>
+          <recordfield>SALESPROJECTPHASETRAIT.SALESPROJECTPHASEDEFINITION_ID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>6a0311f9-8c94-42fd-a12a-420f986e88b4</name>
+          <tableName>SALESPROJECTPHASETRAIT</tableName>
+          <primaryKey>SALESPROJECTPHASETRAITID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/date_edit/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4e0581883113b47c4aa2ecf96fcb2258bf87768
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/date_new/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4e0581883113b47c4aa2ecf96fcb2258bf87768
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinition_id/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinition_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc3f78e43441a3f148523bfe4e152ca4a6cce810
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinition_id/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$param.SalesprojectPhaseDefinitionUid_param"));
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinitions/children/salesprojectphasetraituid/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinitions/children/salesprojectphasetraituid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7bcfa15b270992d3d55b6a8d971901c38457d7c3
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/salesprojectphasedefinitions/children/salesprojectphasetraituid/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECTPHASETRAITID"));
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/trait/displayValueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7028cba4c9080c7ff7358700b795dea452c11476
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/displayValueProcess.js
@@ -0,0 +1,58 @@
+import("system.logging");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+
+var value = vars.get("$field.TRAIT");
+var displayValue = "";
+
+if (value != null && value != "")
+{
+    switch (value){
+        case "TOUCHPOINT":
+            displayValue = translate.text("Touchpoint");
+            break;
+        case "PROJECTEAMROLE_PROJECTMANAGER":
+            displayValue = translate.text("Project team: \"Project manager\"");
+            break;
+        case "VOLUME":
+            displayValue = translate.text("Volume");
+            break;
+        case "PROJECTSTART":
+            displayValue = translate.text("Project start");
+            break;
+        case "CLASSIFICATIONFIELDS":
+            displayValue = translate.text("Classification fields");
+            break;
+        case "PROJECTEAMROLE_INTERNALDISTRIBUTION":
+            displayValue = translate.text("Project team: \"Internal distribution\"");
+            break;
+        case "PROJECTTEAMROLES":
+            displayValue = translate.text("Project team roles");
+            break;
+        case "OFFEREXISTS":
+            displayValue = translate.text("Offer exists");
+            break;
+        case "PROJECTSTART12MONTHS":
+            displayValue = translate.text("Project start within next 12 months");
+            break;
+        case "OFFERSENT":
+            displayValue = translate.text("Offer sent");
+            break;
+        case "PROBABILITY100":
+            displayValue = translate.text("Probability: 100%");
+            break;
+        case "STATUSWON":
+            displayValue = translate.text("Status: \"won\"");
+            break;
+        case "CONTRACT":
+            displayValue = translate.text("Contract");
+            break;
+        case "MANUALLY":
+            displayValue = translate.text(vars.get("$field.VALUE"));
+            break;
+    }
+    
+    result.string(displayValue);
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/trait/dropDownProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e66c7c5e8622edca85f9a3faafc5985ab4bb3e6
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/dropDownProcess.js
@@ -0,0 +1,26 @@
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.project");
+import("system.translate");
+import("KeywordRegistry_basic");
+
+
+var dropDownEntries = [
+    ["TOUCHPOINT",translate.text("Touchpoint")],
+    ["PROJECTEAMROLE_PROJECTMANAGER", translate.text("Project team: \"Project manager\"")],
+    ["VOLUME", translate.text("Volume")],
+    ["PROJECTSTART", translate.text("Project start")],
+    ["CLASSIFICATIONFIELDS", translate.text("Classification fields")],
+    ["PROJECTEAMROLE_INTERNALDISTRIBUTION", translate.text("Project team: \"Internal distribution\"")],
+    ["PROJECTTEAMROLES", translate.text("Project team roles")],
+    ["OFFEREXISTS", translate.text("Offer exists")],
+    ["PROJECTSTART12MONTHS", translate.text("Project start within next 12 months")],
+    ["OFFERSENT", translate.text("Offer sent")],
+    ["PROBABILITY100", translate.text("Probablity: 100%")],
+    ["STATUSWON", translate.text("Status: \"won\"")],
+    ["CONTRACT", translate.text("Contract")],
+    ["MANUALLY", translate.text("Manually")]
+];
+
+result.object(dropDownEntries);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValidation.js b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ac38f73a27bc884f247828ac59350918a99f51d
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValidation.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+if (!vars.exists("$field.salesprojectPhaseId") && vars.get("$field.salesprojectPhaseId"))
+{
+    result.string(translate.text("Please select a salesproject phase."));
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValueChange.js b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..c0ee6521359f88dd8b757f0ae2320abeec2f2ba3
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/trait/onValueChange.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.project");
+import("system.result");
+import("system.neon");
+
+
+if (vars.get("$this.value") == "MANUALLY")
+{
+    neon.setFieldValue("$param.IsManualTrait_param", "true");
+}
+else
+{
+    neon.setFieldValue("$param.IsManualTrait_param", "false");
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/type/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/user_edit/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a55cb327464d6def9b94735913c25ffb5e4328ef
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/user_new/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1411b9ac93e217a76a876371a2609ff9464f4997
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/value/stateProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/value/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f20028d4ca452c626349b54ea79caf6938865409
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/value/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Util_lib");
+
+
+if (Utils.toBoolean(vars.get("$param.IsManualTrait_param")) 
+        || (vars.exists("$field.TRAIT") && vars.get("$field.TRAIT") == "MANUALLY"))
+{
+    result.object(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseTrait_entity/entityfields/value/valueProcess.js b/entity/SalesprojectPhaseTrait_entity/entityfields/value/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b39acf3dfeecc8f83c216e597c4b00066d2f615c
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/entityfields/value/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.vars");
+
+var value = vars.get("$field.VALUE");
+
+logging.log(value);
diff --git a/entity/SalesprojectPhaseTrait_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectPhaseTrait_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f84fd822a534ec0515961adb507c3e4cc2983b9c
--- /dev/null
+++ b/entity/SalesprojectPhaseTrait_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("system.logging");
+import("Sql_lib");
+
+
+if (vars.exists("$param.SalesprojectPhaseDefinitionUid_param") 
+    && vars.get("$param.SalesprojectPhaseDefinitionUid_param") != null)
+{
+    result.string(newWhere("SALESPROJECTPHASETRAIT.SALESPROJECTPHASEDEFINITION_ID",
+                    vars.get("$param.SalesprojectPhaseDefinitionUid_param")).toString())
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 93b68c42d5d79eb27e63bdb535179ddd456eba04..f2dc2a9c0e82235935524652e02bc1be3549d897 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -27,6 +27,7 @@
     <entityField>
       <name>ICON</name>
       <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/SalesprojectPhase_entity/entityfields/icon/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>STATE</name>
@@ -52,6 +53,14 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>DisabledPhases_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>SalesprojectUid_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/SalesprojectPhase_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectPhase_entity/recordcontainers/jdito/contentProcess.js
index a961d29c0531224c6213dc70ecd0eb509faa3e23..c66d85815d3f52def5b26491e9e6ccaff853f137 100644
--- a/entity/SalesprojectPhase_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalesprojectPhase_entity/recordcontainers/jdito/contentProcess.js
@@ -1,12 +1,16 @@
-import("Sql_lib");
 import("system.db");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 import("system.result");
 import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("Sql_lib");
+import("Util_lib");
 
-var steps = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.salesprojectPhase());
+
+var res = [];
 var ids = vars.get("$local.idvalues");
+var disabledPhases = JSON.parse(vars.get("$param.DisabledPhases_param")) || [];
+var steps = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.salesprojectPhase());
 var selected = vars.exists("$param.CurrentPhase_param") && vars.get("$param.CurrentPhase_param");
 
 // filter only for steps reqested by the system
@@ -23,14 +27,18 @@ if (ids)
     })
 }
 
-var res = [];
 steps.forEach(function ([stepId, title])
 {
-    if (ids)
-        res.push([stepId, ids.indexOf(stepId) > -1  ? "ACTIVE" : "EDITABLE", title, _getIcon(stepId)]);
-    else
-        res.push([stepId, stepId === selected ? "ACTIVE" : "EDITABLE", title, _getIcon(stepId)]);
+    var stepState = "DISABLED";
+    if (stepId === selected)
+        stepState = "ACTIVE";
+    else if (!disabledPhases.includes(stepId))
+        stepState = "EDITABLE";
+
+    var resStep = [stepId, stepState, title, _getIcon(stepId)];
+    res.push(resStep);
 });
+
 result.object(res);
 
 function _getIcon (pPhase)
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b412e2dbdef690fe3eea55ef10f70106c9ec0a86..5300b1def470341719ee94cd6b833668fef55fbe 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -279,6 +279,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>Members</name>
+      <refreshParent v="true" />
       <dependency>
         <name>dependency</name>
         <entityName>Member_entity</entityName>
@@ -510,6 +511,10 @@
           <name>PresetTitle_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>PhaseRequirementsFulfilled_parm</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityActionField>
@@ -560,6 +565,10 @@
           <name>PresetTitle_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>PhaseRequirementsFulfilled_parm</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -705,6 +714,14 @@
           <name>CurrentPhase_param</name>
           <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>SalesprojectUid_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/salesprojectuid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DisabledPhases_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/disabledphases_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityField>
@@ -734,9 +751,6 @@
         <fieldName>SpecificAttribute</fieldName>
       </dependency>
       <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-        </entityParameter>
         <entityParameter>
           <name>ParentId_param</name>
           <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/parentid_param/valueProcess.js</valueProcess>
@@ -753,6 +767,12 @@
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
+      <children>
+        <entityParameter>
+          <name>PhaseRequirementsFulfilled_parm</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityParameter>
       <name>PresetTitle_param</name>
@@ -809,6 +829,51 @@
     <entityField>
       <name>ACTIVE</name>
     </entityField>
+    <entityConsumer>
+      <name>ChecklistEntryValues</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ChecklistEntryValue_entity</entityName>
+        <fieldName>ChecklistEntryValues</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ChecklistId_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/checklistentryvalues/children/checklistid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>PhaseDisabledUids_param</name>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phasedisableduids_param/valueProcess.js</valueProcess>
+      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/phasedisableduids_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityParameter>
+      <name>PhaseRequirementsFulfilled_parm</name>
+      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/documentation.adoc</documentation>
+      <title></title>
+    </entityParameter>
+    <entityProvider>
+      <name>NoPhaseRequirementLoading</name>
+      <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/nophaserequirementloading/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>PhaseRequirementsFulfilled_parm</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/nophaserequirementloading/children/phaserequirementsfulfilled_parm/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/checklistentryvalues/children/checklistid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/checklistentryvalues/children/checklistid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d139bbd2167e2965f317440302f3484f608b65e
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/checklistentryvalues/children/checklistid_param/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+
+var checklistId = newSelect("CHECKLIST_ID")
+                        .from("SALESPROJECTPHASEDEFINITION")
+                        .where("SALESPROJECTPHASEDEFINITION.PHASE", vars.get("$field.PHASE"))
+                        .cell();
+
+result.string(checklistId);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35c86fce60207e00936f99096038f1ee1f4519e9
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/checklistentryvalues/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/nophaserequirementloading/children/phaserequirementsfulfilled_parm/valueProcess.js b/entity/Salesproject_entity/entityfields/nophaserequirementloading/children/phaserequirementsfulfilled_parm/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aa48a92d7c004d71e1191445a5c1f6766c8b7a37
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/nophaserequirementloading/children/phaserequirementsfulfilled_parm/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+//overwrite the value in the providers parameter so that the default parameter value will not be calculated
+result.string(false);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/nophaserequirementloading/documentation.adoc b/entity/Salesproject_entity/entityfields/nophaserequirementloading/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Salesproject_entity/entityfields/phase/valueProcess.js b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
index 7ff3aa7c6b2ad21f43934b9e4ff5131980b35005..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Salesproject_entity/entityfields/phase/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
@@ -1,7 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string($KeywordRegistry.salesprojectPhase$nqc());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/phasedisableduids_param/documentation.adoc b/entity/Salesproject_entity/entityfields/phasedisableduids_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..50c7caa62a1b01ac720b798474a4309a556a5cd8
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/phasedisableduids_param/documentation.adoc
@@ -0,0 +1,5 @@
+Contains a stingified array of all IDs of the phases that are gonna be disabled by the stepper component.
+There are two reasons why a single step (phase) is disabled:
+
+. Only the next step to current selected step is available
+. The next step is not available when all pre conditions (the checklist items) are no fulfilled
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/phasedisableduids_param/valueProcess.js b/entity/Salesproject_entity/entityfields/phasedisableduids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6c858840ee253227282c53265a3474d5a9044fb
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/phasedisableduids_param/valueProcess.js
@@ -0,0 +1,28 @@
+import("Keyword_lib");
+import("system.result");
+import("KeywordRegistry_basic");
+import("system.vars");
+import("Util_lib");
+
+var currentPhase = vars.get("$field.PHASE");
+var allPhasesInOrder = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.salesprojectPhase()).map(function (row){
+    return row[0];
+});
+
+var res = JSON.stringify(_getDisabledPhases(currentPhase));
+result.string(res);
+
+function _getDisabledPhases(pPhase)
+{
+    var phases = [];
+    var startIdx = allPhasesInOrder.indexOf(pPhase) + 1;//+1 to skip "ourself"
+    var requirementsForNextPhaseFulfilled = Utils.toBoolean(vars.get("$param.PhaseRequirementsFulfilled_parm"));
+    if (requirementsForNextPhaseFulfilled)
+        startIdx++;//skip the next phase to be able switch to the next phase
+    for (var i = startIdx; i < allPhasesInOrder.length; i++) 
+    {
+        phases.push(allPhasesInOrder[i]);
+    }
+    
+    return phases;
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/documentation.adoc b/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..1650b2a2441f3b1d421ef2f1b7cc23ed245867ac
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/documentation.adoc
@@ -0,0 +1,2 @@
+This param determines if all precondition have been fulfilled of the current phases checklist or not.
+Returns a boolean.
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/valueProcess.js b/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1da1efd8bcd5651e9609f671aca9ad902d1871c
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/phaserequirementsfulfilled_parm/valueProcess.js
@@ -0,0 +1,33 @@
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+var currentPhase = vars.get("$field.PHASE");
+
+result.string(_requirementsFulfilled(currentPhase));
+
+function _requirementsFulfilled(pPhase)
+{    
+    var fulFilled = true;    
+    var checklistId = newSelect("CHECKLIST_ID")
+        .from("SALESPROJECTPHASEDEFINITION")
+        .where("SALESPROJECTPHASEDEFINITION.PHASE", pPhase)
+        .cell();
+    var salesprojectId = vars.get("$field.SALESPROJECTID");
+    var loadingConf = entities.createConfigForLoadingRows()
+        .entity("ChecklistEntryValue_entity")
+        .fields(["IS_FULFILLED"])
+        .provider("ChecklistEntryValues")
+        .addParameter("ChecklistId_param", checklistId)
+        .addParameter("ObjectRowId_param", salesprojectId);
+
+    var rows = entities.getRows(loadingConf);
+    
+    rows.some(function(pRow){
+        if (pRow["IS_FULFILLED"] == 0) fulFilled = false;
+    });
+        
+    return fulFilled;
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js
index 7d27814e727ef51078645ba0c65fa52b22dc4a3d..5c51a518dd93510c15eeb34fefb2b348853b5fd0 100644
--- a/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js
@@ -1,4 +1,5 @@
-import("system.vars");
 import("system.result");
+import("system.vars");
 
+        
 result.string(vars.get("$field.PHASE"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/disabledphases_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/disabledphases_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc33444f52e2367d42bf3b55176855a684b69dc1
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/disabledphases_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.PhaseDisabledUids_param"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/salesprojectuid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/salesprojectuid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35c86fce60207e00936f99096038f1ee1f4519e9
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/salesprojectuid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 293c3a135d93671258e9e25978c8204ac6938ff6..c4b93fcd0a8601dc1b1c02fcad307d82e1495d59 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7287,36 +7287,6 @@
     <entry>
       <key>Email address</key>
     </entry>
-    <entry>
-      <key>Created from</key>
-    </entry>
-    <entry>
-      <key>12 Months</key>
-    </entry>
-    <entry>
-      <key>6 Months</key>
-    </entry>
-    <entry>
-      <key>1 Month</key>
-    </entry>
-    <entry>
-      <key>2 Weeks</key>
-    </entry>
-    <entry>
-      <key>Calendar week</key>
-    </entry>
-    <entry>
-      <key>Weekplan already exists!</key>
-    </entry>
-    <entry>
-      <key>Weekplan Info</key>
-    </entry>
-    <entry>
-      <key>requested</key>
-    </entry>
-    <entry>
-      <key>Status Appointment</key>
-    </entry>
     <entry>
       <key>#rememberme</key>
     </entry>
@@ -7614,6 +7584,69 @@
     <entry>
       <key>Verantwortlicher</key>
     </entry>
+    <entry>
+      <key>Marketing Workflow</key>
+    </entry>
+    <entry>
+      <key>Traits</key>
+    </entry>
+    <entry>
+      <key>Salesproject Phase</key>
+    </entry>
+    <entry>
+      <key>Document template</key>
+    </entry>
+    <entry>
+      <key>Kontext</key>
+    </entry>
+    <entry>
+      <key>Checklist</key>
+    </entry>
+    <entry>
+      <key>Trait</key>
+    </entry>
+    <entry>
+      <key>Salesproject phase</key>
+    </entry>
+    <entry>
+      <key>Status: \"won\"</key>
+    </entry>
+    <entry>
+      <key>Project team roles</key>
+    </entry>
+    <entry>
+      <key>Offer sent</key>
+    </entry>
+    <entry>
+      <key>Classification fields</key>
+    </entry>
+    <entry>
+      <key>Project start within next 12 months</key>
+    </entry>
+    <entry>
+      <key>Project team: \"Internal distribution\"</key>
+    </entry>
+    <entry>
+      <key>Probablity: 100%</key>
+    </entry>
+    <entry>
+      <key>Project team: \"Project manager\"</key>
+    </entry>
+    <entry>
+      <key>Offer exists</key>
+    </entry>
+    <entry>
+      <key>Its not allowed to step over some salesproject phases.</key>
+    </entry>
+    <entry>
+      <key>Salesproject phases</key>
+    </entry>
+    <entry>
+      <key>Not all prerequisites are fulfilled.</key>
+    </entry>
+    <entry>
+      <key>To skip a salesproject phase isn't allowed.</key>
+    </entry>
     <entry>
       <key>No Restrictions</key>
     </entry>
@@ -7635,6 +7668,36 @@
     <entry>
       <key>Delete this Function</key>
     </entry>
+    <entry>
+      <key>Automatically</key>
+    </entry>
+    <entry>
+      <key>Checklist entries</key>
+    </entry>
+    <entry>
+      <key>Communication strategy designed</key>
+    </entry>
+    <entry>
+      <key>Probability checked and eventually readjusted</key>
+    </entry>
+    <entry>
+      <key>Contract have been signed</key>
+    </entry>
+    <entry>
+      <key>Communication strategy introduced</key>
+    </entry>
+    <entry>
+      <key>Workshop for project-realization planned</key>
+    </entry>
+    <entry>
+      <key>Risk audit performed</key>
+    </entry>
+    <entry>
+      <key>Appointment for offer-agreement occured</key>
+    </entry>
+    <entry>
+      <key>Follow-up appointment(s) exists (e.g.: for workshops..)</key>
+    </entry>
     <entry>
       <key>Subtotal</key>
     </entry>
@@ -7654,10 +7717,7 @@
       <key>The selected Contact doesn't have an address set.</key>
     </entry>
     <entry>
-      <key>Sent offers</key>
-    </entry>
-    <entry>
-      <key>Salesproject phases</key>
+      <key>Set completed</key>
     </entry>
     <entry>
       <key>without Vat</key>
@@ -7888,7 +7948,10 @@
       <key>Adviser status</key>
     </entry>
     <entry>
-      <key>Automatically</key>
+      <key>Checklist entry</key>
+    </entry>
+    <entry>
+        <key>Automatically</key>
     </entry>
     <entry>
       <key>License</key>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 3a68e6e5ec0885aa50493c02891393b3ad7e4f9b..fc8c26f25392b4af4c8e6e4c021f63765f41883c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -18,6 +18,30 @@
       <key>Illegal Parent Operator in buildFilterObj-Function:</key>
       <value>Übergebener Operator ungültig in Funktion "buildFilterObj"</value>
     </entry>
+    <entry>
+      <key>Checklist entries</key>
+      <value>Checklisteneinträge</value>
+    </entry>
+    <entry>
+      <key>Project team: \"Project manager\"</key>
+      <value>Projektteam: \"Projektmanager\"</value>
+    </entry>
+    <entry>
+      <key>Checklist entry</key>
+      <value>Checklisteneintrag</value>
+    </entry>
+    <entry>
+      <key>Salesproject phases</key>
+      <value>Vertriebsprojektphasen</value>
+    </entry>
+    <entry>
+      <key>To skip a salesproject phase isn't allowed.</key>
+      <value>Das Ãœberspringen einer Vertriebsprojektphase ist nicht erlaubt.</value>
+    </entry>
+    <entry>
+      <key>Its not allowed to step over some salesproject phases.</key>
+      <value>Es ist nicht erlaubt Vertriebsprojektphasen zu überspringen.</value>
+    </entry>
     <entry>
       <key>Probability AI</key>
       <value>Wahrscheinlichkeit KI</value>
@@ -490,10 +514,6 @@
       <key>Priority</key>
       <value>Priorität</value>
     </entry>
-    <entry>
-      <key>Salesproject phases</key>
-      <value>Vertriebsprojektphasen</value>
-    </entry>
     <entry>
       <key>%0 new recipients will be added to the bulk mail.</key>
       <value>Der Serienmail werden %0 neue Empfänger hinzugefügt.</value>
@@ -1822,6 +1842,10 @@
       <key>Show all offers</key>
       <value>Alle Angebote anzeigen</value>
     </entry>
+    <entry>
+      <key>Project team: \"Internal distribution\"</key>
+      <value>Projektteam: \"Interner Vertrieb\"</value>
+    </entry>
     <entry>
       <key>Filetype</key>
       <value>Dateityp</value>
@@ -1871,8 +1895,7 @@
       <value>Niedrigpreisstrategie</value>
     </entry>
     <entry>
-      <key>Sent offers</key>
-      <value>Versendete Angebote</value>
+      <key>Sent Offers</key>
     </entry>
     <entry>
       <key>responsible</key>
@@ -2391,6 +2414,10 @@
       <key>Outgoing</key>
       <value>ausgehend</value>
     </entry>
+    <entry>
+      <key>Classification fields</key>
+      <value>Klassifizierungsfelder</value>
+    </entry>
     <entry>
       <key>Paraguay</key>
       <value>Paraguay</value>
@@ -3303,10 +3330,6 @@
       <key>Singapore</key>
       <value>Singapur</value>
     </entry>
-    <entry>
-      <key>Calendar week</key>
-      <value>Kalenderwoche</value>
-    </entry>
     <entry>
       <key>French Guiana</key>
       <value>Französisch-Guayana</value>
@@ -5786,10 +5809,6 @@
       <key>medium</key>
       <value>mittel</value>
     </entry>
-    <entry>
-      <key>Site visit</key>
-      <value>Besuch vor Ort</value>
-    </entry>
     <entry>
       <key>D</key>
       <value>D</value>
@@ -5930,6 +5949,10 @@
       <key>Consisted customer</key>
       <value>Bestandskunde</value>
     </entry>
+    <entry>
+      <key>Project start within next 12 months</key>
+      <value>Projektstart innerhalb nächster 12 Monate</value>
+    </entry>
     <entry>
       <key>Prospective customer</key>
       <value>Interessent</value>
@@ -5982,6 +6005,10 @@
       <key>2 big</key>
       <value>gross</value>
     </entry>
+    <entry>
+      <key>Probablity: 100%</key>
+      <value>Wahrscheinlichkeit: 100%</value>
+    </entry>
     <entry>
       <key>Weight (kg)</key>
       <value>Gewicht (kg)</value>
@@ -6904,6 +6931,10 @@
       <key>Credit</key>
       <value>Gutschrift</value>
     </entry>
+    <entry>
+      <key>Status: \"won\"</key>
+      <value>Status: \"gewonnen\"</value>
+    </entry>
     <entry>
       <key>The replacement name has to be unique.</key>
       <value>Der Ersatzname muss eindeutig sein</value>
@@ -7077,10 +7108,18 @@
       <key>Everyone</key>
       <value>Alle</value>
     </entry>
+    <entry>
+      <key>Offer exists</key>
+      <value>Angebot existiert</value>
+    </entry>
     <entry>
       <key>Salesproject member Id</key>
       <value>VertriebsprojektsteilnehmerId</value>
     </entry>
+    <entry>
+      <key>Offer sent</key>
+      <value>Angebot versendet</value>
+    </entry>
     <entry>
       <key>Edit</key>
       <value>Editieren</value>
@@ -7109,6 +7148,10 @@
       <key>To buildingnumber</key>
       <value>Bis hausnummer</value>
     </entry>
+    <entry>
+      <key>Project team roles</key>
+      <value>Projektteamrollen</value>
+    </entry>
     <entry>
       <key>Ignore daily series</key>
       <value>Tägliche Serie ignorieren</value>
@@ -7844,6 +7887,10 @@
       <key>Try to create activity automatically and ask for more information if necessary</key>
       <value>Versuche Aktivität automatisch anzulegen und fordert weitere Informationen an wenn nötig</value>
     </entry>
+    <entry>
+      <key>Not all prerequisites are fulfilled.</key>
+      <value>Es sind leider nicht alle Vorraussetzungen erfüllt.</value>
+    </entry>
     <entry>
       <key>New Appointment</key>
       <value>Neuer Termin</value>
@@ -8171,6 +8218,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Export CSV \"%0\" can now be downloaded</key>
       <value>Export CSV \"%0\" kann heruntergeladen werden</value>
     </entry>
+    <entry>
+      <key>Automatically</key>
+      <value>Automatisch</value>
+    </entry>
     <entry>
       <key>Templatename</key>
       <value>Vorlagenname</value>
@@ -9715,10 +9766,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Responsible Department</key>
       <value>zuständige Abteilung</value>
     </entry>
-    <entry>
-      <key>Weekplan already exists!</key>
-      <value>Wochenplan existiert bereits!</value>
-    </entry>
     <entry>
       <key>Shows the different conversion rates of the sales project phases</key>
       <value>zeigt die unterschiedlichen Umrechnungsraten der vertriebsprojektphasen</value>
@@ -9876,37 +9923,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Probability in %</key>
       <value>Wahrscheinlichkeit in %</value>
     </entry>
-    <entry>
-      <key>Created from</key>
-      <value>Ersteller</value>
-    </entry>
-    <entry>
-      <key>12 Months</key>
-      <value>12 Monate</value>
-    </entry>
-    <entry>
-      <key>6 Months</key>
-      <value>6 Monate</value>
-    </entry>
-    <entry>
-      <key>1 Month</key>
-      <value>1 Monat</value>
-    </entry>
-    <entry>
-      <key>2 Weeks</key>
-      <value>2 Wochen</value>
-    </entry>
-    <entry>
-      <key>Weekplan Info</key>
-    </entry>
-    <entry>
-      <key>requested</key>
-      <value>angefragt</value>
-    </entry>
-    <entry>
-      <key>Status Appointment</key>
-      <value>Status Termin</value>
-    </entry>
     <entry>
       <key>Standard City</key>
       <value>Standardstadt</value>
@@ -10154,7 +10170,22 @@ Bitte Datumseingabe prüfen</value>
       <value>Nur ganze Zahlen erlaubt</value>
     </entry>
     <entry>
-      <key>Sent Offers</key>
+      <key>Salesproject phase</key>
+      <value>Vertriebsprojektphase</value>
+    </entry>
+    <entry>
+      <key>Kontext</key>
+    </entry>
+    <entry>
+      <key>Trait</key>
+      <value>Merkmal</value>
+    </entry>
+    <entry>
+      <key>Document template</key>
+    </entry>
+    <entry>
+      <key>Traits</key>
+      <value>Merkmale</value>
     </entry>
     <entry>
       <key>Salesproject Phases</key>
@@ -10372,6 +10403,49 @@ Bitte Datumseingabe prüfen</value>
       <key>My district assignments to check</key>
       <value>Meine zu prüfenden Gebietszuweisungen</value>
     </entry>
+    <entry>
+      <key>Checklist</key>
+      <value>Checkliste</value>
+    </entry>
+    <entry>
+      <key>Salesproject Phase</key>
+    </entry>
+    <entry>
+      <key>Communication strategy designed</key>
+      <value>Kommunikationsstrategie erarbeitet</value>
+    </entry>
+    <entry>
+      <key>Probability checked and eventually readjusted</key>
+      <value>Wahrscheinlichkeit überprüfen und ggf. nachjustieren</value>
+    </entry>
+    <entry>
+      <key>Communication strategy introduced</key>
+      <value>Kommunikationsstrategie wurde vorgestellt</value>
+    </entry>
+    <entry>
+      <key>Follow-up appointment(s) exists (e.g.: for workshops..)</key>
+      <value>Folgetermin(e) existiert (z.B. für Workshops..)</value>
+    </entry>
+    <entry>
+      <key>Risk audit performed</key>
+      <value>Risikoaudit durchgeführt</value>
+    </entry>
+    <entry>
+      <key>Workshop for project-realization planned</key>
+      <value>Workshop für Projektumsetzung geplannt</value>
+    </entry>
+    <entry>
+      <key>Appointment for offer-agreement occured</key>
+      <value>Termin zur Angebotsabstimmung hat stattgefunden</value>
+    </entry>
+    <entry>
+      <key>Contract have been signed</key>
+      <value>Vertrag wurde unterschrieben</value>
+    </entry>
+    <entry>
+      <key>Set completed</key>
+      <value>Erledigt setzen</value>
+    </entry>
     <entry>
       <key>Responsible Districts</key>
     </entry>
@@ -10397,10 +10471,16 @@ Bitte Datumseingabe prüfen</value>
       <key>Adviser status</key>
     </entry>
     <entry>
-      <key>INSERT</key>
+      <key>Site visit</key>
     </entry>
     <entry>
-      <key>Automatically</key>
+      <key>Marketing Workflow</key>
+    </entry>
+    <entry>
+        <key>INSERT</key>
+    </entry>
+    <entry>
+        <key>Automatically</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 3eb5a435ae5701595e63ac37770cdc0e69031156..9e2663c010a3b996d8b52a1bbb1bc3c21a1e2881 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7350,36 +7350,6 @@
     <entry>
       <key>Probability in %</key>
     </entry>
-    <entry>
-      <key>Created from</key>
-    </entry>
-    <entry>
-      <key>12 Months</key>
-    </entry>
-    <entry>
-      <key>6 Months</key>
-    </entry>
-    <entry>
-      <key>1 Month</key>
-    </entry>
-    <entry>
-      <key>2 Weeks</key>
-    </entry>
-    <entry>
-      <key>Calendar week</key>
-    </entry>
-    <entry>
-      <key>Weekplan already exists!</key>
-    </entry>
-    <entry>
-      <key>Weekplan Info</key>
-    </entry>
-    <entry>
-      <key>requested</key>
-    </entry>
-    <entry>
-      <key>Status Appointment</key>
-    </entry>
     <entry>
       <key>Standard City</key>
     </entry>
@@ -7710,12 +7680,105 @@
     <entry>
       <key>Filter set</key>
     </entry>
+    <entry>
+      <key>Marketing Workflow</key>
+    </entry>
+    <entry>
+      <key>Traits</key>
+    </entry>
+    <entry>
+      <key>Salesproject Phase</key>
+    </entry>
+    <entry>
+      <key>Document template</key>
+    </entry>
+    <entry>
+      <key>Kontext</key>
+    </entry>
+    <entry>
+      <key>Checklist</key>
+    </entry>
+    <entry>
+      <key>Trait</key>
+    </entry>
+    <entry>
+      <key>Salesproject phase</key>
+    </entry>
+    <entry>
+      <key>Status: \"won\"</key>
+    </entry>
+    <entry>
+      <key>Project team roles</key>
+    </entry>
+    <entry>
+      <key>Offer sent</key>
+    </entry>
+    <entry>
+      <key>Classification fields</key>
+    </entry>
+    <entry>
+      <key>Project start within next 12 months</key>
+    </entry>
+    <entry>
+      <key>Project team: \"Internal distribution\"</key>
+    </entry>
+    <entry>
+      <key>Probablity: 100%</key>
+    </entry>
+    <entry>
+      <key>Project team: \"Project manager\"</key>
+    </entry>
+    <entry>
+      <key>Offer exists</key>
+    </entry>
+    <entry>
+      <key>Its not allowed to step over some salesproject phases.</key>
+    </entry>
+    <entry>
+      <key>Salesproject phases</key>
+    </entry>
+    <entry>
+      <key>Not all prerequisites are fulfilled.</key>
+    </entry>
+    <entry>
+      <key>To skip a salesproject phase isn't allowed.</key>
+    </entry>
     <entry>
       <key>The team must have at least one owner</key>
     </entry>
     <entry>
       <key>Delete this Function</key>
     </entry>
+    <entry>
+      <key>Automatically</key>
+    </entry>
+    <entry>
+      <key>Checklist entries</key>
+    </entry>
+    <entry>
+      <key>Communication strategy designed</key>
+    </entry>
+    <entry>
+      <key>Probability checked and eventually readjusted</key>
+    </entry>
+    <entry>
+      <key>Contract have been signed</key>
+    </entry>
+    <entry>
+      <key>Communication strategy introduced</key>
+    </entry>
+    <entry>
+      <key>Workshop for project-realization planned</key>
+    </entry>
+    <entry>
+      <key>Risk audit performed</key>
+    </entry>
+    <entry>
+      <key>Appointment for offer-agreement occured</key>
+    </entry>
+    <entry>
+      <key>Follow-up appointment(s) exists (e.g.: for workshops..)</key>
+    </entry>
     <entry>
       <key>Subtotal</key>
     </entry>
@@ -7735,13 +7798,13 @@
       <key>The selected Contact doesn't have an address set.</key>
     </entry>
     <entry>
-      <key>Sent offers</key>
+      <key>Set completed</key>
     </entry>
     <entry>
-      <key>Salesproject phases</key>
+      <key>without Vat</key>
     </entry>
     <entry>
-      <key>without Vat</key>
+      <key>Checklist entry</key>
     </entry>
     <entry>
       <key>Object Filter</key>
diff --git a/neonContext/Checklist/Checklist.aod b/neonContext/Checklist/Checklist.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d30de3d0d0b4d5fe7e35cf47b845d88b8034d68d
--- /dev/null
+++ b/neonContext/Checklist/Checklist.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>Checklist</name>
+  <title>Checklist</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQL</icon>
+  <entity>Checklist_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>bec4bdfb-d61d-418e-ac97-6905b00a0393</name>
+      <view>ChecklistEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2a7eb3a8-1ef9-4ecd-a302-42bd676ed24f</name>
+      <view>ChecklistFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ChecklistEntry/ChecklistEntry.aod b/neonContext/ChecklistEntry/ChecklistEntry.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7ce3bb78ee5dd96197c0fa9707ab800cbe0afb1a
--- /dev/null
+++ b/neonContext/ChecklistEntry/ChecklistEntry.aod
@@ -0,0 +1,17 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ChecklistEntry</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQL</icon>
+  <entity>ChecklistEntry_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>af6c9ce2-43e8-4076-bd78-58e54c673104</name>
+      <view>ChecklistEntryMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>53b9dc65-df64-4e1c-bf6f-4854a30bf689</name>
+      <view>ChecklistEntryList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ChecklistEntryValue/ChecklistEntryValue.aod b/neonContext/ChecklistEntryValue/ChecklistEntryValue.aod
new file mode 100644
index 0000000000000000000000000000000000000000..842a8f0eed5a50064ca7e6a3b6e3e849b5599c00
--- /dev/null
+++ b/neonContext/ChecklistEntryValue/ChecklistEntryValue.aod
@@ -0,0 +1,14 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ChecklistEntryValue</name>
+  <title>ChecklistEntryValue</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:MQL</icon>
+  <entity>ChecklistEntryValue_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>12d29401-307b-48cc-8703-a645c8c2f190</name>
+      <view>ChecklistEntryValueList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 4b997e115ae5c4e69f504b7c85f89b98a9327fb8..57dc7485b7ab4a0cf110be281c8993df2c7663ec 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -31,10 +31,6 @@
       <name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
       <view>SalesprojectMilestone_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>
@@ -75,5 +71,9 @@
       <name>079db4ee-86fc-4985-a253-249622d9f3ce</name>
       <view>SalesprojectAnalyses_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>b50928ae-ad07-40ea-87e7-4f82daf9715c</name>
+      <view>SalesprojectActivity_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/SalesprojectPhaseDefinition/SalesprojectPhaseDefinition.aod b/neonContext/SalesprojectPhaseDefinition/SalesprojectPhaseDefinition.aod
new file mode 100644
index 0000000000000000000000000000000000000000..abfe2caf79a2a03d4170a7b98c04d168ea55d936
--- /dev/null
+++ b/neonContext/SalesprojectPhaseDefinition/SalesprojectPhaseDefinition.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>SalesprojectPhaseDefinition</name>
+  <title>Salesproject phases</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:LIST_UL</icon>
+  <filterView>SalesprojectPhaseDefinitionFilter_view</filterView>
+  <editView>SalesprojectPhaseDefinitionEdit_view</editView>
+  <previewView>SalesprojectPhaseDefinitionPreview_view</previewView>
+  <devices>
+    <element>MOBILE</element>
+    <element>TABLET</element>
+    <element>DESKTOP</element>
+  </devices>
+  <entity>SalesprojectPhaseDefinition_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>41bee035-a20a-4eb1-95ba-190dbacf1c7d</name>
+      <view>SalesprojectPhaseDefinitionFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>a1eac585-06e1-4a5f-bb7b-4cbacb0710ae</name>
+      <view>SalesprojectPhaseDefinitionEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>14fcb49f-fd8c-43e4-a3e9-6e6ccd42743c</name>
+      <view>SalesprojectPhaseDefinitionPreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonView/ChecklistEdit_view/ChecklistEdit_view.aod b/neonView/ChecklistEdit_view/ChecklistEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..30049e3d38f17bc7eb5145ee1b0ad04c40f5bf4c
--- /dev/null
+++ b/neonView/ChecklistEdit_view/ChecklistEdit_view.aod
@@ -0,0 +1,16 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ChecklistEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>8499691f-153d-43ee-829e-d586255d9344</name>
+      <view>ChecklistEntryMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ChecklistEntryList_view/ChecklistEntryList_view.aod b/neonView/ChecklistEntryList_view/ChecklistEntryList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9928f472cbbf54d997ab646bf4987464c0517791
--- /dev/null
+++ b/neonView/ChecklistEntryList_view/ChecklistEntryList_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ChecklistEntryList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>titledListViewTemplate</name>
+      <titleField>TYPE</titleField>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>49ad66e3-645d-489a-8bf8-d56645cf5465</name>
+          <entityField>TITLE</entityField>
+          <fullWidth v="true" />
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ChecklistEntryMultiEdit_view/ChecklistEntryMultiEdit_view.aod b/neonView/ChecklistEntryMultiEdit_view/ChecklistEntryMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5aa3bfcacebf9b5f8e7732eafb144f629d594d17
--- /dev/null
+++ b/neonView/ChecklistEntryMultiEdit_view/ChecklistEntryMultiEdit_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ChecklistEntryMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericMultipleViewTemplate</name>
+      <title>Checklist entries</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>f139b472-471b-45ef-8406-f11fe052e246</name>
+          <entityField>TYPE</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>ed1eb021-aad1-4228-bcdf-eef2d44f53f8</name>
+          <entityField>TITLE</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod b/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1f86e623f5d6595e1b58d4abd826ef2e87dd29b3
--- /dev/null
+++ b/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod
@@ -0,0 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ChecklistEntryValueList_view</name>
+  <title>Checklist entries</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>HORIZONTAL</direction>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>tableViewTemplate</name>
+      <iconField>#IMAGE</iconField>
+      <favoriteActionGroup1>setChecklistEntryCompleted</favoriteActionGroup1>
+      <isCreatable v="false" />
+      <isDeletable v="false" />
+      <isEditable v="false" />
+      <columns>
+        <neonTableColumn>
+          <name>6ccac432-a75f-42f3-915a-4e02c141ddb8</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>35a60394-91ad-4e39-85b4-683564604e97</name>
+          <entityField>type</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>56a78ef9-dcef-4d1c-b30d-5c89f38611ec</name>
+          <entityField>CHECKLISTENTRY_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ChecklistFilter_view/ChecklistFilter_view.aod b/neonView/ChecklistFilter_view/ChecklistFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..81105b42d24250da3b0b6217efea767043b97454
--- /dev/null
+++ b/neonView/ChecklistFilter_view/ChecklistFilter_view.aod
@@ -0,0 +1,10 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ChecklistFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+</neonView>
diff --git a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod b/neonView/SalesprojectActivity_view/SalesprojectActivity_view.aod
similarity index 53%
rename from neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
rename to neonView/SalesprojectActivity_view/SalesprojectActivity_view.aod
index 254223bff73235d58283d76d7473af11091bbb16..18b9c192333e6822587abb11dd42a723418942c4 100644
--- a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod
+++ b/neonView/SalesprojectActivity_view/SalesprojectActivity_view.aod
@@ -1,24 +1,16 @@
 <?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>SalesprojectMemberActivity_view</name>
-  <title>Project</title>
+  <name>SalesprojectActivity_view</name>
+  <title>Activity</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <boxLayout>
+    <noneLayout>
       <name>layout</name>
-      <direction>VERTICAL</direction>
-      <maxDirectionElements v="0" />
-      <autoHeight v="false" />
-    </boxLayout>
+    </noneLayout>
   </layout>
   <children>
     <neonViewReference>
-      <name>ebf752f4-653d-4de3-9c81-c3e6ef692c48</name>
-      <entityField>Members</entityField>
-      <view>MemberDrawer_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5e9b2286-227e-494d-a252-be29a50a093a</name>
+      <name>5564d68a-76dc-44cc-9f76-3894e069c295</name>
       <entityField>Activities</entityField>
       <view>ActivityDrawer_view</view>
     </neonViewReference>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 2c70a12bb05841e7fd655728375d81c5445aa686..43368c01548b156b25d2389c85c30878e3a071c1 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -22,7 +22,7 @@
     <neonViewReference>
       <name>d4daa13e-bf57-45e4-af43-d58c04f113f5</name>
       <entityField>#ENTITY</entityField>
-      <view>SalesprojectMemberActivity_view</view>
+      <view>SalesprojectActivity_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>7ac103ea-1131-41e0-85ce-e7d2fc86dfd8</name>
diff --git a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
index 38e7a6f7308dd471f5bcc7e7fe69d2d45e858c77..64be620c66f0e976034988cee063a49f7ea38638 100644
--- a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
+++ b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
@@ -15,18 +15,14 @@
       <view>SalesprojectPhase_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>7c365878-0f88-4bc3-aed4-0667951e70af</name>
-      <entityField>SalesprojectPhaseMilestones</entityField>
-      <view>SalesprojectMilestoneInfo_view</view>
-      <devices>
-        <element>TABLET</element>
-        <element>DESKTOP</element>
-      </devices>
+      <name>43b80a09-de18-43ac-9d4f-d344cefc0381</name>
+      <entityField>ChecklistEntryValues</entityField>
+      <view>ChecklistEntryValueList_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>729108f8-a054-4ea7-9ef8-14b686c6340b</name>
-      <entityField>SalesprojectForecastCharts</entityField>
-      <view>TurnoverChartForcastDrawer_view</view>
+      <name>3e0550aa-832e-4d6c-a653-f765d92bbd86</name>
+      <entityField>Members</entityField>
+      <view>MemberDrawer_view</view>
     </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_view.aod b/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..eae1779df434052cfd229767a2055813e6527285
--- /dev/null
+++ b/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseDefinitionEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>genericViewTemplate</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>db76830d-c140-4205-bc32-57ad6cb8fb7b</name>
+          <entityField>PHASE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f0aa8dd0-2cc1-4634-9509-db8b511e602d</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>def21f47-1a93-4865-a92c-5015243955e8</name>
+      <entityField>ChecklistEntries</entityField>
+      <view>ChecklistEntryMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPhaseDefinitionFilter_view/SalesprojectPhaseDefinitionFilter_view.aod b/neonView/SalesprojectPhaseDefinitionFilter_view/SalesprojectPhaseDefinitionFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d7e3bd3cc976e7fb9fa401ffd7984140773daa5d
--- /dev/null
+++ b/neonView/SalesprojectPhaseDefinitionFilter_view/SalesprojectPhaseDefinitionFilter_view.aod
@@ -0,0 +1,38 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseDefinitionFilter_view</name>
+  <title>Traits</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>tableViewTemplate</name>
+      <iconField>#ICON</iconField>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <title>Traits</title>
+      <columns>
+        <neonTableColumn>
+          <name>64a213a9-5429-4e6b-9f7e-e23beb9f15b9</name>
+          <entityField>#ICON</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>7cd4dd99-ffc7-4207-9e81-874a5c71c2c2</name>
+          <entityField>PHASE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>80ea1a84-c6a1-4a12-b2fb-18c78d526119</name>
+          <entityField>traitCount</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>b44c14af-9a2a-405f-8e6a-e02fd9403c20</name>
+          <entityField>DESCRIPTION</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_view.aod b/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a2fe192db764301468d9b71198c550cc677cf3de
--- /dev/null
+++ b/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseDefinitionPreview_view</name>
+  <title>Traits</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>cardViewTemplate</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>cardViewTemplate</name>
+      <iconField>#ICON</iconField>
+      <titleField>PHASE</titleField>
+      <subtitleField>SalesprojectPhaseFullname</subtitleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <neonViewReference>
+      <name>786e8ccd-b846-4968-8b6c-9e8cf13ba63c</name>
+      <entityField>ChecklistEntries</entityField>
+      <view>ChecklistEntryList_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod b/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..66589d53af1ec84be40e2d12d8226dc700d5edec
--- /dev/null
+++ b/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod
@@ -0,0 +1,10 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseInfoTraitList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+</neonView>
diff --git a/neonView/SalesprojectPhaseTraitFilter_view/SalesprojectPhaseTraitFilter_view.aod b/neonView/SalesprojectPhaseTraitFilter_view/SalesprojectPhaseTraitFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b4c6ab265dad5876897e21bf5e64a523afdf8693
--- /dev/null
+++ b/neonView/SalesprojectPhaseTraitFilter_view/SalesprojectPhaseTraitFilter_view.aod
@@ -0,0 +1,29 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseTraitFilter_view</name>
+  <title>Traits</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>tableViewTemplate</name>
+      <titleField>type</titleField>
+      <entityField>#ENTITY</entityField>
+      <title>Traits</title>
+      <columns>
+        <neonTableColumn>
+          <name>0aaca67c-075e-412b-9824-6af0166f6189</name>
+          <entityField>type</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>b84fed25-b667-4f8c-8da3-a9a564bf28ca</name>
+          <entityField>TRAIT</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPhaseTraitList_view/SalesprojectPhaseTraitList_view.aod b/neonView/SalesprojectPhaseTraitList_view/SalesprojectPhaseTraitList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9f7e008baa8086119cbd40f08e59c03303807356
--- /dev/null
+++ b/neonView/SalesprojectPhaseTraitList_view/SalesprojectPhaseTraitList_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseTraitList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>titledListViewTemplate</name>
+      <titleField>TYPE</titleField>
+      <entityField>#ENTITY</entityField>
+      <title>Traits</title>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>c462fd98-2e2d-42e1-97b7-30ba126fac55</name>
+          <entityField>TRAIT</entityField>
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectPhaseTraitMultiEdit_view/SalesprojectPhaseTraitMultiEdit_view.aod b/neonView/SalesprojectPhaseTraitMultiEdit_view/SalesprojectPhaseTraitMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..aa775c30bb417736a4f413c0ecfd8295f4c5c662
--- /dev/null
+++ b/neonView/SalesprojectPhaseTraitMultiEdit_view/SalesprojectPhaseTraitMultiEdit_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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SalesprojectPhaseTraitMultiEdit_view</name>
+  <title>Traits</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericMultipleViewTemplate</name>
+      <entityField>#ENTITY</entityField>
+      <title>Traits</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>7c79ae41-c71b-4e1e-8bf9-27ba5c4c5d1a</name>
+          <entityField>TRAIT</entityField>
+          <fullWidth v="true" />
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>7ccd8960-ca7a-49d6-98aa-d54ebe658276</name>
+          <entityField>VALUE</entityField>
+          <fullWidth v="true" />
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/process/ChecklistEntryRegistry_basic/ChecklistEntryRegistry_basic.aod b/process/ChecklistEntryRegistry_basic/ChecklistEntryRegistry_basic.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1bd98ef5996a85478b69dc6e07876c46439aec7c
--- /dev/null
+++ b/process/ChecklistEntryRegistry_basic/ChecklistEntryRegistry_basic.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>ChecklistEntryRegistry_basic</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/ChecklistEntryRegistry_basic/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/ChecklistEntryRegistry_basic/process.js b/process/ChecklistEntryRegistry_basic/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..061a6f5a5d961d59dafa3e772cab99b0f7bc2c1f
--- /dev/null
+++ b/process/ChecklistEntryRegistry_basic/process.js
@@ -0,0 +1,405 @@
+import("system.logging");
+import("system.eMath");
+import("system.datetime");
+import("system.translate");
+import("system.entities");
+import("system.project");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+
+/**
+ * Returns the matching rows, to the defined parameters.
+ * 
+ * @param {String} pUid                 <p>
+ *                                      The uid of the corresponding data set.
+ * @param {String} pEntity              <p>
+ *                                      The entity from which the data shall be loaded.
+ * @param {Array} pFields               <p>
+ *                                      The fields which shall be loaded, if null all fields in requested entity will be loaded.
+ * @param {Array} pParameters           <p>
+ *                                      The parameters which are necessary to loading the rows.
+ * @param {String} pProvider            <p>
+ *                                      An provider for loading the rows.
+ */
+function _getRows(pUid, pEntity, pFields, pParameters, pProvider){
+    
+    var config = entities.createConfigForLoadingRows()
+                            .entity(pEntity)
+                            .ignorePermissions(true)
+                            .fields(pFields);
+
+    if (pProvider)
+    {
+        config.provider(pProvider);
+    }
+    if (pUid)
+    {
+        config.uid(pUid);
+    }
+
+    if (pParameters)
+    {
+        for (let i = 0; i < pParameters.length; i++) 
+        {
+            if (pParameters[i][0] && pParameters[i][1] && pParameters[i][0] != "" && pParameters[i][1] != "")
+            {
+                config.addParameter(pParameters[i][0], pParameters[i][1]);  
+            }
+        }
+    }
+
+    return entities.getRows(config);
+}
+
+/**
+ * Provides a central place where all checklist entries with type 'AUTO' are defined.
+ * All defined entries has to return a object of type "ChecklistEntry".
+ * <p>
+ * This object has an attribute named: <u><b><i>verifierFn</i></u></b>. This attribute is a function, which
+ * expects the uid/object-rowid as param and is, how the name implies, responsible for
+ * verifying, whether the checklist entry is fulfilled or not.
+ * 
+ * @class
+ * 
+ * @example
+ * $ChecklistEntryRegistry.salesprojectRoleProjManager()
+ */
+function $ChecklistEntryRegistry(){}
+
+/*
+ * Returns you a list of all existing entries as object <br>
+ * <i><u>(key: functionname & value: title)</u></i><br>
+ * <p>
+ * E.g.: used in a dropDownProcess to provide a<br>
+ * selection of all possible entries.<br>
+ * 
+ */
+$ChecklistEntryRegistry.getEntryList = function(){
+    var rawList = Object.keys($ChecklistEntryRegistry);
+    var returnableList = {};
+    
+    rawList.forEach(function(pEntry){
+        if (!(pEntry == 'getEntryList'))
+        {
+            returnableList[pEntry] = $ChecklistEntryRegistry[pEntry]().title;
+        }
+    });
+    
+    return returnableList;
+}
+
+/*
+ * Checks whether the project team role: "Project manager"<br>
+ * is filled for the given salesproject.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectRoleProjManager = function(){
+    return{
+        title: translate.text("Project team: \"Project manager\""),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["SALESPROJECTID", "MST_TEAM_ID", "PROJECTCODE"], null, "NoPhaseRequirementLoading");
+            var memberRows = _getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]], ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
+            for (let i = 0; i < memberRows.length; i++) 
+            {
+                if(memberRows[i]["MEMBERROLE"] == $KeywordRegistry.memberRoleProjManag())
+                {
+                    return true;
+                }
+            }
+                return false;
+        }
+    };
+}
+
+/*
+ * Checks whether a touchpoint for the<br>
+ * given salesproject, exists.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectTouchpoint = function(){
+    return{
+        title: translate.text("Touchpoint"),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["SALESPROJECTID", "MST_TEAM_ID", "PROJECTCODE"], null, "NoPhaseRequirementLoading");
+            var touchpintRows = _getRows(null, "SalesprojectSource_entity", ["SALESPROJECT_TOUCHPOINTID"], [["SalesprojectId_param", pSalesprojectId]], "SalesprojectSouces");
+            if(touchpintRows.length > 0) 
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether the volume for the<br>
+ * given salesproject, is entered.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectVolume = function(){
+    return{
+        title: translate.text("Volume"),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["VOLUME"], null, "NoPhaseRequirementLoading");
+            if(spRows[0]["VOLUME"] && spRows[0]["VOLUME"] != "") 
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether an project start for the<br>
+ * given salesproject, exists.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectProjStart = function(){
+    return{
+        title: translate.text("Project start"),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["STARTDATE"], null, "NoPhaseRequirementLoading");
+            if(spRows[0]["STARTDATE"] && spRows[0]["STARTDATE"] != "") 
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether all classifications fields for the<br>
+ * given salesproject are filled.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectClassificationFields = function(){ 
+    return{
+        title: translate.text("Classification fields"),
+        verifierFn: function(pSalesprojectId){
+            var res = false;
+            var classificationRows = _getRows(null, "Classification_entity", ["VALUE"], [["ObjectType_param", "Salesproject"], ["ObjectRowid_param", pSalesprojectId]], "Classifications");
+            if(classificationRows.length > 0)
+            {
+                res = true
+                for (let i = 0; i < classificationRows.length; i++) {
+                    if(classificationRows[i] == "" || classificationRows[i] == null || classificationRows[i] == undefined)
+                    {
+                        res = false;
+                        break;
+                    }
+                }
+            }
+            return res;
+        }
+    };
+}
+
+/*
+ * Checks whether the project team role: "Internal Distribution"<br>
+ * for the given salesproject, exists.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectRoleIntDist = function(){
+    return{
+        title: translate.text("Project team: \"Internal distribution\""),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["SALESPROJECTID", "MST_TEAM_ID", "PROJECTCODE"], null, "NoPhaseRequirementLoading");
+            var memberRows = _getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]], ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
+            for (let i = 0; i < memberRows.length; i++) 
+            {
+                if(memberRows[i]["MEMBERROLE"] == $KeywordRegistry.memberRoleIntenDistrib())
+                {
+                    return true;
+                }
+            }
+                return false;
+        }
+    };
+}
+
+/*
+ * Checks whether all project team role<br>
+ * for the given salesproject, assigned.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectTeamRoles = function(){
+    return{
+        title: translate.text("Project team roles"),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["SALESPROJECTID", "MST_TEAM_ID", "PROJECTCODE"], null, "NoPhaseRequirementLoading");
+            var memberRows = _getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]], ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
+            var allMemberRoles = newSelect(SqlBuilder.caseWhen(newWhere("AB_KEYWORD_ENTRY.KEYID", "MEMROLEDISTRICTRESPONSIBLE")).thenString("70cbad1b-eac6-4369-ba50-4946e0fbcb3a").elseValue("AB_KEYWORD_ENTRY.KEYID"))
+                                            .from("AB_KEYWORD_ENTRY")
+                                            .where("AB_KEYWORD_ENTRY.CONTAINER", "MemberRole")
+                                            .arrayColumn();
+            for (let i = 0; i < memberRows.length; i++) 
+            {
+                for (let j = 0; j < allMemberRoles.length; j++) {
+                        if(memberRows[i]["MEMBERROLE"] == allMemberRoles[j])
+                        {
+                            allMemberRoles.splice(j, 1); 
+                        }
+                    }
+            }
+            if(allMemberRoles.length == 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    };
+}
+
+/*
+ * Checks whether an offer<br>
+ * for the given salesproject, exists.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectOfferExists = function(){
+    return{
+        title: translate.text("Offer exists"),
+        verifierFn: function(pSalesprojectId){
+            
+            var offerRows = _getRows(null, "Offer_entity", ["OFFERID"], [["ObjectRowId_param", pSalesprojectId], ["ObjectType_param", "Salesproject"]], "Links");
+            if(offerRows.length > 0) 
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether the project start for the<br>
+ * given salesproject, is in the next 12 months.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectProjStart12 = function(){
+    return{
+        title: translate.text("Project start within next 12 months"),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["STARTDATE"], null, "NoPhaseRequirementLoading");
+
+            for (let i = 0; i < spRows.length; i++) 
+            {
+                var startdate = spRows[i]["STARTDATE"];
+                if(startdate != null && startdate != "" && startdate != undefined)
+                {
+                    var todayUnformatted = datetime.today();
+                    var today = datetime.toDate(todayUnformatted, "dd.MM.yyyy")
+                    var currentYear = today.slice(today.length-4, today.length)
+                    var nextYear = eMath.addInt(parseInt(currentYear),1);
+                    var todayNextYear = datetime.toLong(today.slice(0, -4) + nextYear, "dd.MM.yyyy")
+                    
+                    return (parseInt(todayUnformatted) <= parseInt(startdate) && parseInt(startdate) <= parseInt(todayNextYear)) ? true : false;
+                }
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether the offer for the<br>
+ * given salesproject, is marked as sent.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectOfferSent = function(){
+    return{
+        title: translate.text("Offer sent"),
+        verifierFn: function(pSalesprojectId){
+            
+            var offerRows = _getRows(null, "Offer_entity", ["STATUS"], [["ObjectRowId_param", pSalesprojectId], ["ObjectType_param", "Salesproject"]], "Links");
+            var res = false;
+
+            for (let i = 0; i < offerRows.length; i++)
+            {
+                if(offerRows[i].STATUS == $KeywordRegistry.offerStatus$sent())
+                {
+                    res = true;
+                    break;
+                }
+            }
+            return res;
+        }
+    };
+}
+
+/*
+ * Checks whether the project probability for the<br>
+ * given salesproject, equals 100%.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectProb100 = function(){
+    return{
+        title: translate.text("Probablity: 100%"),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["PROBABILITY"], null, "NoPhaseRequirementLoading");
+            if(spRows[0]["PROBABILITY"] && spRows[0]["PROBABILITY"] == "SALPROJPROB100") 
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether the project status for the<br>
+ * given salesproject, is won.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectStatusWon = function(){
+    return{
+        title: translate.text("Status: \"won\""),
+        verifierFn: function(pSalesprojectId){
+            
+            var spRows = _getRows(pSalesprojectId, "Salesproject_entity", ["STATUS"], null, "NoPhaseRequirementLoading");
+            if(spRows[0]["STATUS"] && (spRows[0]["STATUS"] == $KeywordRegistry.salesprojectState$partialOrder() ||
+                    spRows[0]["STATUS"] == $KeywordRegistry.salesprojectState$order())) 
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+}
+
+/*
+ * Checks whether a contract for the<br>
+ * offer to the given salesproject, exists.
+ * 
+ */
+$ChecklistEntryRegistry.salesprojectContractExists = function(){
+    return{
+        title: translate.text("Contract"),
+        verifierFn: function(pSalesprojectId){
+            
+            var offerRows = _getRows(null, "Offer_entity", ["OFFERID"], [["ObjectRowId_param", pSalesprojectId], ["ObjectType_param", "Salesproject"]], "Links");
+            for (let i = 0; i < offerRows.length; i++) 
+            {
+                var documentRows = _getRows(null, "Document_entity", ["BINDATA_UPLOAD"], [["AssignmentRowId_param", offerRows[i]["OFFERID"]], ["AssignmentTable_param", "OFFER"]], "Documents");
+                if(documentRows.length>0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    };
+}
diff --git a/process/ChecklistRegistry_basic/ChecklistEntryRegistry_basic.aod b/process/ChecklistRegistry_basic/ChecklistEntryRegistry_basic.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7d1fe5ffb3be6f886dded34e84d8e0e4ef230cba
--- /dev/null
+++ b/process/ChecklistRegistry_basic/ChecklistEntryRegistry_basic.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>ChecklistEntryRegistry_basic</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/ChecklistEntryRegistry_basic/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 1d937e5cd44537e202469b544d0cf9d8f8c1fdce..fcb12948f27d859bc23f374130bc4d2a85ffb97f 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -87,6 +87,12 @@ $KeywordRegistry.quantityUnit = function(){return "QuantityUnit";};
 $KeywordRegistry.quantityUnit$pieces = function(){return "QUANTITYPIECES";};
 
 $KeywordRegistry.MemberRole = function(){return "MemberRole";};
+$KeywordRegistry.memberRoleProjManag = function(){return "MEMROLEPROJMANAG";};
+$KeywordRegistry.memberRoleAdvise = function(){return "MEMROLEADVISE";};
+$KeywordRegistry.memberRoleProjAssist = function(){return "MEMROLEPROJASSIST";};
+$KeywordRegistry.memberRoleExSalemang = function(){return "MEMROLEEXSALEMANAG";};
+$KeywordRegistry.memberRoleIntenDistrib = function(){return "MEMROLINSALEMANAG";};
+
 $KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource";};
 
 $KeywordRegistry.salesorderState = function(){return "SalesorderState";};
@@ -132,6 +138,12 @@ $KeywordRegistry.salesprojectState$lost = function(){return "SALPROJSTATLOST";};
 $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
 $KeywordRegistry.salesprojectPhase$nqc = function(){return "SALPROJPHASENQC";};
 $KeywordRegistry.salesprojectPhase$nego = function(){return "SALPROJPHASENEGO";};
+$KeywordRegistry.salesprojectPhase$mal = function(){return "SALPROJPHASEMAL"};
+$KeywordRegistry.salesprojectPhase$mql = function(){return "SALPROJPHASEMQL"};
+$KeywordRegistry.salesprojectPhase$offer = function(){return "SALPROJPHASEOFFER"};
+$KeywordRegistry.salesprojectPhase$sal = function(){return "SALPROJPHASESAL"};
+$KeywordRegistry.salesprojectPhase$sqo = function(){return "SALPROJPHASESQO"};
+$KeywordRegistry.salesprojectPhase$mqc = function(){return "SALPROJPHASEMQC"};
 
 $KeywordRegistry.taskPriority = function(){return "TaskPriority";};
 $KeywordRegistry.taskPriority$none = function(){return "TASKPRIONONE";};
@@ -327,3 +339,8 @@ $KeywordRegistry.notificationPriority$normal = function(){ return "NORMAL";};
 $KeywordRegistry.notificationPriority$hight = function(){ return "HIGH";};
 $KeywordRegistry.notificationPriority$max = function(){ return "MAX";};
 
+$KeywordRegistry.visitPlanEntryStatusAppointment$confirmed = function(){return "VISITSTATUSAPPOINTMENTCONFIRMED";};$KeywordRegistry.knowledgePublishLevel$public = function(){return "PUBLIC";}
+
+$KeywordRegistry.checklistEntryType = function(){return "ChecklistEntryType";}
+$KeywordRegistry.checklistEntryType$manual = function(){return "MANUAL";}
+$KeywordRegistry.checklistEntryType$auto = function(){return "AUTO";}
\ No newline at end of file