diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index 034f757e84d30554d0c9f4e19599d97831d99f31..391f71514bee84efda661cb28b149d35c5829813 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -21,7 +21,6 @@
   <include file="generatedData/classificationscore.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/classificationstorage.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/classificationtype.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/commrestriction.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/communication.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/contact.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/contract.xml" relativeToChangelogFile="true"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 52100154420acf219fbd3560f6d0f33789c9e7fa..c060b095c1afc4d05ebefab0d008313fb1d88de7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -50,7 +50,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -150,8 +150,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -164,8 +164,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -205,7 +205,7 @@
                 <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-4" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -445,8 +445,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -473,8 +473,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -720,8 +720,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -748,8 +748,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -775,7 +775,7 @@
                 <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-4" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1092,8 +1092,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1120,8 +1120,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1260,8 +1260,8 @@
                 <name>ISSTANDARD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -1301,8 +1301,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1315,8 +1315,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1377,8 +1377,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1437,8 +1437,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1537,8 +1537,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1556,7 +1556,7 @@
                 <name>REMARK</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1677,7 +1677,7 @@
                 <columnType v="12" />
                 <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="true" />
                 <index v="true" />
                 <title>Product number</title>
@@ -1793,8 +1793,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1821,8 +1821,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1848,7 +1848,7 @@
                 <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-4" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1882,8 +1882,8 @@
                 <name>OPTIONAL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -1902,8 +1902,8 @@
                 <name>TAKEPRICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -1949,7 +1949,7 @@
                 <name>QUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2049,7 +2049,7 @@
                 <name>PRICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2069,7 +2069,7 @@
                 <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2162,8 +2162,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2181,7 +2181,7 @@
                 <name>FROMQUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2234,8 +2234,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2339,7 +2339,7 @@
                 <name>QUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2360,8 +2360,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2406,8 +2406,8 @@
                 <name>IN_OUT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -2584,7 +2584,7 @@
                 <name>FLAG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-4" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2645,7 +2645,7 @@
                 <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2671,8 +2671,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2805,7 +2805,7 @@
                 <name>NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -2830,7 +2830,7 @@
                 <name>HEADER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2892,7 +2892,7 @@
                 <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2965,7 +2965,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2987,8 +2987,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3015,8 +3015,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3070,7 +3070,7 @@
                 <name>FOOTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3112,7 +3112,7 @@
                 <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3126,7 +3126,7 @@
                 <name>DISCOUNTED_NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3140,7 +3140,7 @@
                 <name>DISCOUNTED_VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3199,7 +3199,7 @@
                 <name>PRICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3219,7 +3219,7 @@
                 <name>QUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3239,7 +3239,7 @@
                 <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3331,7 +3331,7 @@
                 <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3371,8 +3371,8 @@
                 <name>OPTIONAL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -3446,7 +3446,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title>Assigned to</title>
                 <description></description>
                 <customProperties>
@@ -3481,7 +3481,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3523,8 +3523,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3542,7 +3542,7 @@
                 <name>VOLUME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -3562,7 +3562,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3583,8 +3583,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3791,8 +3791,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3887,7 +3887,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3944,8 +3944,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4025,8 +4025,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -4045,7 +4045,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4154,8 +4154,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4182,8 +4182,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4209,8 +4209,8 @@
                 <name>RESPONSIBLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -4280,7 +4280,7 @@
                 <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -4301,7 +4301,7 @@
                 <name>FOOTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4322,7 +4322,7 @@
                 <name>HEADER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4365,8 +4365,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4439,7 +4439,7 @@
                 <name>NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -4554,7 +4554,7 @@
                 <name>NOTICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4576,8 +4576,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4596,8 +4596,8 @@
                 <name>CANCELLATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -4623,8 +4623,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4643,7 +4643,7 @@
                 <name>DUNNINGTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4691,8 +4691,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4789,7 +4789,7 @@
                 <name>PAYMENTADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4857,7 +4857,7 @@
                 <name>DELIVERYADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4878,8 +4878,8 @@
                 <name>ORDERSTATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -4918,7 +4918,7 @@
                 <name>DISCOUNTED_VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -4932,7 +4932,7 @@
                 <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -4946,7 +4946,7 @@
                 <name>DISCOUNTED_NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -5005,7 +5005,7 @@
                 <name>PRICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -5026,7 +5026,7 @@
                 <name>QUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -5047,7 +5047,7 @@
                 <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -5100,7 +5100,7 @@
                 <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -5227,7 +5227,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title>Assigned to</title>
                 <description></description>
@@ -5278,7 +5278,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5346,8 +5346,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -5439,7 +5439,7 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5541,8 +5541,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -5772,7 +5772,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5987,8 +5987,8 @@
                 <name>ATTRIBUTE_ACTIVE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -6071,7 +6071,7 @@
                 <name>ATTRIBUTE_INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -6162,8 +6162,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -6182,7 +6182,7 @@
                 <name>NUMBER_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -6302,8 +6302,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6330,8 +6330,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6482,8 +6482,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6496,8 +6496,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6556,8 +6556,8 @@
                 <name>ISESSENTIAL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6661,8 +6661,8 @@
                 <name>ISACTIVE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -6786,8 +6786,8 @@
                 <name>ISACTIVE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -6977,8 +6977,8 @@
                 <name>BOOL_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7012,7 +7012,7 @@
                 <name>NUMBER_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -7075,7 +7075,7 @@
                 <name>LONG_CHAR_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -7657,8 +7657,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7949,8 +7949,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7969,7 +7969,7 @@
                 <name>LOCKED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="16" />
+                <columnType v="-7" />
                 <size v="1" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -8058,7 +8058,7 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8143,8 +8143,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -8191,8 +8191,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8240,8 +8240,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8372,8 +8372,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8407,8 +8407,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8504,8 +8504,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8560,8 +8560,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8677,8 +8677,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8705,8 +8705,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8795,8 +8795,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8844,8 +8844,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8956,8 +8956,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8998,8 +8998,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9067,8 +9067,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9186,8 +9186,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9325,8 +9325,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9360,8 +9360,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9499,8 +9499,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9541,8 +9541,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9568,7 +9568,7 @@
                 <name>NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -9680,7 +9680,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9693,7 +9693,7 @@
                 <name>FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9721,8 +9721,8 @@
                 <name>OUTDATED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9828,7 +9828,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -9839,7 +9839,7 @@
                 <name>SCOREPOINTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -9929,9 +9929,9 @@
                 <name>SCOREPERCENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="4" />
                 <size v="10" />
-                <scale v="2" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10053,8 +10053,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10066,7 +10066,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10221,7 +10221,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -10295,7 +10295,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10323,7 +10323,7 @@
                 <name>REASON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10338,8 +10338,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10400,8 +10400,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10606,8 +10606,8 @@
                 <name>CREATEACTIVITIES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10648,8 +10648,8 @@
                 <name>USE_TEMPLATE_ATTACHMENTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10663,8 +10663,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10795,8 +10795,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10836,8 +10836,8 @@
                 <name>IS_TEST_RECIPIENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10954,8 +10954,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10968,8 +10968,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11017,8 +11017,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11168,7 +11168,7 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11230,7 +11230,7 @@
                 <name>MAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11245,8 +11245,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11287,8 +11287,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11328,7 +11328,7 @@
                 <name>RECIPIENTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11357,8 +11357,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -11432,8 +11432,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11474,9 +11474,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <size v="19" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11854,7 +11854,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -11907,8 +11907,8 @@
                 <name>ONSITE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11970,8 +11970,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11983,7 +11983,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -12039,8 +12039,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12067,8 +12067,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12164,7 +12164,7 @@
                 <name>SCAN_PATTERN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -12303,8 +12303,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12359,8 +12359,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12624,8 +12624,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12952,8 +12952,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13078,8 +13078,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13106,8 +13106,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13182,8 +13182,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13224,8 +13224,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13667,8 +13667,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13723,8 +13723,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14007,8 +14007,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14035,8 +14035,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14139,8 +14139,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14208,7 +14208,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14340,7 +14340,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14403,7 +14403,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="92" />
-                <size v="8" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14417,7 +14417,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="92" />
-                <size v="8" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14694,8 +14694,8 @@
                 <name>OUTDATED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14805,8 +14805,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14833,8 +14833,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14965,8 +14965,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15007,8 +15007,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15090,7 +15090,7 @@
                 <name>DISTRICT_FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15153,8 +15153,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15209,8 +15209,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15278,9 +15278,9 @@
                 <name>VALID_FROM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15292,9 +15292,9 @@
                 <name>VALID_UNTIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15461,8 +15461,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15475,8 +15475,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15489,8 +15489,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15517,8 +15517,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15592,7 +15592,7 @@
                 <name>DISCUSSIONTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15607,8 +15607,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15663,8 +15663,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15739,8 +15739,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15767,8 +15767,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15857,8 +15857,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15933,7 +15933,7 @@
                 <name>CONTENTDECODED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15968,7 +15968,7 @@
                 <name>CONTENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15990,8 +15990,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16135,8 +16135,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16177,8 +16177,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16343,8 +16343,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16357,8 +16357,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16433,8 +16433,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16475,8 +16475,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16716,8 +16716,8 @@
                 <name>IS_ARCHIVED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16805,7 +16805,7 @@
                 <name>OBJECT_FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -16819,8 +16819,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16909,8 +16909,8 @@
                 <name>TRIGGEREVENTDELETE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16922,8 +16922,8 @@
                 <name>TRIGGEREVENTINSERT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16935,8 +16935,8 @@
                 <name>TRIGGEREVENTUPDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16949,8 +16949,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16987,7 +16987,7 @@
                 <name>OBJECT_FIELD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -17046,8 +17046,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17072,8 +17072,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17183,8 +17183,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17209,8 +17209,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17247,8 +17247,8 @@
                 <name>AUTO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -17294,8 +17294,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17307,8 +17307,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17391,8 +17391,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17417,8 +17417,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17477,6 +17477,34 @@
                 <documentation></documentation>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>DONEDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="19" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DONEUSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -17578,8 +17606,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17609,7 +17637,7 @@
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -17648,8 +17676,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17676,8 +17704,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17912,8 +17940,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -17940,8 +17968,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18029,7 +18057,7 @@
                 <name>ERRORMESSAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -18142,8 +18170,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18246,8 +18274,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18274,8 +18302,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18406,8 +18434,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18420,8 +18448,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18496,8 +18524,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18538,8 +18566,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -18821,8 +18849,8 @@
                 <name>IS_DEFAULT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18954,153 +18982,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>COMMUNICATIONBLACKLIST</name>
-            <dbName></dbName>
-            <idColumn>COMMUNICATIONBLACKLISTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>BLACKLIST_FILTER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>END_DATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>START_DATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMUNICATIONBLACKLISTID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>REASON</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19109,20 +18991,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>BLACKLIST_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -19161,7 +19029,7 @@
                 <name>MONTH_FACTOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="5" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -19209,7 +19077,7 @@
                 <name>FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -19224,8 +19092,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19252,8 +19120,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19375,8 +19243,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19429,7 +19297,7 @@
           <entityDb>
             <name>LEADS</name>
             <dbName></dbName>
-            <idColumn>LEADID</idColumn>
+            <idColumn>LEADSID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -19477,8 +19345,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19798,7 +19666,7 @@
                 <name>PERSINFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -20163,8 +20031,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -20204,7 +20072,7 @@
                 <name>ORGINFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -20247,8 +20115,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="19" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 1166673b579a7d2992b701758f84b6f7d0e90f42..ef0e59521989a72d08ea5fec6e909a2ac15861ba 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -23,6 +23,7 @@
       <consumer>Contacts</consumer>
       <linkedContextProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
       <mandatory v="true" />
+      <onValueChange>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/onValueChange.js</onValueChange>
       <onValidation>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/onValidation.js</onValidation>
     </entityField>
     <entityField>
diff --git a/entity/BulkMailRecipient_entity/entityfields/contact_id/onValueChange.js b/entity/BulkMailRecipient_entity/entityfields/contact_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..07d0537e1ea23ebabb8028a07f3da9c56fa8bb48
--- /dev/null
+++ b/entity/BulkMailRecipient_entity/entityfields/contact_id/onValueChange.js
@@ -0,0 +1,9 @@
+import("Communication_lib");
+import("system.neon");
+import("system.vars");
+
+var contactId = vars.get("$local.value");
+if(contactId != "")
+{
+    neon.setFieldValue("$field.EMAIL_ADDRESS",CommUtil.getStandardMail(contactId));
+}
\ No newline at end of file
diff --git a/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod b/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod
index eb3318d1aad761ad8f944dd5596c80d20a8999b3..e651b0227e3d342c20dea0aa3be489279800051e 100644
--- a/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod
+++ b/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod
@@ -3,6 +3,7 @@
   <name>DuplicateOrganisation_entity</name>
   <title>Duplicate</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/DuplicateOrganisation_entity/documentation.adoc</documentation>
   <grantCreate v="false" />
   <grantUpdate v="false" />
   <grantDelete v="false" />
diff --git a/entity/DuplicateOrganisation_entity/documentation.adoc b/entity/DuplicateOrganisation_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..73695092a6b0fcb6d5afaa09001147aad6bc69f8
--- /dev/null
+++ b/entity/DuplicateOrganisation_entity/documentation.adoc
@@ -0,0 +1,17 @@
+= DuplicateOrganisation_entity
+
+== Overview
+
+Shows the duplicates of a record. 
+The views are only referenced in the OrganisationMain_view. 
+
+This entity is used to show all duplicates of an organisation, merge duplicates to one record and to ignore duplicates.
+
+==== Actions
+
+* ignoreDuplicates: The selected record is marked as no duplicate.
+* mergeselectedintocurrent: The selected record will be merged into the current opened one.
+* mergecurrentintoselected: Same behavior as with the mergeselectedintocurrent action only the other way.
+
+== AID
+More information on duplicates can be found in the AID60 or in the documentation of the DuplicateScanner_entity
\ No newline at end of file
diff --git a/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod b/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod
index 2d5dd73d048c99ae42a4b422275198df818f39d1..76bf7dd0ac61df8cf73e52f42f4473244b9f2d2a 100644
--- a/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod
+++ b/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod
@@ -3,6 +3,7 @@
   <name>DuplicatePerson_entity</name>
   <title>Duplicate</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/DuplicatePerson_entity/documentation.adoc</documentation>
   <grantCreate v="false" />
   <grantUpdate v="false" />
   <grantDelete v="false" />
diff --git a/entity/DuplicatePerson_entity/documentation.adoc b/entity/DuplicatePerson_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..8d2e8be6b145c97ddff336e74921c2d77918c3d2
--- /dev/null
+++ b/entity/DuplicatePerson_entity/documentation.adoc
@@ -0,0 +1,17 @@
+= DuplicateOrganisation_entity
+
+== Overview
+
+Shows the duplicates of a record. 
+The views are only referenced in the PersonMain_view. 
+
+This entity is used to show all duplicates of a person, merge duplicates to one record and to ignore duplicates.
+
+==== Actions
+
+* ignoreDuplicates: The selected record is marked as no duplicate.
+* mergeselectedintocurrent: The selected record will be merged into the current opened one.
+* mergecurrentintoselected: Same behavior as with the mergeselectedintocurrent action only the other way.
+
+== AID
+More information on duplicates can be found in the AID60 or in the documentation of the DuplicateScanner_entity
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 220ca8da86b7ff352ba94fa259602a9f004e9585..b94abcf3580c347872603d09949c5acf1e2a1f4e 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -97,7 +97,6 @@
       <name>DBRecordContainer</name>
       <onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
       <onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
-      <onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
       <alias>Data_alias</alias>
       <recordFieldMappings>
         <dbRecordFieldMapping>
diff --git a/entity/DuplicateScanner_entity/documentation.adoc b/entity/DuplicateScanner_entity/documentation.adoc
index 6284402b762958e1f8d9b2d9b848c4189920e666..63f59e3f44e71a5213500fd605fc6879041243af 100644
--- a/entity/DuplicateScanner_entity/documentation.adoc
+++ b/entity/DuplicateScanner_entity/documentation.adoc
@@ -1,7 +1,27 @@
-=DuplicateScanner_entity
+= DuplicateScanner_entity
 
-A "DuplicateScanner" is a definition 
-- WHICH objects may be searched for duplicates
-- and HOW these are searched 
+== Overview
+The duplicate scanner is the configuration for duplicate recognition.
+It defines WHICH objects may be searched for duplicates and HOW these are searched.
 
-Speaking of this, the duplicate scanner is the configuration for duplicate recognition.
+== Technical details
+The filter is a field with contentType: FILTER_TREE which is loaded in the onInsert/onUpdate of the db recordcontainer.
+
+All records in the DuplicateScanner cannot be deleted/created
+and should be created via liquibase scripts, during the implementation of the duplicates for a new entity. Note that, the provider and the entity must be set in the filter.
+
+The field EXTERNAL_SERVICE_USAGE_ALLOWED is deprecated and is not used in the implementation as of 06 May 2021.
+
+The field FILTER_NAME is only used as displayName in the UI and is irrelevant for the duplicate search.
+
+SCAN_PATTERN defines the filter. Note that, the provider of the ENTITY_TO_SCAN_NAME must use an index recordContainer.
+
+ID_FIELD_NAME the uid field for the duplicate search. Note that currently, it must be the uid field of the entity.
+
+==== Actions
+* rebuild: rebuilds all duplicates see rebuildDuplicates_serverProcess.
+* viewDuplicates: opens the target entity with default duplicate filter.
+
+== AID
+
+Further information and how to implement custom duplicate functionality can be found in AID60 Duplicates
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 6b565529443f73da3bcaf29879476f274b13e90d..d8cfad37c1414399ff010ec3dd1724b82b24c47c 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -296,6 +296,12 @@
       <name>itemInsertStatements</name>
       <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/iteminsertstatements/documentation.adoc</documentation>
     </entityField>
+    <entityField>
+      <name>currency</name>
+      <title>Currency</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/currency/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Offeritem_entity/entityfields/currency/valueProcess.js b/entity/Offeritem_entity/entityfields/currency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f125324e596f8c1180a1fbb47601c2a8f0ad95c0
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/currency/valueProcess.js
@@ -0,0 +1,13 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    if(vars.get("$param.Currency_param") && vars.get("$param.Currency_param") != "")
+    {
+        result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.getString("$param.Currency_param")));    
+    }
+}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 68999920abfefb7875463dc38a5b1bca18e994dd..054bfac329c06b0fd0e546eb3176521adecb0b49 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -282,6 +282,12 @@
       <name>itemInsertStatements</name>
       <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/iteminsertstatements/documentation.adoc</documentation>
     </entityField>
+    <entityField>
+      <name>currency</name>
+      <title>Currency</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/currency/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Orderitem_entity/entityfields/currency/valueProcess.js b/entity/Orderitem_entity/entityfields/currency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f125324e596f8c1180a1fbb47601c2a8f0ad95c0
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/currency/valueProcess.js
@@ -0,0 +1,13 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    if(vars.get("$param.Currency_param") && vars.get("$param.Currency_param") != "")
+    {
+        result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.getString("$param.Currency_param")));    
+    }
+}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
index 07ed27e6e201cab5dee47355979c9e9f9037c9ac..83f60fa1a8d9b90b49baed0d01c96d4a97e32fa1 100644
--- a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
@@ -25,10 +25,10 @@ if(pId != "" && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
     
     var partsListObject = oiUtils.insertPartsList(pId, vars.get("$field.SALESORDERITEMID"), curr, contactid, quantity, true, vars.get("$field.SALESORDER_ID"), sumUpTop);
     neon.setFieldValue("$field.itemInsertStatements", JSON.stringify(partsListObject["partsList"]));
-    if(sumUpTop)//only sum-up this price if there is no valid Price
+    if(sumUpTop && partsListObject["topProductInfo"])//only sum-up this price if there is no valid Price
     {
-    neon.setFieldValue("$field.PRICE", partsListObject["topProductInfo"]["price"]*quantity);
-    neon.setFieldValue("$field.VAT", partsListObject["topProductInfo"]["vat"]);
+        neon.setFieldValue("$field.PRICE", partsListObject["topProductInfo"]["price"]*quantity);
+        neon.setFieldValue("$field.VAT", partsListObject["topProductInfo"]["vat"]);
     }
 }
 
diff --git a/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js b/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
index 48d5a48dba985e36efff385275848c0daf4cd188..de7096303d2fcaf0a4b3c31b8ea352577816af70 100644
--- a/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
+++ b/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
@@ -4,6 +4,14 @@ import("system.result");
 import("system.vars");
 import("Product_lib");
 
-var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP", true);
+var currency;
+if(vars.get("$param.OrderOfferInformations_param"))
+{
+    currency = JSON.parse(vars.get("$param.OrderOfferInformations_param")).Currency_param;
+}
+
+var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP", true, currency);
 if (price.length > 0)
-    result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
\ No newline at end of file
+{
+    result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
+}
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js b/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
index 6981610dc3c3738e745b030d2c37468a7e48d186..b7abab4378b2ecedf8698130a15889ebc5e02ac5 100644
--- a/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
+++ b/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
@@ -4,6 +4,14 @@ import("system.result");
 import("system.vars");
 import("Product_lib");
 
-var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "SP", true);
+var currency;
+if(vars.get("$param.OrderOfferInformations_param"))
+{
+    currency = JSON.parse(vars.get("$param.OrderOfferInformations_param")).Currency_param;
+}
+
+var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "SP", true, currency);
 if (price.length > 0)
-    result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
\ No newline at end of file
+{
+    result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
+}
\ No newline at end of file
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 9b93a07f221f0722a90b60601aeac8e4032fefa2..92def56f1a35869471d27551d86b8e0b6362c374 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -80,9 +80,5 @@
       <name>407d9b32-c379-428b-b1e1-d92a820971fd</name>
       <view>SalesprojectPreviewMultiple_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>c860de14-8ebe-438f-92c3-cba727a15690</name>
-      <view>SalesprojectAttribute_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
index 0c19ce2dd173c2aeb2d075a287a54929bbc00f36..401e099fe0312e7b34c72860317857920b544d57 100644
--- a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -40,6 +40,10 @@
           <name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
           <entityField>PRICE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>fa6d99df-4f30-4737-8064-28eb5c88f17f</name>
+          <entityField>currency</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>4f339738-6358-463e-b941-3b2693ab115a</name>
           <entityField>DISCOUNT</entityField>
diff --git a/neonView/OrderitemEdit_view/OrderitemEdit_view.aod b/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
index 8149fa636066fe7f47e27e290d848834dcc53e1c..bc85773ca902dda4352de7775535c2477f566e8a 100644
--- a/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
+++ b/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
@@ -39,6 +39,10 @@
           <name>f7bd09a0-ed27-4989-940e-e3baac4c3c80</name>
           <entityField>PRICE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>f4e3ecc2-6303-493b-aa5a-5d6b974ae9da</name>
+          <entityField>currency</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>2b38de6e-85de-479c-99fd-27ff0d2e1c33</name>
           <entityField>DISCOUNT</entityField>
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 5cc49e65fc92472708392e92bbbcf49c77c57ae3..c8198e8f828a79b9d0d7951b2e77e24963a3239c 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -663,7 +663,7 @@ BulkMailUtils.startBulkmailWorkFlow = function(pMailLogId, pLinkId)
     {
         return
     }
-    var [actionType, workflowKey, signalName] = newSelect(["ACTION_TYPE", "WORKFLOWPROCESSDEFINITION_KEY", "WORKFLOWSIGNAL_NAME"])
+    var [linkActionType, workflowKey, signalName] = newSelect(["ACTION_TYPE", "WORKFLOWPROCESSDEFINITION_KEY", "WORKFLOWSIGNAL_NAME"])
         .from("WEBLINK")
         .where("WEBLINK.WEBLINKID", pLinkId)
         .arrayRow();
@@ -673,18 +673,18 @@ BulkMailUtils.startBulkmailWorkFlow = function(pMailLogId, pLinkId)
         .where("MAIL_LOG.MAIL_LOGID", pMailLogId)
         .cell();
     
-    var variables = {
+    var processVariables = {
         "mailLogId": pMailLogId,
         "linkId": pLinkId,
         "contactId": contactId
     };
-    if (actionType == $KeywordRegistry.weblinkActionType$startWorkflow() && workflowKey)
+    if (linkActionType == $KeywordRegistry.weblinkActionType$startWorkflow() && workflowKey)
     {
-        workflow.startProcessByKey(workflowKey, variables);
+        workflow.startProcessByKey(workflowKey, processVariables);
     }
-    else if (actionType == $KeywordRegistry.weblinkActionType$sendWorkflowSignal() && signalName)
+    else if (linkActionType == $KeywordRegistry.weblinkActionType$sendWorkflowSignal() && signalName)
     {
-        workflow.signalEventReceived(signalName, variables);
+        workflow.signalEventReceived(signalName, processVariables);
     }
 }
 
diff --git a/process/DuplicateMerge_lib/DuplicateMerge_lib.aod b/process/DuplicateMerge_lib/DuplicateMerge_lib.aod
index bc0eb0235229e83f6e13f3215fd29f3dcb46bc1a..0b31b47adabb6dffb053cbabace4bf0ce4f1b723 100644
--- a/process/DuplicateMerge_lib/DuplicateMerge_lib.aod
+++ b/process/DuplicateMerge_lib/DuplicateMerge_lib.aod
@@ -2,6 +2,7 @@
 <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>DuplicateMerge_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/DuplicateMerge_lib/documentation.adoc</documentation>
   <process>%aditoprj%/process/DuplicateMerge_lib/process.js</process>
   <variants>
     <element>LIBRARY</element>
diff --git a/process/DuplicateMerge_lib/documentation.adoc b/process/DuplicateMerge_lib/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..09fc1f75573d8c685829f051d4731e2285eaf3ed
--- /dev/null
+++ b/process/DuplicateMerge_lib/documentation.adoc
@@ -0,0 +1,5 @@
+= DuplicateMerge_lib
+
+Provides functionalities for merging 2 datasets. Currently implemented for Person and Organisation.
+
+This lib is, among other things, able to create activities for the merge and to update the duplicates for the merged datasets.
diff --git a/process/DuplicateScanner_lib/DuplicateScanner_lib.aod b/process/DuplicateScanner_lib/DuplicateScanner_lib.aod
index 6b45659f204354af0a6d1a39a810a6f008eda16c..bf45bdb540e198dcf9464c358b2a43245ab27921 100644
--- a/process/DuplicateScanner_lib/DuplicateScanner_lib.aod
+++ b/process/DuplicateScanner_lib/DuplicateScanner_lib.aod
@@ -2,6 +2,7 @@
 <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>DuplicateScanner_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/DuplicateScanner_lib/documentation.adoc</documentation>
   <process>%aditoprj%/process/DuplicateScanner_lib/process.js</process>
   <alias>Data_alias</alias>
   <variants>
diff --git a/process/DuplicateScanner_lib/documentation.adoc b/process/DuplicateScanner_lib/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d824334d2f7be4a57046b2f8efb7730bbb17115e
--- /dev/null
+++ b/process/DuplicateScanner_lib/documentation.adoc
@@ -0,0 +1,15 @@
+= DuplicateScanner_lib
+
+Provides a utility function for reading scan patterns (getScannerByEntity).
+
+Provides functions to create duplicate filterExtensions (getDuplicateConditionalListSql).
+
+Provides functions to manage ignored duplicates (filterIgnored, updateIgnored).
+
+Provides functions to search for ignored duplicates.
+The base function is DuplicateScannerUtils.getDuplicateIds. The other helper functions are
+    DuplicateScannerUtils.getDuplicateIdsByEntityScanner and DuplicateScannerUtils.getDuplicateIdsByEntityObj.
+    both call the base function but simplify the call for the 2 usecases:
+
+* get all duplicateids of a dataset by entity and uid: getDuplicateIdsByEntityScanner
+* get all duplicateids of a dataset based on the entity and the variable (if the dataset has not been saved yet).
diff --git a/process/IndexSearch_lib/IndexSearch_lib.aod b/process/IndexSearch_lib/IndexSearch_lib.aod
index b5a2aacd8c33062115f137291582acd7c0d8a36b..966a62229e274087ad9f4afa9a706cf2a5c2167c 100644
--- a/process/IndexSearch_lib/IndexSearch_lib.aod
+++ b/process/IndexSearch_lib/IndexSearch_lib.aod
@@ -2,6 +2,7 @@
 <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>IndexSearch_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/IndexSearch_lib/documentation.adoc</documentation>
   <process>%aditoprj%/process/IndexSearch_lib/process.js</process>
   <variants>
     <element>LIBRARY</element>
diff --git a/process/IndexSearch_lib/documentation.adoc b/process/IndexSearch_lib/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e1a46041bb3106b86648236d1096747bf963e355
--- /dev/null
+++ b/process/IndexSearch_lib/documentation.adoc
@@ -0,0 +1,3 @@
+= IndexSearch_lib
+
+Provides functionality to generate a adito-solr indexquery
diff --git a/process/IndexSearch_lib/process.js b/process/IndexSearch_lib/process.js
index 549aefab097b21cce5c1053bf013ec1daa322be9..0c2635e1955004b54dbe446963080d4b9d9dda21 100644
--- a/process/IndexSearch_lib/process.js
+++ b/process/IndexSearch_lib/process.js
@@ -290,13 +290,24 @@ IndexsearchFilterRow.prototype.buildQuery = function(pFieldValues)
  * 
  * @param {string} pName the row field name
  * @param {string} pOperator the operator for the group can either be 'AND' or 'OR'
- * @param {string} pValue the field valze
+ * @param {string} pValue the field value
  */
 IndexsearchFilterRow.fromFilter = function(pName, pOperator, pValue)
 {
     if(pOperator == "NOT_EQUAL" || pOperator == "CONTAINSNOT")
     {
-        return new IndexsearchFilterRow(pName, true, JSON.parse(pValue));
+        let exclude;
+        try 
+        {
+            exclude = JSON.parse(pValue);
+        }
+        // If the pValue isn't an Object or Array
+        catch (e if e instanceof SyntaxError)
+        {
+            exclude = [pValue];
+        }
+        
+        return new IndexsearchFilterRow(pName, true, exclude);
     }
     else if(pOperator == "ISNOTNULL")
     {
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index 70aee7aa9870bd982648daabff7fc23a95400894..0d59b0439da82a04fa09d6806c28433205338e65 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -628,6 +628,11 @@ ItemUtils.product_IdOnValueChange = function (pProductId, pUid, pEntity)
             neon.setFieldValue("$field.PRICE", ProductDetails.PriceListToUse.price);
             neon.setFieldValue("$field.VAT", ProductDetails.PriceListToUse.vat);
         }
+        else
+        {
+            neon.setFieldValue("$field.PRICE", "");
+            neon.setFieldValue("$field.VAT", 0);
+        }
     }
 };
 
@@ -669,7 +674,7 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
             let price = 0;
             if(pPriceObj[id])
             {
-                price = pPriceObj[id]["price"]*pPriceObj[id]["quantity"];
+                price = pPriceObj[id]["price"]*(pPriceObj[id]["quantity"] == undefined ? 1 : pPriceObj[id]["quantity"]);
             }
             calcPrice = eMath.addDec(price, calcPrice);
             if(pPriceObj[id] && pPriceObj[id]["vat"] && pPriceObj[id]["vat"] > 0)
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 92cb931a3b2ba91ace549b09c770b8eec698953f..f6b58db1ec5ec0ff20a7dd12ffdecf6bcbb62bbc 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -29,12 +29,13 @@ function ProductUtils() {}
  * @param {String} pid ProductID
  * @param {String} buySell possible values: PP, SP
  * @param {String} [onlyStandard=false] if true, only standard price lists are selected.
+ * @param {String} pCurrency
  * 
  * @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
  * 
  * @return {Array[]} currently valid product price with currency: [price, "CURRENCY", "VAT"] or [] if no price found
  */
-ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard) {
+ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard, pCurrency) {
     if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
     {
         var today = datetime.clearTime(vars.get("sys.date"), "utc");
@@ -49,6 +50,7 @@ ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard) {
                     
         actualPriceSelect.and("PRODUCTPRICE.BUYSELL", buySell)
                          .and("PRODUCTPRICE.PRODUCT_ID", pid)
+                         .andIfSet("PRODUCTPRICE.CURRENCY", pCurrency)
                          .and("PRODUCTPRICE.VALID_FROM", today, SqlBuilder.LESS_OR_EQUAL())
                          .and(newWhere("PRODUCTPRICE.VALID_TO", today, SqlBuilder.GREATER_OR_EQUAL())
                                    .or("PRODUCTPRICE.VALID_TO is null"));
diff --git a/process/rebuildDuplicates_serverProcess/documentation.adoc b/process/rebuildDuplicates_serverProcess/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b76ecd14518c25f95453633cb10473be8d112b8a
--- /dev/null
+++ b/process/rebuildDuplicates_serverProcess/documentation.adoc
@@ -0,0 +1,12 @@
+= rebuildDuplicate_serverProcess
+
+== Overview
+Manages the asynchronous server-side recalculation of all duplicates of an entity.
+This process should only be necessary initially and possibly during data imports.
+
+== Technical Details
+Currently the process is called in the rebuild action of the DuplicateScanner_entity.
+
+The batchsize of the process (how many data sets should be loaded at once)
+can be determined by the preference custom.duplicates.dataBlockSize.
+The default value is 5000.
diff --git a/process/rebuildDuplicates_serverProcess/rebuildDuplicates_serverProcess.aod b/process/rebuildDuplicates_serverProcess/rebuildDuplicates_serverProcess.aod
index 3a72b0bfc4f0fb92cacba8dbda2b2d68acbd3386..e28fee4a9b23675f047ec8759a20a6991495b3ed 100644
--- a/process/rebuildDuplicates_serverProcess/rebuildDuplicates_serverProcess.aod
+++ b/process/rebuildDuplicates_serverProcess/rebuildDuplicates_serverProcess.aod
@@ -5,6 +5,7 @@
 This process can only be executed within the client.
 The action (Rebuild selected entries) can be found in the administration context "Duplicate Configuration".</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/rebuildDuplicates_serverProcess/documentation.adoc</documentation>
   <process>%aditoprj%/process/rebuildDuplicates_serverProcess/process.js</process>
   <alias>Data_alias</alias>
   <variants>