diff --git a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
index 009d504db47c9bd92ced84f14fe82eb20565f99d..6d8837af713c70836602a8b75e8b931bfd8bc02a 100644
--- a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
@@ -2,4 +2,6 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="TopicTree/changelog.xml"/>
-</databaseChangeLog>
\ No newline at end of file
+    <include relativeToChangelogFile="true" file="xRM-Service/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="xRM-Service/changelog.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1cc1876c4c5beac27527a0e4235778e4042f8f3d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/changelog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="delete_TicketAttribute.xml"/>
+    <include relativeToChangelogFile="true" file="insert_KeywordAttributerelation.xml"/>
+    <include relativeToChangelogFile="true" file="update_ServiceticketAvailableStatus.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/delete_TicketAttribute.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/delete_TicketAttribute.xml
new file mode 100644
index 0000000000000000000000000000000000000000..569b81732fafaac8700318a2a44383db89395ff6
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/delete_TicketAttribute.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="v.broens" id="08037161-f6e6-4c9a-b6ef-20f3ecb318a8">
+        <delete tableName="ab_attributeusage">
+        <where>AB_ATTRIBUTEUSAGEID = '8d3a5dfb-5270-4cac-a132-55df49e78fc9'</where>
+    </delete>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/insert_KeywordAttributerelation.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/insert_KeywordAttributerelation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e33944f27e1e92a85692c9bfadaacd3cf17585ba
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/insert_KeywordAttributerelation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="v.broens" id="9cc04dc0-baca-4534-a3c7-2948eef0dccf">
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3d415d86-2a45-4503-8bb5-a66d373d601b"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="a81effbe-f6a3-4780-b948-17ff4f0f3bd4"/> 
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2002"/> 
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+         </insert>
+         <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7aaef1d4-6d59-45b0-862a-92622d5ade1c"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="d0332f79-bc92-4e6d-9d35-9da78904a1a1"/> 
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2002"/> 
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+         </insert>
+         <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="423c0489-b20d-481e-aadc-cf9a7a74b5d6"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="bd0fc361-60ba-490e-9a6a-5a7b98038002"/> 
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2002"/> 
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+         </insert>
+         <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1dbd2d34-af53-433a-9320-cb9a9cb81612"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="a81effbe-f6a3-4780-b948-17ff4f0f3bd4"/> 
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2001"/> 
+            <column name="BOOL_VALUE" valueNumeric="1"/>
+         </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/update_ServiceticketAvailableStatus.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/update_ServiceticketAvailableStatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b8b44b3ea5b062331d002f23bcbfd1b1ff9fde9
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Attribute/update_ServiceticketAvailableStatus.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="v.broens" id="5879b13d-d0e0-42cc-965e-f9dc499caf10">
+    <update tableName="AB_KEYWORD_ATTRIBUTERELATION">
+      <column name="LONG_CHAR_VALUE" value="[&quot;ASSIGNED&quot;,&quot;UNASSIGNED&quot;,&quot;IN-PROGRESS&quot;,&quot;ENDED&quot;,&quot;WAITING&quot;,&quot;EMPLOYEE-CHECKS&quot;,&quot;CUSTOMER-CHECKS&quot;,&quot;ENTRY&quot;,&quot;RESUBMITTED&quot;,&quot;REOPEN&quot;,&quot;REQUEST&quot;,&quot;REPLY&quot;,&quot;INTERNALREPLY&quot;,&quot;RESUBMISSION&quot;]"/>
+      <where> AB_KEYWORD_ATTRIBUTERELATIONID = 'cd293e92-224f-4bc3-9552-b3f7caa95c99'</where>
+    </update>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/DocumentTemplate/alter_Documenttemplate.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/DocumentTemplate/alter_Documenttemplate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6c5941b6bc0840c0f8ada59c4c39250987e4ec0f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/DocumentTemplate/alter_Documenttemplate.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="m.groppe" id="DOC3035c-2df9-4d5a-8b6f-272e1ba676cb">
+        <addColumn tableName="DOCUMENTTEMPLATE">
+             <column name="TEMPLATECONTENT" type="NCLOB"/>
+             <column name="ALL_TICKET_CATEGORIES" type="TINYINT"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/DocumentTemplate/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/DocumentTemplate/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c7cc40a6e8af73bffade26331564d13b0427bfa
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/DocumentTemplate/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="alter_Documenttemplate.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2da020a0a2a0aff36eabd622f656933339a02fe5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/changelog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="create_DocumentTemplateTicketCategory.xml"/>
+    <include relativeToChangelogFile="true" file="create_Employeegroup.xml"/>
+    <include relativeToChangelogFile="true" file="create_Employeegroup_contact_relation.xml"/>
+    <include relativeToChangelogFile="true" file="create_Employeegroup_rule.xml"/>
+    <include relativeToChangelogFile="true" file="create_Employeegroup_rulegroup.xml"/>
+    <include relativeToChangelogFile="true" file="create_Employeegroup_rulegroup_relation.xml"/>
+    <include relativeToChangelogFile="true" file="create_Inbox.xml"/>
+    <include relativeToChangelogFile="true" file="create_Inbox_Employeegroup_relation.xml"/>
+    <include relativeToChangelogFile="true" file="create_Inboxfilter.xml"/>
+    <include relativeToChangelogFile="true" file="create_Inboxfiltergroup.xml"/>
+    <include relativeToChangelogFile="true" file="create_Inboxfiltergroup_relation.xml"/>
+    <include relativeToChangelogFile="true" file="create_Mailsignature.xml"/>
+    <include relativeToChangelogFile="true" file="create_TicketTemplates.xml"/>
+    <include relativeToChangelogFile="true" file="create_attributeFilter.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_DocumentTemplateTicketCategory.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_DocumentTemplateTicketCategory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0630b36cff3718eae02c93c2c43ea5ac78ea5f14
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_DocumentTemplateTicketCategory.xml
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.luginger" id="5514c30d-26ee-44b4-ab4d-8fb5b8d0859e">
+        <createTable tableName="DOCUMENTTEMPLATE_TICKETCATEGORY">
+            <column name="DOCUMENTTEMPLATE_TICKETCATEGORYID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DOCTEMP_TICKETCATEGORY_DOCTEMP_TICKETCATEGORYID"/>
+            </column>   
+            <column name="DOCUMENTTEMPLATE_ID" type="CHAR(36)"/>    
+            <column name="CLASSIFICATION" type="VARCHAR(36)"/>
+            <column name="USER_NEW" type="NVARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_NEW" type="DATETIME">
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_EDIT" type="NVARCHAR(50)" />
+            <column name="DATE_EDIT" type="DATETIME" />
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c84e22bc634fc37d1ca5610674df64271d6dd7f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="90827608-ce90-4bf4-b69a-d8f8d743f807">
+        <createTable tableName="EMPLOYEEGROUP" >
+            <column name="EMPLOYEEGROUPID" type="char(36)">
+                <constraints primaryKey = "true" nullable = "false"/>
+            </column>
+            <column name="GROUPNAME" type="varchar(50)"/>
+            <column name="STATUS" type="char(36)"/>
+            <column name="DATE" type="datetime"/>
+        </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_contact_relation.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_contact_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e0103fbca018c38494037fb648e765258088dba5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_contact_relation.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="" id="9fd18e23-4254-4762-aacb-b6c1dc705e37">
+        <createTable tableName="EMPLOYEEGROUP_CONTACT_RELATION" >
+            <column name="EMPLOYEEGROUP_CONTACT_RELATIONID" type="char(36)">
+                <constraints primaryKey = "true" nullable = "false"/>
+            </column>
+            <column name="CONTACT_ID" type="char(36)"/>
+            <column name="EMPLOYEEGROUP_ID" type="char(36)"/>
+        </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rule.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rule.xml
new file mode 100644
index 0000000000000000000000000000000000000000..807cb80455a69f0082ad7a6013ab707ff64dfa98
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rule.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="1156a492-0b49-406a-82ca-54c18d987ccb">
+        <createTable tableName="EMPLOYEEGROUP_RULE" >
+            <column name="EMPLOYEEGROUP_RULEID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+            </column>
+            <column name="EMPLOYEEGROUP_RULEGROUP_ID" type="char(36)"/>
+            <column name="COND" type="NCLOB"/>
+            <column name="NAME" type="varchar(50)"/>
+        </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rulegroup.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rulegroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cc2a92567f24fe5b1faef7af5dc12f28c56f14e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rulegroup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="5756f487-300d-49a9-85c9-e1fbb59ca381">
+    <createTable tableName="EMPLOYEEGROUP_RULEGROUP" >
+        <column name="EMPLOYEEGROUP_RULEGROUPID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="STATE" type="varchar(36)"/>
+        <column name="NAME" type="varchar(50)"/>
+        <column name="DATE" type="datetime"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rulegroup_relation.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rulegroup_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..06645abee09e6cbf16ede5be004d1a8f67334efc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Employeegroup_rulegroup_relation.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="" id="da2e78e3-a8da-4406-92c1-9192a7bcf14f">
+    <createTable tableName="EMPLOYEEGROUP_RULEGROUP_RELATION" >
+        <column name="EMPLOYEEGROUP_RULEGROUP_RELATIONID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="EMPLOYEEGROUP_RULEGROUP_ID" type="char(36)"/>
+        <column name="EMPLOYEEGROUP_ID" type="char(36)"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inbox.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d4c8e588fb231062811eb418e9bf9a92edc78cde
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inbox.xml
@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="24e1b93f-fd1b-456d-985e-80f5e9be24bf">
+    <createTable  tableName="INBOX">
+        <column name="INBOXID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="NAME" type="varchar(30)"/>
+        <column name="EMAIL_ADDRESS" type="varchar(254)"/>
+        <column name="INBOXDATE" type="datetime"/>
+        <column name="STATUS" type="varchar(36)"/>
+        <column name="REOPEN_DELAY" type="int(10)"/>
+        <column name="CLOSURE_DAYS" type="int(10)"/>
+    </createTable> 
+  </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inbox_Employeegroup_relation.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inbox_Employeegroup_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1c8d7dd9552be03d4ed70243fefa7a5d70e72e8
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inbox_Employeegroup_relation.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="343073bd-69e6-4443-a4c8-3978082ac501">
+    <createTable tableName="INBOX_EMPLOYEEGROUP_RELATION" >
+        <column name="INBOX_EMPLOYEEGROUP_RELATIONID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="EMPLOYEEGROUP_ID" type="char(36)"/>
+        <column name="INBOX_ID" type="char(36)"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfilter.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfilter.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ffd041050e981ba89b3f1cff7d746e838a7347da
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfilter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="3affddf3-3e6c-426b-beb4-f58ef2b1d352">
+    <createTable tableName="INBOXFILTER" >
+        <column name="INBOXFILTERID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="INBOXFILTERGROUP_ID" type="char(36)"/>
+        <column name="COMPONENT" type="varchar(36)"/>
+        <column name="SEARCHTERM" type="varchar(50)"/>
+        <column name="TICKETTEMPLATE_ID" type="CHAR(36)"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfiltergroup.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfiltergroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..acd8722c87fd3dfb2fad4d466399dac9ebba4141
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfiltergroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="" id="33f59097-918f-4d3a-9b9e-3804f774ec96">
+    <createTable tableName="INBOXFILTERGROUP" >
+        <column name="INBOXFILTERGROUPID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="STATE" type="varchar(36)"/>
+        <column name="NAME" type="varchar(50)"/>
+        <column name="DATE" type="datetime"/>
+        <column name="PRIORITY" type="int(10)"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfiltergroup_relation.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfiltergroup_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f13ceea2dd031e1a8a4e993717206b0906ccc34d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Inboxfiltergroup_relation.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="" id="5d680cbe-b924-4e5b-9a48-3dfde0a405ed">
+    <createTable tableName="INBOXFILTERGROUP_RELATION" >
+        <column name="INBOXFILTERGROUP_RELATIONID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="INBOXFILTERGROUP_ID" type="char(36)"/>
+        <column name="INBOX_ID" type="char(36)"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Mailsignature.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Mailsignature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..798cd9315816d1606bc83148ee336064477e9a7c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_Mailsignature.xml
@@ -0,0 +1,21 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="" id="40eb1e9d-acbd-4520-badd-81de515939a6">
+    <createTable tableName="MAILSIGNATURE" >
+        <column name="MAILSIGNATUREID" type="char(36)">
+            <constraints primaryKey = "true" nullable = "false"/>
+        </column>
+        <column name="MAIL_ADDRESS" type="varchar(254)"/>
+        <column name="INBOX_ID" type="char(36)"/>
+        <column name="SIGNATURE_DOCUMENTTEMPLATE_ID" type="char(36)"/>
+        <column name="DOCUMENTTEMPLATE_ID" type="char(36)"/>
+        <column name="SEND_MAIL" type="SMALLINT"/>
+        <column name="ANSWER_MAIL_ADDRESS" type="VARCHAR(254)"/>
+        <column name="DEFAULTSIGNATURE" type="TINYINT"/>
+        <column name="DEFAULT_TICKETTEMPLATE_ID" type="CHAR(36)"/>
+        <column name="WORKFLOW" type="VARCHAR(255)"/>
+    </createTable>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_TicketTemplates.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_TicketTemplates.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d93a3de4aafbf05c62f99a6c0954162943163735
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_TicketTemplates.xml
@@ -0,0 +1,27 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="v.broens" id="4dc221ce-202c-437f-ab5f-f732a40f4151">
+        <createTable tableName="TICKETTEMPLATE">
+            <column name="TICKETTEMPLATEID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="TICKETTEMPLATEID"/>
+            </column>
+            <column name="ACTIVE"                type="TINYINT"/>
+            <column name="TEMPLATENO"            type="SMALLINT"/>
+            <column name="TEMPLATENAME"          type="VARCHAR(100)"/>
+            <column name="INBOX_ID"              type="CHAR(36)"/>
+            <column name="CATEGORY"              type="VARCHAR(36)"/>
+            <column name="TITLE"                 type="VARCHAR(100)"/>
+            <column name="DESCRIPTION"           type="NCLOB"/>
+            <column name="REVIEW"                type="TINYINT"/>
+            <column name="MATURING_TIME"         type="SMALLINT"/>
+            <column name="PRIORITY"              type="VARCHAR(36)"/>
+            <column name="STATUS"                type="VARCHAR(36)"/>
+            <column name="CONCLUSION"            type="VARCHAR(36)"/>
+            <column name="INDIVIDUAL_ANSWER"     type="SMALLINT"/>
+            <column name="DOCUMENTTEMPLATE_ID"   type="char(36)"/>
+            <column name="STATUS_MAILBRIDGE"     type="varchar(36)"/>
+            <column name="CONCLUSION_MAILBRIDGE" type="varchar(36)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_attributeFilter.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_attributeFilter.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c4166076fe5b4de2219a6988117f20da38af5f7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Init/create_attributeFilter.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet author="j.luginger" id="a7819434-a70c-4c2e-9833-6500162288ed">
+        <createTable tableName="ATTRIBUTE_FILTER">
+            <column name="ATTRIBUTE_FILTERID" type="CHAR(36)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_ATTRIBUTE_FILTER_ATTRIBUTE_FILTERID"/>
+            </column>
+            <column name="INBOXFILTERGROUP_ID" type="char(36)"/>
+            <column name="COMPONENT" type="varchar(36)"/>
+            <column name="SEARCHTERM" type="varchar(50)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_DocumentTemplateTypeCategory.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_DocumentTemplateTypeCategory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0144dd52fb2eb2728853ed18647f19e8973f56fa
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_DocumentTemplateTypeCategory.xml
@@ -0,0 +1,43 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="v.broens" id="9a6e03f7-b8bd-4c00-bc92-7a91989ad5aa">
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="a81effbe-f6a3-4780-b948-17ff4f0f3bd4"/>  
+            <column  name="KEYID"  value="10"/>  
+            <column  name="TITLE"  value="Single (Service/All)"/>  
+            <column  name="CONTAINER"  value="DocumentTemplateTypeCategory"/>  
+            <column  name="SORTING"  valueNumeric="10"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="e23c8316-d43a-4606-803e-d4488823cc52"/>
+        </insert> 
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="d0332f79-bc92-4e6d-9d35-9da78904a1a1"/>  
+            <column  name="KEYID"  value="11"/>  
+            <column  name="TITLE"  value="Single (Service/Internal)"/>  
+            <column  name="CONTAINER"  value="DocumentTemplateTypeCategory"/>  
+            <column  name="SORTING"  valueNumeric="11"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="e23c8316-d43a-4606-803e-d4488823cc52"/>
+        </insert> 
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="bd0fc361-60ba-490e-9a6a-5a7b98038002"/>  
+            <column  name="KEYID"  value="12"/>  
+            <column  name="TITLE"  value="Single (Service/External)"/>  
+            <column  name="CONTAINER"  value="DocumentTemplateTypeCategory"/>  
+            <column  name="SORTING"  valueNumeric="12"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="e23c8316-d43a-4606-803e-d4488823cc52"/>
+        </insert> 
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_documentTemplateTypes.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_documentTemplateTypes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fec2f43befd924202c7192bdc27e9e26f6ba769e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_documentTemplateTypes.xml
@@ -0,0 +1,26 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="m.groppe" id="eb3da3f0-9540-4c87-a62e-a48591e30b87">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="bc11b7a8-056b-4b05-a91c-40d7a7f92ee9"/>
+            <column name="KEYID" value="SIGNATURE"/>                            
+            <column name="TITLE" value="Signature"/>
+            <column name="CONTAINER" value="DocumentTemplateType"/>
+            <column name="SORTING" valueNumeric="4"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="5ef76e62-b8b2-4b63-8fda-898fc2490011"/>
+            <column name="KEYID" value="REPLY_MAIL"/>                            
+            <column name="TITLE" value="Reply Mail"/>
+            <column name="CONTAINER" value="DocumentTemplateType"/>
+            <column name="SORTING" valueNumeric="4"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_ticket_status.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_ticket_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..616f98a06501dc1ed68a332698a6561c76b46cb0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/add_ticket_status.xml
@@ -0,0 +1,106 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="c.groeger" id="f80e2006-be5c-42a3-bb58-782ed0fe6375">
+    <!-- entry -->  
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="39ec137c-f4d3-11e9-802a-5aa538984bd8"/>
+      <column name="KEYID"  value="ENTRY"/>
+      <column name="TITLE" value="entry"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="110"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+        <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2cf81310-f72f-11e9-8f0b-362b9e155667"/>
+        <column name="AB_KEYWORD_ENTRY_ID" value="39ec137c-f4d3-11e9-802a-5aa538984bd8"/> 
+        <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+        <column name="CHAR_VALUE" value="VAADIN:ENVELOPE"/>
+     </insert>
+    
+    <!-- re-open -->    
+   <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="39ec15e8-f4d3-11e9-802a-5aa538984bd8"/>
+      <column name="KEYID"  value="REOPEN"/>
+      <column name="TITLE" value="re-open"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="120"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+        <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2cf816a8-f72f-11e9-8f0b-362b9e155667"/>
+        <column name="AB_KEYWORD_ENTRY_ID" value="39ec15e8-f4d3-11e9-802a-5aa538984bd8"/> 
+        <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+        <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+    </insert>
+    
+     <!-- request -->    
+     <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="39ec173c-f4d3-11e9-802a-5aa538984bd8"/>
+      <column name="KEYID"  value="REQUEST"/>
+      <column name="TITLE" value="request"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="130"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+        <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2cf81914-f72f-11e9-8f0b-362b9e155667"/>
+        <column name="AB_KEYWORD_ENTRY_ID" value="39ec173c-f4d3-11e9-802a-5aa538984bd8"/> 
+        <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+        <column name="CHAR_VALUE" value="NEON:STATUS_CUSTOMER_CHECK"/>
+    </insert>
+    
+     <!-- reply -->   
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="39ec187c-f4d3-11e9-802a-5aa538984bd8"/>
+      <column name="KEYID"  value="REPLY"/>
+      <column name="TITLE" value="reply"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="140"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+   <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+        <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2cf81a68-f72f-11e9-8f0b-362b9e155667"/>
+        <column name="AB_KEYWORD_ENTRY_ID" value="39ec187c-f4d3-11e9-802a-5aa538984bd8"/> 
+        <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+        <column name="CHAR_VALUE" value="NEON:EXPORT"/>
+   </insert>
+   
+     <!-- internal reply --> 
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="39ec1e58-f4d3-11e9-802a-5aa538984bd8"/>
+      <column name="KEYID"  value="INTERNALREPLY"/>
+      <column name="TITLE" value="internal reply"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="160"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+        <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2cf81f86-f72f-11e9-8f0b-362b9e155667"/>
+        <column name="AB_KEYWORD_ENTRY_ID" value="39ec1e58-f4d3-11e9-802a-5aa538984bd8"/> 
+        <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+        <column name="CHAR_VALUE" value="NEON:IMPORT"/>
+   </insert>
+
+     <!-- done --> 
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="39ec19b2-f4d3-11e9-802a-5aa538984bd8"/>
+      <column name="KEYID"  value="DONE"/>
+      <column name="TITLE" value="done"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="170"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+     <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+        <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2cf820ee-f72f-11e9-8f0b-362b9e155667"/>
+        <column name="AB_KEYWORD_ENTRY_ID" value="39ec19b2-f4d3-11e9-802a-5aa538984bd8"/> 
+        <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+        <column name="CHAR_VALUE" value="NEON:STATUS_DONE"/>
+     </insert>     
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc5367eeae9d089db0b43c034db5d1ff34cf57af
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/changelog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="add_DocumentTemplateTypeCategory.xml"/>
+    <include relativeToChangelogFile="true" file="add_documentTemplateTypes.xml"/>
+    <include relativeToChangelogFile="true" file="add_ticket_status.xml"/>
+    <include relativeToChangelogFile="true" file="init_InboxFilterComponent.xml"/>
+    <include relativeToChangelogFile="true" file="init_InboxFilterTarget.xml"/>
+    <include relativeToChangelogFile="true" file="init_employeeGroupStatus.xml"/>
+    <include relativeToChangelogFile="true" file="init_inboxstatus.xml"/>
+    <include relativeToChangelogFile="true" file="init_keyword_category.xml"/>
+    <include relativeToChangelogFile="true" file="init_ticket_category.xml"/>
+    <include relativeToChangelogFile="true" file="insert_TaskStatusKW.xml"/>
+    <include relativeToChangelogFile="true" file="insert_KeywordActivityCategoryPhone.xml"/>
+    <include relativeToChangelogFile="true" file="insert_conclusionKeywords.xml"/>
+    <include relativeToChangelogFile="true" file="update_ActivityCategory.xml"/>
+    <include relativeToChangelogFile="true" file="update_keyword_attribute.xml"/>
+    <include relativeToChangelogFile="true" file="update_keyword_entry.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_InboxFilterComponent.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_InboxFilterComponent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc892aca8b53a8e8761f5c31cb80c6ba3f8fdb70
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_InboxFilterComponent.xml
@@ -0,0 +1,36 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+ <changeSet author="j.luginger" id="9385770a-bc41-4e2c-8158-961f3df04bc0">     
+    
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="bda4326f-355c-41b4-8695-af93dfab0247"/>
+      <column name="KEYID"  value="BODY"/>
+      <column name="TITLE" value="Body"/>
+      <column name="CONTAINER" value="InboxFilterComponent"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+     
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b0365dcf-7dd2-435b-8fec-15df16e73901"/>
+      <column name="KEYID"  value="SUBJECT"/>
+      <column name="TITLE" value="Subject"/>
+      <column name="CONTAINER" value="InboxFilterComponent"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+
+     <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="6d2cf34c-d2b3-4359-bf08-b54a8d79a9d1"/>
+      <column name="KEYID"  value="SENDER"/>
+      <column name="TITLE" value="Sender"/>
+      <column name="CONTAINER" value="InboxFilterComponent"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_InboxFilterTarget.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_InboxFilterTarget.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ed65d2c8e60753c1ad33f527621a56bed3dee3cd
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_InboxFilterTarget.xml
@@ -0,0 +1,26 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+ <changeSet author="j.luginger" id="82f21109-bd75-4b8a-8099-8b429141c5ae">     
+    
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="625799b0-2fc2-4ca8-8067-7fbd6b71dc26"/>
+      <column name="KEYID"  value="CATEGORY"/>
+      <column name="TITLE" value="Category"/>
+      <column name="CONTAINER" value="InboxFilterTarget"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+     
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="72067ff8-bb99-47bd-a51e-1b1bfbb9a56d"/>
+      <column name="KEYID"  value="ATTRIBUT"/>
+      <column name="TITLE" value="Attribut"/>
+      <column name="CONTAINER" value="InboxFilterTarget"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_employeeGroupStatus.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_employeeGroupStatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96ba8e14058d88478135cb1568fd5f59fd39e37a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_employeeGroupStatus.xml
@@ -0,0 +1,26 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="c.groeger" id="eb3da3f0-8340-4c87-a62e-a48591e30b87">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="f75f524a-7082-42ad-b4ed-567a304b9435"/>
+            <column name="KEYID" value="ACTIVE"/>                            
+            <column name="TITLE" value="active"/>
+            <column name="CONTAINER" value="EmployeeGroupStatus"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+         <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="32ff2197-5336-4f01-b750-0fc44463edf5"/>
+            <column name="KEYID" value="INACTIVE"/>                            
+            <column name="TITLE" value="inactive"/>
+            <column name="CONTAINER" value="EmployeeGroupStatus"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_inboxstatus.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_inboxstatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e26abd9c1915936bd053457810470dfa59b5633b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_inboxstatus.xml
@@ -0,0 +1,26 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="c.groeger" id="4ef8c9a6-722e-4f71-a360-502dc4368d97">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="635124c4-6d42-4286-af57-24c381648b84"/>
+            <column name="KEYID" value="ACTIVE"/>                            
+            <column name="TITLE" value="active"/>
+            <column name="CONTAINER" value="InboxStatus"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+         <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="3aa0d361-7aa3-42ad-b019-7ff75d0c9f95"/>
+            <column name="KEYID" value="INACTIVE"/>                            
+            <column name="TITLE" value="inactive"/>
+            <column name="CONTAINER" value="InboxStatus"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_keyword_category.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_keyword_category.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b361efdb3da0a21cd95c7da4f9facb91828c49a8
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_keyword_category.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="23386a74-bdb3-40fa-bcba-7c9c723fa7cf">
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="7aef07f1-a947-4303-a72b-ae871e02c130"/>
+      <column name="NAME" value="EmployeeGroupStatus"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="7723f275-e9b2-4a77-92de-e2e558638664"/>
+      <column name="NAME" value="InboxFilterComponent"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="b9232d1a-f948-4c7e-9797-0783b8a4b84e"/>
+      <column name="NAME" value="InboxFilterTarget"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="65a70dee-7cdf-4648-9851-211c2d3d2141"/>
+      <column name="NAME" value="InboxStatus"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+      <column name="NAME" value="TicketCategory"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_ticket_category.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_ticket_category.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8da515ee9d8e1122d89fcc011dadff9d5c9d6029
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/init_ticket_category.xml
@@ -0,0 +1,56 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog
+http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    
+    <changeSet author="c.groeger" id="a97ef606-3e3c-4e8a-9d28-c03c6291608b">
+        
+         <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="68739ac0-3bf7-49ac-a349-0f645bf49cd2"/>
+            <column name="KEYID" value="ALL"/>                            
+            <column name="TITLE" value="all"/>
+            <column name="CONTAINER" value="TicketCategory"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+        </insert>
+        
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="68739ac0-3bf4-4efa-8ed9-d380f98d8282"/>
+            <column name="KEYID" value="UNDEFINED"/>                            
+            <column name="TITLE" value="undefined"/>
+            <column name="CONTAINER" value="TicketCategory"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+        </insert>
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="da8db700-dd47-4da2-9f72-fb14b7ded889"/>  
+            <column  name="KEYID"  value="CANCELLATION"/>  
+            <column  name="TITLE"  value="Cancellation"/>  
+            <column  name="CONTAINER"  value="TicketCategory"/>  
+            <column  name="SORTING"  valueNumeric="2"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="11af1945-8649-44c8-a6c0-3100f8673c78"/>  
+        </insert>  
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="5b946563-0658-47dd-9620-a57f7003608a"/>  
+            <column  name="KEYID"  value="QUERY"/>  
+            <column  name="TITLE"  value="Query"/>  
+            <column  name="CONTAINER"  value="TicketCategory"/>  
+            <column  name="SORTING"  valueNumeric="3"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="11af1945-8649-44c8-a6c0-3100f8673c78"/>  
+        </insert> 
+        
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_KeywordActivityCategoryPhone.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_KeywordActivityCategoryPhone.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66d04223fb0eb28a1edbdfda57f25ece4133e49d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_KeywordActivityCategoryPhone.xml
@@ -0,0 +1,26 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="m.kremer" id="cebc788a-c4a6-4770-973e-aa228fe3af74">   
+        <!-- ActivityCategory : Note  -->  
+        <insert tableName="AB_KEYWORD_ENTRY">
+          <column name="AB_KEYWORD_ENTRYID" value="6ad8671c-2b56-11eb-b82d-269a2a1f428b"/>
+          <column name="KEYID"  value="NOTE"/>
+          <column name="TITLE" value="Note"/>
+          <column name="CONTAINER" value="ActivityCategory"/>
+          <column name="SORTING" valueNumeric="6"/>
+          <column name="ISACTIVE" valueNumeric="1"/>
+          <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+        <!-- ActivityCategory : Contact Formulat -->
+        <insert tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="45416a72-b74e-40de-a98d-e3866b9d5c6b"/>  
+            <column  name="KEYID"  value="CONTACT_FORMULAR"/>  
+            <column  name="TITLE"  value="contact formular"/>  
+            <column  name="CONTAINER"  value="ActivityCategory"/>  
+            <column  name="SORTING"  valueNumeric="8"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="a5206aff-79f8-413e-a76d-4cb9d39694d3"/>  
+        </insert>  
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_TaskStatusKW.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_TaskStatusKW.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4b58228e0bed1c5ee2fda108df9b5d81647f2827
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_TaskStatusKW.xml
@@ -0,0 +1,43 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.kremer" id="5bca06c6-4cbd-4ef5-8e27-04f813293118">
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="dfb270bf-db29-4555-b805-cfa3560ae8cc"/>  
+            <column  name="KEYID"  value="EMPLOYEE-CHECKS"/>  
+            <column  name="TITLE"  value="employee checks"/>  
+            <column  name="CONTAINER"  value="TaskStatus"/>  
+            <column  name="SORTING"  valueNumeric="101"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="1"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+        </insert> 
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ba4bf1f0-2ddf-4081-8e51-19ac8487377b"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="1061168a-4b17-4ba5-be70-948c0dd78f20"/> 
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+            <column name="CHAR_VALUE" value="NEON:IMPORT"/>
+         </insert>
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="33925ee2-5130-441b-aa70-20772ebf28d7"/>  
+            <column  name="KEYID"  value="RESUBMITTED"/>  
+            <column  name="TITLE"  value="resubmitted"/>  
+            <column  name="CONTAINER"  value="TaskStatus"/>  
+            <column  name="SORTING"  valueNumeric="190"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="1"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+        </insert>  
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f49fa692-e391-4bb1-a41f-5c0aa59c7d90"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="33925ee2-5130-441b-aa70-20772ebf28d7"/> 
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/> 
+            <column name="CHAR_VALUE" value="NEON:IMPORT"/>
+         </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_conclusionKeywords.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_conclusionKeywords.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7be3b1468cb5f5e6d09ad0b6398821283d4869d6
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/insert_conclusionKeywords.xml
@@ -0,0 +1,51 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="" id="7b0f0001-6722-4210-b74c-1dd532d5164f">
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="a6c3c183-e2fc-4846-8b1b-fc914420b780"/>  
+            <column  name="KEYID"  value="SUCCESS"/>  
+            <column  name="TITLE"  value="Success"/>  
+            <column  name="CONTAINER"  value="TICKETCONCLUSION"/>  
+            <column  name="SORTING"  valueNumeric="0"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="fd79afd3-7bea-4733-9ba6-6b784724c1a0"/>  
+        </insert>  
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="cb92c958-f9db-4e33-b50b-818dd2f4c2e8"/>  
+            <column  name="KEYID"  value="FAILURE_CUSTOMER"/>  
+            <column  name="TITLE"  value="Failure (customer)"/>  
+            <column  name="CONTAINER"  value="TICKETCONCLUSION"/>  
+            <column  name="SORTING"  valueNumeric="0"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="fd79afd3-7bea-4733-9ba6-6b784724c1a0"/>  
+        </insert>  
+        <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="983a0c3f-e12f-4aa7-b1a4-03d12052ba7a"/>  
+            <column  name="KEYID"  value="FAILURE_EMPLOYEE"/>  
+            <column  name="TITLE"  value="Failure (employee)"/>  
+            <column  name="CONTAINER"  value="TICKETCONCLUSION"/>  
+            <column  name="SORTING"  valueNumeric="2"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="fd79afd3-7bea-4733-9ba6-6b784724c1a0"/>  
+        </insert>  
+        <insert    
+                  
+                tableName="ab_keyword_category">  
+            <column  name="AB_KEYWORD_CATEGORYID"  value="fd79afd3-7bea-4733-9ba6-6b784724c1a0"/>  
+            <column  name="NAME"  value="TICKETCONCLUSION"/>  
+            <column  name="SORTINGBY"  valueNumeric="0"/>  
+            <column  name="SORTINGDIRECTION"  value="ASC"/>  
+        </insert>  
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_ActivityCategory.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_ActivityCategory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04ab8b15b3465ff496e2b2127c153da6f1af7d67
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_ActivityCategory.xml
@@ -0,0 +1,42 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="v.broens" id="16a6fcba-3f29-4478-93d3-dcb719b73456">
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="SORTING" valueNumeric="8"/>
+      <column name="CONTAINER" value="ActivityCategory"/>
+      <where> AB_KEYWORD_ENTRYID = '45416a72-b74e-40de-a98d-e3866b9d5c6b'</where>
+    </update>
+    <insert    
+                  
+                tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="e45b1950-f5f8-4283-9811-b03ced0d2f98"/>  
+            <column  name="KEYID"  value="SYS"/>  
+            <column  name="TITLE"  value="System"/>  
+            <column  name="CONTAINER"  value="ActivityCategory"/>  
+            <column  name="SORTING"  valueNumeric="9"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="a5206aff-79f8-413e-a76d-4cb9d39694d3"/>
+    </insert>
+    <insert    
+                  
+                tableName="ab_keyword_attributerelation">  
+            <column  name="AB_KEYWORD_ATTRIBUTERELATIONID"  value="0ddc07d5-0ac2-408d-bca3-58c9f1590faa"/>  
+            <column  name="AB_KEYWORD_ENTRY_ID"  value="e45b1950-f5f8-4283-9811-b03ced0d2f98"/> 
+            <column  name="AB_KEYWORD_ATTRIBUTE_ID"  value="25e3cad8-3661-49ae-aed0-dbf98ce8a620"/>  
+            <column  name="CHAR_VALUE"  value="VAADIN:AUTOMATION"/>
+            <column  name="BOOL_VALUE"  valueNumeric="0"/>
+    </insert>  
+    <insert    
+                  
+                tableName="ab_keyword_attribute">  
+            <column  name="AB_KEYWORD_ATTRIBUTEID"  value="25e3cad8-3661-49ae-aed0-dbf98ce8a620"/> 
+            <column  name="NAME"  value="defaultAvatarRepresentation"/>  
+            <column  name="KIND"  value="CHAR_VALUE"/> 
+            <column  name="CONTAINER"  value="ActivityCategory"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="a5206aff-79f8-413e-a76d-4cb9d39694d3"/>
+    </insert>      
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_keyword_attribute.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_keyword_attribute.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec1deb2c65e38307dc8292462ce5f7e834553879
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_keyword_attribute.xml
@@ -0,0 +1,13 @@
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="99cb8d21-38ab-4c4c-a667-71662d1716f1">
+    <update tableName="AB_KEYWORD_ATTRIBUTE">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="e23c8316-d43a-4606-803e-d4488823cc52"/>
+      <where>AB_KEYWORD_ATTRIBUTEID = '37973717-5565-4035-848a-0d682990d301'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ATTRIBUTE">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="e23c8316-d43a-4606-803e-d4488823cc52"/>
+      <where>AB_KEYWORD_ATTRIBUTEID = 'c31e0ba9-4c95-495e-ad90-0e1a1a92e834'</where>
+    </update>
+  </changeSet>
+</databaseChangeLog>
+
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_keyword_entry.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_keyword_entry.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d73ae85e96a3fb12a3697678a2610fda8df9e1cc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Keywords/update_keyword_entry.xml
@@ -0,0 +1,104 @@
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="964ff69e-5cea-4b15-987c-21be8bfdddc1">
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="7aef07f1-a947-4303-a72b-ae871e02c130"/>
+      <where>AB_KEYWORD_ENTRYID = '32ff2197-5336-4f01-b750-0fc44463edf5'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec137c-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec15e8-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec173c-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec187c-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec19b2-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec1ae8-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="6818d2a6-f47a-4d72-a0b2-3fc6fc74fb27"/>
+      <where>AB_KEYWORD_ENTRYID = '39ec1e58-f4d3-11e9-802a-5aa538984bd8'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="65a70dee-7cdf-4648-9851-211c2d3d2141"/>
+      <where>AB_KEYWORD_ENTRYID = '3aa0d361-7aa3-42ad-b019-7ff75d0c9f95'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+      <where>AB_KEYWORD_ENTRYID = '3fe6e6de-33ab-4193-9fac-0b2d9821bbd3'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="b5afd40b-bfa7-4aee-89ea-06b8c7deb304"/>
+      <where>AB_KEYWORD_ENTRYID = '5ef76e62-b8b2-4b63-8fda-898fc2490011'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="b9232d1a-f948-4c7e-9797-0783b8a4b84e"/>
+      <where>AB_KEYWORD_ENTRYID = '625799b0-2fc2-4ca8-8067-7fbd6b71dc26'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="65a70dee-7cdf-4648-9851-211c2d3d2141"/>
+      <where>AB_KEYWORD_ENTRYID = '635124c4-6d42-4286-af57-24c381648b84'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+      <where>AB_KEYWORD_ENTRYID = '68739ac0-3bf4-4efa-8ed9-d380f98d8282'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="a5206aff-79f8-413e-a76d-4cb9d39694d3"/>
+      <where>AB_KEYWORD_ENTRYID = '6ad8671c-2b56-11eb-b82d-269a2a1f428b'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="7723f275-e9b2-4a77-92de-e2e558638664"/>
+      <where>AB_KEYWORD_ENTRYID = '6d2cf34c-d2b3-4359-bf08-b54a8d79a9d1'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="b9232d1a-f948-4c7e-9797-0783b8a4b84e"/>
+      <where>AB_KEYWORD_ENTRYID = '72067ff8-bb99-47bd-a51e-1b1bfbb9a56d'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="a5206aff-79f8-413e-a76d-4cb9d39694d3"/>
+      <where>AB_KEYWORD_ENTRYID = '72edb6df-71cf-42f4-be3d-ac494edbf40f'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+      <where>AB_KEYWORD_ENTRYID = 'a80cdc75-8e6f-46c0-81ca-a99fef6be83d'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="7723f275-e9b2-4a77-92de-e2e558638664"/>
+      <where>AB_KEYWORD_ENTRYID = 'b0365dcf-7dd2-435b-8fec-15df16e73901'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="b5afd40b-bfa7-4aee-89ea-06b8c7deb304"/>
+      <where>AB_KEYWORD_ENTRYID = 'bc11b7a8-056b-4b05-a91c-40d7a7f92ee9'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="7723f275-e9b2-4a77-92de-e2e558638664"/>
+      <where>AB_KEYWORD_ENTRYID = 'bda4326f-355c-41b4-8695-af93dfab0247'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+      <where>AB_KEYWORD_ENTRYID = 'f0ee12d8-5ab2-4088-a90c-b158c9ea2b92'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="7aef07f1-a947-4303-a72b-ae871e02c130"/>
+      <where>AB_KEYWORD_ENTRYID = 'f75f524a-7082-42ad-b4ed-567a304b9435'</where>
+    </update>
+    <update tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+      <where>AB_KEYWORD_ENTRYID = 'undefinited-4-4efa-8ed9-d380f98d8282'</where>
+    </update>
+  </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Ticket/alter_Ticket_AddColumns.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Ticket/alter_Ticket_AddColumns.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7f990c8bbdb9fcec64b0d8117ae7bf29a1e8f38f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Ticket/alter_Ticket_AddColumns.xml
@@ -0,0 +1,25 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="v.broens" id="679975a8-850e-4b30-a634-6794b74a9218">
+      <addColumn tableName="ticket">
+            <column name = "EDITOR_CONTACT_ID"     type = "char(36)"/>
+            <column name = "CATEGORY"              type = "varchar(36)"/>
+            <column name = "INBOX_ID"              type = "char(36)"/>
+            <column name = "ORDER_ID"              type = "char(36)"/>
+            <column name = "MAILSIGNATURE_ID"      type = "char(36)"/>
+            <column name = "SENDER_EMAIL"          type = "varchar(254)"/>
+            <column name = "MEDIUM"                type = "varchar(36)"/>
+            <column name = "DATE_EDIT_STATUS"      type = "datetime"/>
+            <column name = "CC_RECIPIENTS"         type = "varchar(500)"/>
+            <column name = "DATE_BEGIN"            type = "datetime"/>
+            <column name = "DATE_END"              type = "datetime"/>
+            <column name = "ALTERNATIVE_EMAILADDR" type = "varchar(255)"/> 
+            <column name = "ALTERNATIVE_PHONEADDR" type = "varchar(255)"/>
+            <column name = "EMAIL_SUBJECT"         type = "varchar(150)"/> 
+            <column name = "CONCLUSION"            type = "varchar(36)"/> 
+            <column name = "EMAIL_DESCRIPTION"     type = "NCLOB"/> 
+       </addColumn> 
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Ticket/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Ticket/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a15d9cc67816a3379497cff66f7eb9fa14119fd7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/Ticket/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="alter_Ticket_AddColumns.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4a5fcab89347aee8dc7f0f4aedab88ad310e92a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.0/xRM-Service/changelog.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="Init/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="DocumentTemplate/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Keywords/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Attribute/changelog.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 75df167dc2cd36f23f4a54e085b0832369f21669..3ade25fd12ebcc3bcf1d13a8ed4aeca7f4dc2ca2 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3913,6 +3913,48 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CURRENCY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CURRENCYRATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="6" />
+                <size v="12" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VOLUMEFOREIGNCURRENCY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -4344,6 +4386,20 @@
                   </customJDitoProperty>
                 </customProperties>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>HAS_ATTACHMENTS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -8822,6 +8878,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>ALL_TICKET_CATEGORIES</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TEMPLATECONTENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -9921,7 +10005,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9934,7 +10018,7 @@
                 <name>FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="-1" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10370,9 +10454,9 @@
                 <name>VOLUME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10533,6 +10617,20 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>VOLUMEFOREIGNCURRENCY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -11392,28 +11490,8 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DSGVO</name>
-            <dbName></dbName>
-            <idColumn>DSGVOID</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>VALID_TO</name>
+                <name>DATE_BEGIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -11427,11 +11505,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>EMAIL_SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="150" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11441,48 +11519,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DSGVOID</name>
+                <name>CATEGORY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>ALTERNATIVE_EMAILADDR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>de3799fa-b558-4dc3-8eff-3a9468c098d7</name>
-                    <entityName>CONTACT</entityName>
-                    <fieldName>CONTACTID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>EMAIL_DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11490,13 +11561,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DATE_EDIT_STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11504,7 +11575,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>MEDIUM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -11518,25 +11589,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>ALTERNATIVE_PHONEADDR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUORITYSOURCE</name>
+                <name>CC_RECIPIENTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="500" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11546,11 +11617,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PURPOSE</name>
+                <name>CONCLUSION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11560,10 +11631,10 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DSGVOTYPE</name>
+                <name>INBOX_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11573,66 +11644,40 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DESCRIPTIONTRANSLATION</name>
-            <dbName></dbName>
-            <idColumn>DESCRIPTIONTRANSLATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/descriptiontranslation/documentation.adoc</documentation>
-            <title></title>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>MAILSIGNATURE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>0397ff2a-4405-4c41-8122-5f38167625be</name>
-                    <entityName>OBJECTMEMBER</entityName>
-                    <fieldName>OBJECT_ROWID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTIONTRANSLATIONID</name>
+                <name>ORDER_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>SENDER_EMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11642,13 +11687,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DATE_END</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11656,28 +11701,42 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LANG</name>
+                <name>HAS_ATTACHMENTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
-                <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/descriptiontranslation/entityfields/lang/documentation.adoc</documentation>
+                <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>AB_UNLINKEDMAIL</name>
-            <dbName></dbName>
-            <idColumn>AB_UNLINKEDMAILID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_unlinkedmail/documentation.adoc</documentation>
+              <entityFieldDb>
+                <name>EDITOR_CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DSGVO</name>
+            <dbName></dbName>
+            <idColumn>DSGVOID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -11690,11 +11749,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>MAIL</name>
+                <name>VALID_TO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11718,32 +11777,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENDER</name>
+                <name>DSGVOID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="1000" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SUBJECT</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="200" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <dependencies>
+                  <entityDependency>
+                    <name>de3799fa-b558-4dc3-8eff-3a9468c098d7</name>
+                    <entityName>CONTACT</entityName>
+                    <fieldName>CONTACTID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_NEW</name>
@@ -11774,25 +11840,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_UNLINKEDMAILID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ROW_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RECIPIENTS</name>
+                <name>STATUORITYSOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11802,11 +11882,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PURPOSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11816,15 +11896,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENTDATE</name>
+                <name>DSGVOTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -11832,12 +11912,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_CTILOG</name>
+            <name>DESCRIPTIONTRANSLATION</name>
             <dbName></dbName>
-            <idColumn>AB_CTILOGID</idColumn>
+            <idColumn>DESCRIPTIONTRANSLATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_ctilog/documentation.adoc</documentation>
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/descriptiontranslation/documentation.adoc</documentation>
             <title></title>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -11849,55 +11929,62 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>AB_CTILOGID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <dependencies>
+                  <entityDependency>
+                    <name>0397ff2a-4405-4c41-8122-5f38167625be</name>
+                    <entityName>OBJECTMEMBER</entityName>
+                    <fieldName>OBJECT_ROWID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ANSWERMODE</name>
+                <name>DESCRIPTIONTRANSLATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
+                <primaryKey v="true" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CALLID</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11905,41 +11992,61 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
+                <name>LANG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
-                <documentation></documentation>
+                <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/descriptiontranslation/entityfields/lang/documentation.adoc</documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_UNLINKEDMAIL</name>
+            <dbName></dbName>
+            <idColumn>AB_UNLINKEDMAILID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_unlinkedmail/documentation.adoc</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>CONTACT_ID</name>
+                <name>MAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="19" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11947,11 +12054,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DIRECTION</name>
+                <name>SENDER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="1000" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11960,32 +12067,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DSGVOINFO</name>
-            <dbName></dbName>
-            <idColumn>DSGVOINFOID</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>RECIPIENT</name>
+                <name>SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="200" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11995,13 +12082,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GUARANTEE</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12009,13 +12096,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRANSMISSION</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12023,7 +12110,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DSGVOINFOID</name>
+                <name>AB_UNLINKEDMAILID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -12037,11 +12124,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATASOURCE</name>
+                <name>RECIPIENTS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <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="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12051,11 +12152,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>SENTDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12063,8 +12164,243 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_CTILOG</name>
+            <dbName></dbName>
+            <idColumn>AB_CTILOGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_ctilog/documentation.adoc</documentation>
+            <title></title>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>AB_CTILOGID</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>ANSWERMODE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CALLID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</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>ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="19" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DIRECTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DSGVOINFO</name>
+            <dbName></dbName>
+            <idColumn>DSGVOINFOID</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>RECIPIENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>GUARANTEE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TRANSMISSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DSGVOINFOID</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>DATASOURCE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+                <dependencies>
+                  <entityDependency>
                     <name>74635747-d666-4886-9354-3173f8c8983a</name>
                     <entityName>CONTACT</entityName>
                     <fieldName>CONTACTID</fieldName>
@@ -15835,25 +16171,81 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DISTRICTCONTACT</name>
-            <dbName></dbName>
-            <idColumn>DISTRICTCONTACTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="1" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
+              <entityFieldDb>
+                <name>VALIDTO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="23" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVISERSTATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALIDFROM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="23" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVISERROLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DISTRICTCONTACT</name>
+            <dbName></dbName>
+            <idColumn>DISTRICTCONTACTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="1" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
                 <name>ORIGIN</name>
@@ -17318,8 +17710,8 @@
                 <name>GENERAL_CHANNELID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="200" />
+                <columnType v="1" />
+                <size v="48" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19316,13 +19708,4176 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VERSION</name>
+                <name>VERSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="19" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="250" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>BULKMAILTESTRECIPIENT</name>
+            <dbName></dbName>
+            <idColumn>BULKMAILTESTRECIPIENTID</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>BULKMAIL_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMAIL_ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>BULKMAILTESTRECIPIENTID</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>DATE_EDIT</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>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INTERESTLINK</name>
+            <dbName></dbName>
+            <idColumn>INTERESTLINKID</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>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTEREST_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTERESTLINKID</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>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</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>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INTEREST</name>
+            <dbName></dbName>
+            <idColumn>INTERESTID</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>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTERESTID</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>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>IS_DEFAULT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="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>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WEBLINK_CLICK</name>
+            <dbName></dbName>
+            <idColumn>WEBLINK_CLICKID</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>BROWSER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEVICE_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WEBLINK_CLICKID</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>MAIL_LOG_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>IP_ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WEBLINK_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OPERATING_SYSTEM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_OPENED</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>DATE_EDIT</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>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>PLANNING_MONTH</name>
+            <dbName></dbName>
+            <idColumn>PLANNING_MONTHID</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>PLANNING_MONTHID</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>MONTH_FACTOR</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="5" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MONTH_NUMBER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DSGVOCONFIGURATION</name>
+            <dbName></dbName>
+            <idColumn>DSGVOCONFIGURATIONID</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>FILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <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="19" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DSGVOCONFIGURATIONID</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>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>REASON</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DSGVODELETEFLAG</name>
+            <dbName></dbName>
+            <idColumn>DSGVODELETEFLAGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="1" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DSGVODELETEFLAGID</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>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title>Contact Id</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="false" />
+                  </customBooleanProperty>
+                  <customStringProperty>
+                    <name>tableRef</name>
+                    <global v="false" />
+                    <property>CONTACT</property>
+                  </customStringProperty>
+                </customProperties>
+                <dependencies>
+                  <entityDependency>
+                    <name>2278befb-de66-4f45-98c2-619eb686d999</name>
+                    <entityName>CONTACT</entityName>
+                    <fieldName>CONTACTID</fieldName>
+                  </entityDependency>
+                </dependencies>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>REASON</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title>Reason</title>
+                <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customStringProperty>
+                    <name>keyword</name>
+                    <global v="false" />
+                    <property>DSGVOReason</property>
+                  </customStringProperty>
+                </customProperties>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>LEADS</name>
+            <dbName></dbName>
+            <idColumn>LEADSID</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>ZIP</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CUSTOMERCODE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</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>FIRSTNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_LOYALTY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DUPLICAT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMINTERNET</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MIDDLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>COUNTRY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="2" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LASTNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALUTATION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TAXCODE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ORGCOUNTRYCODE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMXING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LEADIMPORT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMLINKEDIN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>BUILDINGNO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ISOLANGUAGE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_INDUSTRY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACTPOSITION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE03</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE02</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACTROLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="60" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMBLOG</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PERSINFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEPARTMENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="250" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>REGION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMXING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PERSON_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SOURCE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMPHONE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMMOBIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMINTERNET</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LEGALFORM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMEMAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMLINKEDIN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DUPSTATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="20" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMBLOG</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>GENDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE04</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LETTERSALUTATION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <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="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMPHONE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ORGANISATION_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMMOBIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATEOFBIRTH</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>VATCODE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMEMAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ORGINFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PROVINCE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</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>LEADSID</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>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>STANDARD_WORKFLOW</name>
+            <dbName></dbName>
+            <idColumn>STANDARD_WORKFLOWID</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>STANDARD_WORKFLOWID</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>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="4000" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PROCESSXML</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="65535" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DIAGRAM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2004" />
+                <size v="65535" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PROCESSKEY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ADVERTISING</name>
+            <dbName></dbName>
+            <idColumn>ADVERTISINGID</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>ADVERTISINGID</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>RESPONSIBLE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ROW_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CURRENCY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</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>DATE_NEW</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>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ADVERTISINGITEM</name>
+            <dbName></dbName>
+            <idColumn>ADVERTISINGITEMID</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>ADVERTISINGITEMID</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>UNIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PRICE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <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="19" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>QUANTITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PRODUCT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FREE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DELIVERY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TARGETAMOUNT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ITEMPOSITION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ACTUALAMOUNT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ADVERTISING_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EMAIL_FILTER_HANDLING</name>
+            <dbName></dbName>
+            <idColumn>EMAIL_FILTER_HANDLINGID</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>FILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKFLOWDEFINITION_KEY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FILTER_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>
+              <entityFieldDb>
+                <name>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="250" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMAIL_FILTER_HANDLINGID</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>PRIORITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ISACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
+                <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="19" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKFLOWSIGNAL_NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="250" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>MAIL_BOUNCE</name>
+            <dbName></dbName>
+            <idColumn>MAIL_BOUNCEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DATE_BOUNCE</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>EMAIL_FILTER_HANDLING_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAIL_BOUNCEID</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>CATEGORY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RECIPIENT_EMAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAIL_LOG_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>TASKATTENDEES</name>
+            <dbName></dbName>
+            <idColumn>TASKATTENDEESID</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>DEPARTMENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</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>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TASKATTENDEESID</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>TASK_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>TOPICTREE</name>
+            <dbName></dbName>
+            <idColumn>TOPICTREEID</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>TOPICTREEID</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>ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="19" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING_LAYER_5</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING_LAYER_6</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TOPIC</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING_LAYER_1</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING_LAYER_2</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING_LAYER_3</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING_LAYER_4</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ASSIGNEDTO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>TOPICTREERELATION</name>
+            <dbName></dbName>
+            <idColumn>TOPICTREERELATIONID</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>OBJECT_ROWID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TOPICTREE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</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>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TOPICTREERELATIONID</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>DATE_NEW</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>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INBOXFILTERGROUP</name>
+            <dbName></dbName>
+            <idColumn>INBOXFILTERGROUPID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DATE</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>INBOXFILTERGROUPID</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>STATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PRIORITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INBOX_EMPLOYEEGROUP_RELATION</name>
+            <dbName></dbName>
+            <idColumn>INBOX_EMPLOYEEGROUP_RELATIONID</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>EMPLOYEEGROUP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INBOX_EMPLOYEEGROUP_RELATIONID</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>INBOX_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EMPLOYEEGROUP_RULEGROUP</name>
+            <dbName></dbName>
+            <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DATE</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>EMPLOYEEGROUP_RULEGROUPID</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>STATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INBOXFILTER</name>
+            <dbName></dbName>
+            <idColumn>INBOXFILTERID</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>INBOXFILTERGROUP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TICKETTEMPLATE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INBOXFILTERID</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>COMPONENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SEARCHTERM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EMPLOYEEGROUP</name>
+            <dbName></dbName>
+            <idColumn>EMPLOYEEGROUPID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DATE</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>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMPLOYEEGROUPID</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>GROUPNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INBOXFILTERGROUP_RELATION</name>
+            <dbName></dbName>
+            <idColumn>INBOXFILTERGROUP_RELATIONID</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>INBOXFILTERGROUP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INBOXFILTERGROUP_RELATIONID</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>INBOX_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EMPLOYEEGROUP_CONTACT_RELATION</name>
+            <dbName></dbName>
+            <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</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>EMPLOYEEGROUP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMPLOYEEGROUP_CONTACT_RELATIONID</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>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>TICKETTEMPLATE</name>
+            <dbName></dbName>
+            <idColumn>TICKETTEMPLATEID</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>ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MATURING_TIME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONCLUSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONCLUSION_MAILBRIDGE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INBOX_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PRIORITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TICKETTEMPLATEID</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>DOCUMENTTEMPLATE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CATEGORY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TEMPLATENO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INDIVIDUAL_ANSWER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>REVIEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TEMPLATENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS_MAILBRIDGE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INBOX</name>
+            <dbName></dbName>
+            <idColumn>INBOXID</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>CLOSURE_DAYS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMAIL_ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INBOXDATE</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>INBOXID</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>REOPEN_DELAY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>MAILSIGNATURE</name>
+            <dbName></dbName>
+            <idColumn>MAILSIGNATUREID</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>SEND_MAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-7" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INBOX_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAILSIGNATUREID</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>ANSWER_MAIL_ADDRESS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DOCUMENTTEMPLATE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MAIL_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19330,27 +23885,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DEFAULT_TICKETTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>WORKFLOW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19358,11 +23913,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>DEFAULTSIGNATURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="250" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19372,11 +23927,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>SIGNATURE_DOCUMENTTEMPLATE_ID</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" />
@@ -19388,9 +23943,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>BULKMAILTESTRECIPIENT</name>
+            <name>ATTRIBUTE_FILTER</name>
             <dbName></dbName>
-            <idColumn>BULKMAILTESTRECIPIENTID</idColumn>
+            <idColumn>ATTRIBUTE_FILTERID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -19406,7 +23961,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>BULKMAIL_ID</name>
+                <name>INBOXFILTERGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -19420,26 +23975,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMAIL_ADDRESS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>THRESHOLD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="3" />
+                <size v="5" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19448,7 +23989,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BULKMAILTESTRECIPIENTID</name>
+                <name>ATTRIBUTE_FILTERID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -19462,25 +24003,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</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>DATE_NEW</name>
+                <name>COMPONENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19490,7 +24017,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>SEARCHTERM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -19504,11 +24031,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>COMPARISON_METHOD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19520,9 +24047,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>INTERESTLINK</name>
+            <name>EMPLOYEEGROUP_RULEGROUP_RELATION</name>
             <dbName></dbName>
-            <idColumn>INTERESTLINKID</idColumn>
+            <idColumn>EMPLOYEEGROUP_RULEGROUP_RELATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -19538,10 +24065,10 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>EMPLOYEEGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -19552,7 +24079,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INTEREST_ID</name>
+                <name>EMPLOYEEGROUP_RULEGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -19560,13 +24087,13 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INTERESTLINKID</name>
+                <name>EMPLOYEEGROUP_RULEGROUP_RELATIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -19579,8 +24106,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EMPLOYEEGROUP_RULE</name>
+            <dbName></dbName>
+            <idColumn>EMPLOYEEGROUP_RULEID</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>CONTACT_ID</name>
+                <name>EMPLOYEEGROUP_RULEGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -19588,31 +24135,17 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</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>DATE_NEW</name>
+                <name>COND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19622,21 +24155,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>EMPLOYEEGROUP_RULEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -19652,9 +24185,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>INTEREST</name>
+            <name>DOCUMENTTEMPLATE_TICKETCATEGORY</name>
             <dbName></dbName>
-            <idColumn>INTERESTID</idColumn>
+            <idColumn>DOCUMENTTEMPLATE_TICKETCATEGORYID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -19670,10 +24203,10 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DOCUMENTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -19684,21 +24217,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>INTERESTID</name>
+                <name>DOCUMENTTEMPLATE_TICKETCATEGORYID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -19712,25 +24231,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>IS_DEFAULT</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19740,11 +24245,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CLASSIFICATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19760,7 +24265,7 @@
                 <columnType v="93" />
                 <size v="19" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19774,7 +24279,7 @@
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19798,9 +24303,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>WEBLINK_CLICK</name>
+            <name>ASYS_USERS</name>
             <dbName></dbName>
-            <idColumn>WEBLINK_CLICKID</idColumn>
+            <idColumn>ID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -19816,67 +24321,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>BROWSER</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DEVICE_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>WEBLINK_CLICKID</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>MAIL_LOG_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>IP_ADDRESS</name>
+                <name>PROPVAL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="1024" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19886,13 +24335,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEBLINK_ID</name>
+                <name>GROUPID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19900,13 +24349,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OPERATING_SYSTEM</name>
+                <name>PROPKEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="1024" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19914,11 +24363,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_OPENED</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19928,11 +24377,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19942,25 +24391,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>PROPVAL_CLOB</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19970,13 +24419,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19986,9 +24435,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>PLANNING_MONTH</name>
+            <name>ASYS_COLLECTOR_TAGS</name>
             <dbName></dbName>
-            <idColumn>PLANNING_MONTHID</idColumn>
+            <idColumn>COLLECTORDATAID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -20004,11 +24453,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>PLANNING_MONTHID</name>
+                <name>COLLECTORDATAID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="true" />
@@ -20018,12 +24467,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MONTH_FACTOR</name>
+                <name>TAGNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="5" />
-                <scale v="2" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -20032,11 +24481,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MONTH_NUMBER</name>
+                <name>TAGVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20048,9 +24497,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DSGVOCONFIGURATION</name>
+            <name>ASYS_TIMERS</name>
             <dbName></dbName>
-            <idColumn>DSGVOCONFIGURATIONID</idColumn>
+            <idColumn>TIMERID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -20066,11 +24515,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>FILTER</name>
+                <name>INTERVALUNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20080,11 +24529,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>THREADPRIORITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>STARTTIME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20094,11 +24557,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DSGVOCONFIGURATIONID</name>
+                <name>ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KEEPJDITO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LASTRUN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="23" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TIMERID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="127" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="true" />
@@ -20108,11 +24613,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>PROCESSNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20122,11 +24627,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>INTERVALDESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20136,11 +24641,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REASON</name>
+                <name>TIMERTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20150,11 +24655,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PROCESSUSER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INTERVALVALUE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20166,9 +24685,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DSGVODELETEFLAG</name>
+            <name>ASYS_RECORDGROUP</name>
             <dbName></dbName>
-            <idColumn>DSGVODELETEFLAGID</idColumn>
+            <idColumn>ID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -20176,7 +24695,7 @@
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
-              <auditMode v="1" />
+              <auditMode v="0" />
               <syncActive v="false" />
               <syncComplete v="true" />
               <syncDirection v="1" />
@@ -20184,58 +24703,25 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DSGVODELETEFLAGID</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>CONTACT_ID</name>
+                <name>GROUP_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="64" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title>Contact Id</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="false" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>tableRef</name>
-                    <global v="false" />
-                    <property>CONTACT</property>
-                  </customStringProperty>
-                </customProperties>
-                <dependencies>
-                  <entityDependency>
-                    <name>2278befb-de66-4f45-98c2-619eb686d999</name>
-                    <entityName>CONTACT</entityName>
-                    <fieldName>CONTACTID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>USER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="1" />
+                <size v="46" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20245,11 +24731,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="256" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20259,37 +24745,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REASON</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>Reason</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>DSGVOReason</property>
-                  </customStringProperty>
-                </customProperties>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>LEADS</name>
+            <name>ASYS_PERMISSIONSET</name>
             <dbName></dbName>
-            <idColumn>LEADSID</idColumn>
+            <idColumn>ASYS_PERMISSIONSETID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -20305,11 +24779,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ZIP</name>
+                <name>ENTITY_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20319,25 +24793,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CUSTOMERCODE</name>
+                <name>FIELD_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20347,11 +24807,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIRSTNAME</name>
+                <name>ACCESSTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20361,11 +24821,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_LOYALTY</name>
+                <name>ROLE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20375,11 +24835,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUPLICAT</name>
+                <name>ASYS_PERMISSIONSET_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20389,24 +24849,44 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMINTERNET</name>
+                <name>ASYS_PERMISSIONSETID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_PERMISSIONACTION</name>
+            <dbName></dbName>
+            <idColumn>ASYS_PERMISSIONACTIONID</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>STATUS</name>
+                <name>ASYS_PERMISSION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -20417,11 +24897,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MIDDLENAME</name>
+                <name>ACTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20431,25 +24911,45 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COUNTRY</name>
+                <name>ASYS_PERMISSIONACTIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="2" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_NOTIFICATIONS</name>
+            <dbName></dbName>
+            <idColumn>ID</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>LASTNAME</name>
+                <name>CONTENTID</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" />
@@ -20459,11 +24959,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALUTATION</name>
+                <name>RESOLVEDPRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="15" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20473,11 +24973,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TAXCODE</name>
+                <name>USERID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20487,11 +24987,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGCOUNTRYCODE</name>
+                <name>STATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="10" />
+                <size v="15" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20501,39 +25001,59 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMXING</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_COLLECTOR_DATA</name>
+            <dbName></dbName>
+            <idColumn>DATAID</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>LEADIMPORT_ID</name>
+                <name>DATAID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMLINKEDIN</name>
+                <name>PARENTID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20543,11 +25063,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BUILDINGNO</name>
+                <name>METRICS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20557,11 +25077,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>SHORTINFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20571,11 +25091,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_INDUSTRY</name>
+                <name>TIMECOLLECTED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20584,12 +25104,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_SEQUENCES</name>
+            <dbName></dbName>
+            <idColumn>ID_TABLE</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>CONTACTPOSITION</name>
+                <name>ID_GUID</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" />
@@ -20599,27 +25139,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE03</name>
+                <name>ID_TABLE</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE02</name>
+                <name>ID_HIGH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -20627,25 +25167,45 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTROLE</name>
+                <name>ID_LOW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="60" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_USERTOKEN</name>
+            <dbName></dbName>
+            <idColumn>ID</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>P_COMMBLOG</name>
+                <name>VALID_ONCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20655,11 +25215,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSINFO</name>
+                <name>VALID_TO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20669,11 +25229,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEPARTMENT</name>
+                <name>REFERENCE_USER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20683,11 +25243,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="250" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20697,11 +25257,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REGION</name>
+                <name>VALID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20711,11 +25271,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMXING</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20725,25 +25285,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSON_ID</name>
+                <name>ID</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>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
+                <name>VALID_FROM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20753,13 +25327,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE</name>
+                <name>LOGIN_USER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -20767,11 +25341,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMPHONE</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20781,11 +25355,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMMOBIL</name>
+                <name>GROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20794,12 +25368,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_DASHLETCONFIGURATIONS</name>
+            <dbName></dbName>
+            <idColumn>ID</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>O_COMMINTERNET</name>
+                <name>REQUIRES_CONFIGURATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20809,7 +25403,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEGALFORM</name>
+                <name>SINGLETON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
@@ -20823,11 +25417,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMEMAIL</name>
+                <name>PARAMETERS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20837,11 +25431,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT</name>
+                <name>CATEGORIES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20851,11 +25445,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMLINKEDIN</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20865,11 +25459,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUPSTATUS</name>
+                <name>STORE_ROLES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="20" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20879,11 +25473,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMBLOG</name>
+                <name>VIEW_NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20893,11 +25487,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GENDER</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="512" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20907,11 +25501,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE04</name>
+                <name>FRAGMENT_CUSTOMIZABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20921,11 +25515,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LETTERSALUTATION</name>
+                <name>FRAGMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20935,11 +25529,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20949,11 +25543,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMPHONE</name>
+                <name>ICON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20963,25 +25557,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGANISATION_ID</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMMOBIL</name>
+                <name>PREVIEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20990,26 +25584,46 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CURRENCYRATE</name>
+            <dbName></dbName>
+            <idColumn>CURRENCYRATEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>CURRENCYRATEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CITY</name>
+                <name>TARGETCURRENCYISO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21019,7 +25633,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATEOFBIRTH</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -21033,11 +25647,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VATCODE</name>
+                <name>CURRENCYRATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <columnType v="6" />
+                <size v="12" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21047,11 +25661,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMEMAIL</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21061,11 +25675,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGINFO</name>
+                <name>SOURCECURRENCYISO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21075,7 +25689,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROVINCE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -21089,11 +25703,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>VALID_FROM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21103,11 +25717,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21116,26 +25730,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>LEADSID</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>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>STANDARD_WORKFLOW</name>
+            <name>ASYS_NOTIFICATIONCONTENTS</name>
             <dbName></dbName>
-            <idColumn>STANDARD_WORKFLOWID</idColumn>
+            <idColumn>CONTENTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -21151,7 +25751,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STANDARD_WORKFLOWID</name>
+                <name>CONTENTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -21165,11 +25765,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>FORCEDPRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="4000" />
+                <size v="15" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21179,27 +25779,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSXML</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="65535" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DIAGRAM</name>
+                <name>ICON_INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="65535" />
+                <columnType v="12" />
+                <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21207,13 +25793,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSKEY</name>
+                <name>CREATEDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21221,89 +25807,55 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>DELETEDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ADVERTISING</name>
-            <dbName></dbName>
-            <idColumn>ADVERTISINGID</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>ADVERTISINGID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RESPONSIBLE_ID</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>LINK_INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>VERSION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21311,25 +25863,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>RECIPIENTUSERIDS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CURRENCY</name>
+                <name>TYPECODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21339,11 +25891,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>BACKPACK</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21353,11 +25905,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CAPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="512" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21367,11 +25919,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>ORIGINATORNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21383,9 +25935,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>ADVERTISINGITEM</name>
+            <name>ASYS_PERMISSION</name>
             <dbName></dbName>
-            <idColumn>ADVERTISINGITEMID</idColumn>
+            <idColumn>ASYS_PERMISSIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -21401,7 +25953,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ADVERTISINGITEMID</name>
+                <name>CONDTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-6" />
+                <size v="3" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ASYS_PERMISSIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -21415,10 +25981,10 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>UNIT</name>
+                <name>ASYS_PERMISSIONSET_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -21429,12 +25995,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRICE</name>
+                <name>COND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -21442,12 +26008,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_CALENDARBACKEND</name>
+            <dbName></dbName>
+            <idColumn>DATASETID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DTSTART</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21457,12 +26043,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>QUANTITY</name>
+                <name>ENDTIME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="93" />
+                <size v="23" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -21471,11 +26057,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>MAILBOX</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21485,27 +26071,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRODUCT_ID</name>
+                <name>CLASSIFICATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FREE</name>
+                <name>ELEMENTUID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="12" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21513,11 +26099,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DTEND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21527,11 +26113,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DELIVERY</name>
+                <name>ISRECUR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21541,12 +26127,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TARGETAMOUNT</name>
+                <name>DATASETID</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>TRANSP</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -21555,11 +26155,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ITEMPOSITION</name>
+                <name>OWNER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21573,7 +26173,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="32" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21583,11 +26183,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>STARTTIME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21597,11 +26197,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>HASALARM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUMMARY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21611,12 +26225,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ACTUALAMOUNT</name>
+                <name>VCOMPONENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -21625,13 +26239,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENT</name>
+                <name>LASTMODIFIED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21639,15 +26253,29 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADVERTISING_ID</name>
+                <name>ENTRYTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ORGANIZER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -21655,9 +26283,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>EMAIL_FILTER_HANDLING</name>
+            <name>ASYS_CALENDARLINK</name>
             <dbName></dbName>
-            <idColumn>EMAIL_FILTER_HANDLINGID</idColumn>
+            <idColumn>DBID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -21673,11 +26301,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>FILTER</name>
+                <name>DBTABLENAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="127" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21687,7 +26315,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWDEFINITION_KEY</name>
+                <name>ENTRYSTORE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -21701,13 +26329,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FILTER_TYPE</name>
+                <name>ENTRYID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DBID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="12" />
+                <size v="191" />
                 <scale v="0" />
                 <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DBIDCOLUMN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="127" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21719,9 +26375,9 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="2000" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21729,27 +26385,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMAIL_FILTER_HANDLINGID</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRIORITY</name>
+                <name>DBALIAS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="127" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21757,27 +26413,47 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISACTIVE</name>
+                <name>FRAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="12" />
+                <size v="1023" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_TIMERS_SERVERRUNS</name>
+            <dbName></dbName>
+            <idColumn></idColumn>
+            <idGeneratorType v="1" />
+            <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>DESCRIPTION</name>
+                <name>SERVERID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21785,11 +26461,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>LASTRUN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21799,25 +26475,45 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWSIGNAL_NAME</name>
+                <name>TIMERID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="127" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_ROLES_CHILDREN</name>
+            <dbName></dbName>
+            <idColumn>ID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PARENT_ROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21827,11 +26523,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>CHILD_ROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21841,15 +26537,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -21857,9 +26553,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESORDERLINK</name>
+            <name>ASYS_DASHLETS</name>
             <dbName></dbName>
-            <idColumn>SALESORDERLINKID</idColumn>
+            <idColumn>ID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -21875,13 +26571,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>CONFIGURATION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21889,11 +26585,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>FRAGMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="1023" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21903,27 +26599,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERLINKID</name>
+                <name>X</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDER_ID</name>
+                <name>Y</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21931,11 +26627,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>ROWSPAN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21945,11 +26641,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21959,13 +26655,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <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>PARAMETERS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="-1" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -21973,11 +26683,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>COLSPAN</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DASHBOARD_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -21989,9 +26713,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>MAIL_BOUNCE</name>
+            <name>ASYS_ALIASCONFIG</name>
             <dbName></dbName>
-            <idColumn>MAIL_BOUNCEID</idColumn>
+            <idColumn>ID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -22007,11 +26731,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_BOUNCE</name>
+                <name>ALIASID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22021,11 +26745,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMAIL_FILTER_HANDLING_ID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22035,25 +26759,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAIL_BOUNCEID</name>
+                <name>TENANTID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CATEGORY</name>
+                <name>SERVERID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22063,11 +26787,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RECIPIENT_EMAIL</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22077,73 +26801,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAIL_LOG_ID</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>TASKATTENDEES</name>
-            <dbName></dbName>
-            <idColumn>TASKATTENDEESID</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>DEPARTMENT_ID</name>
+                <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>XMLDATA</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="-4" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22153,15 +26857,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -22171,7 +26875,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22181,11 +26885,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>ICON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <columnType v="-4" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22195,7 +26899,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TASKATTENDEESID</name>
+                <name>ID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -22209,25 +26913,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TASK_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22239,9 +26929,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>TOPICTREE</name>
+            <name>ASYS_MONITOR_DASHLETCONFIG</name>
             <dbName></dbName>
-            <idColumn>TOPICTREEID</idColumn>
+            <idColumn>ID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -22257,27 +26947,27 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>TOPICTREEID</name>
+                <name>YPOSITION</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ACTIVE</name>
+                <name>VISUALISATIONCONFIG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -22285,12 +26975,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -22299,7 +26989,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING_LAYER_5</name>
+                <name>WIDTH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
@@ -22313,7 +27003,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING_LAYER_6</name>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>HEIGHT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
@@ -22327,11 +27031,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TOPIC</name>
+                <name>XPOSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22340,12 +27044,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_SYSTEM</name>
+            <dbName></dbName>
+            <idColumn>ID</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>SORTING_LAYER_1</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22355,11 +27079,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING_LAYER_2</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22369,13 +27093,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING_LAYER_3</name>
+                <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -22383,11 +27107,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>XMLDATA</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="-4" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22397,11 +27121,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING_LAYER_4</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22411,11 +27135,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
+                <columnType v="93" />
+                <size v="23" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22425,26 +27149,40 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ASSIGNEDTO</name>
+                <name>ICON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="-4" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -22453,11 +27191,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22466,12 +27204,26 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>TOPICTREERELATION</name>
+            <name>ASYS_RECORD</name>
             <dbName></dbName>
-            <idColumn>TOPICTREERELATIONID</idColumn>
+            <idColumn>ID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -22487,7 +27239,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>RECORDGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -22495,32 +27247,32 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TOPICTREE_ID</name>
+                <name>ID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -22529,11 +27281,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>ROW_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22542,27 +27294,33 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ASYS_ROLES</name>
+            <dbName></dbName>
+            <idColumn>ROLENAME</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>TOPICTREERELATIONID</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>DATE_NEW</name>
+                <name>ROLETITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -22571,11 +27329,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>ASSIGNABLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22585,25 +27343,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>ROLENAME</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>CHILDREN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="-1" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -22613,11 +27371,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORT</name>
+                <name>ROLEDESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 18ff4f74b031f7b7e427bf633349d12ab604bf39..da2c65876c69db5150138a5436bdf162eb6f48b3 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -262,15 +262,36 @@
         <title>Service</title>
         <icon>VAADIN:CHAT</icon>
         <childNodes>
+          <entityNode>
+            <name>Group18</name>
+            <kind v="123" />
+            <childNodes>
+              <entityNode>
+                <name>PROJECT_ServiceAdmin</name>
+                <kind v="159" />
+              </entityNode>
+              <entityNode>
+                <name>TeamLeader_Dashboard</name>
+                <kind v="10090" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
           <entityNode>
             <name>Group6</name>
             <kind v="123" />
             <title></title>
             <childNodes>
               <entityNode>
-                <name>PROJECT_Support</name>
+                <name>PROJECT_ServiceAdmin</name>
+                <kind v="159" />
+              </entityNode>
+              <entityNode>
+                <name>Service</name>
+                <kind v="10090" />
+              </entityNode>
+              <entityNode>
+                <name>PROJECT_ServiceAgent</name>
                 <kind v="159" />
-                <title></title>
               </entityNode>
               <entityNode>
                 <name>SupportTicket</name>
@@ -281,6 +302,64 @@
           </entityNode>
         </childNodes>
       </entityNode>
+      <entityNode>
+        <name>ServiceAdministration</name>
+        <kind v="123" />
+        <title>Service Administration</title>
+        <icon>VAADIN:WRENCH</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group5</name>
+            <kind v="123" />
+            <childNodes>
+              <entityNode>
+                <name>PROJECT_ServiceAdmin</name>
+                <kind v="159" />
+              </entityNode>
+              <entityNode>
+                <name>Inbox</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>InboxFilterGroup</name>
+                <kind v="10077" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+          <entityNode>
+            <name>Group13</name>
+            <kind v="123" />
+            <childNodes>
+              <entityNode>
+                <name>PROJECT_ServiceAdmin</name>
+                <kind v="159" />
+              </entityNode>
+              <entityNode>
+                <name>SupportTicketTemplate</name>
+                <kind v="10077" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+          <entityNode>
+            <name>Group16</name>
+            <kind v="123" />
+            <childNodes>
+              <entityNode>
+                <name>PROJECT_ServiceAdmin</name>
+                <kind v="159" />
+              </entityNode>
+              <entityNode>
+                <name>EmployeeGroup</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>EmployeeGroupRuleGroup</name>
+                <kind v="10077" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
       <entityNode>
         <name>Group</name>
         <kind v="123" />
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 3fee3be4df29a7e6f69bc3436b283fd321d6a173..e5f567ad0be2fa201a08dfedb3d107201b5a156e 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -126,7 +126,7 @@
         </entityActionField>
         <entityActionField>
           <name>newSupportticket</name>
-          <title>New Support ticket</title>
+          <title>New Service ticket</title>
           <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:CHAT</iconId>
         </entityActionField>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 59493fb1a3c0a6573607469d28b34c66ca73877d..633f568c6725f2e7e34a44d574a66d0d5442547e 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -605,7 +605,7 @@
     </entityActionField>
     <entityActionField>
       <name>newSupportticket</name>
-      <title>New Support ticket</title>
+      <title>New Service ticket</title>
       <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CHAT</iconId>
     </entityActionField>
@@ -645,6 +645,13 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>infoNote</name>
+      <title>Description</title>
+      <description>Necessary for small Editview for Serviceticket notes</description>
+      <contentType>LONG_TEXT</contentType>
+      <onValueChange>%aditoprj%/entity/Activity_entity/entityfields/infonote/onValueChange.js</onValueChange>
+    </entityField>
     <entityConsumer>
       <name>AdvertisingItems</name>
       <state>EDITABLE</state>
@@ -757,6 +764,7 @@
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>ACTIVITY.INFO</recordfield>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/info.value/expression.js</expression>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
diff --git a/entity/Activity_entity/entityfields/infonote/onValueChange.js b/entity/Activity_entity/entityfields/infonote/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b744107b98d92504aa2f06a1a0bc788a1157605
--- /dev/null
+++ b/entity/Activity_entity/entityfields/infonote/onValueChange.js
@@ -0,0 +1,5 @@
+import("system.text");
+import("system.vars");
+import("system.neon");
+
+neon.setFieldValue( "$field.INFO", "<p>"+ text.text2html(vars.get("$local.value"), false) +"</p><br>");
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/info.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/info.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c252e4192689c363acd8366f813460ea915132d
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/info.value/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.text");
+
+result.string(text.html2text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index f89d1219f36417625e63f1ec88a6faf978b0fcb1..d90dfd06e092d333ca79c893fd164acc23cd6374 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -4,7 +4,6 @@
   <title>Appointment</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
-  <siblings />
   <grantUpdateProcess>%aditoprj%/entity/Appointment_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/Appointment_entity/grantDeleteProcess.js</grantDeleteProcess>
   <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
diff --git a/entity/AttributeFilter_entity/AttributeFilter_entity.aod b/entity/AttributeFilter_entity/AttributeFilter_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1f3563c66fa7434dba95da8fb2a7837361302df9
--- /dev/null
+++ b/entity/AttributeFilter_entity/AttributeFilter_entity.aod
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>AttributeFilter_entity</name>
+  <title>Attribute filter</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/AttributeFilter_entity/documentation.adoc</documentation>
+  <titlePlural>Attribute filters</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>SEARCHTERM</name>
+      <title>Search term</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>COMPONENT</name>
+      <title>Component</title>
+      <consumer>KeywordComponent</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/component/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/component/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ATTRIBUTE_COUNT</name>
+      <title>Attributes</title>
+    </entityField>
+    <entityField>
+      <name>ATTRIBUTE_FILTERID</name>
+    </entityField>
+    <entityField>
+      <name>INBOXFILTERGROUP_ID</name>
+      <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordComponent</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordComparisonMethod</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/keywordcomparisonmethod/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttributeRelations</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>AttributeRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectType_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/attributerelations/children/objecttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectRowId_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/attributerelations/children/objectrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AlternativeObjectTypeForAttributes_param</name>
+          <valueProcess>%aditoprj%/entity/AttributeFilter_entity/entityfields/attributerelations/children/alternativeobjecttypeforattributes_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>InboxfiltergroupId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>AttributeFilters</name>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/AttributeFilter_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ATTRIBUTE_FILTERID.value</name>
+          <recordfield>ATTRIBUTE_FILTER.ATTRIBUTE_FILTERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COMPONENT.value</name>
+          <recordfield>ATTRIBUTE_FILTER.COMPONENT</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERGROUP_ID.value</name>
+          <recordfield>ATTRIBUTE_FILTER.INBOXFILTERGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SEARCHTERM.value</name>
+          <recordfield>ATTRIBUTE_FILTER.SEARCHTERM</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ATTRIBUTE_COUNT.value</name>
+          <expression>%aditoprj%/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/attribute_count.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COMPONENT.displayValue</name>
+          <expression>%aditoprj%/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/component.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>a2cf2f0e-1d39-4af0-8bbd-0e424a6eccde</name>
+          <tableName>ATTRIBUTE_FILTER</tableName>
+          <primaryKey>ATTRIBUTE_FILTERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/AttributeFilter_entity/documentation.adoc b/entity/AttributeFilter_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c6a5f2dbb1a8f7908c41b49ea803eaceb8d25d3b
--- /dev/null
+++ b/entity/AttributeFilter_entity/documentation.adoc
@@ -0,0 +1,4 @@
+= AttributeFilter_entity
+
+Manages the attribute filters for the inbox. If a filter is configured, attributes are automatically added
+to servicetickers generated from mails coming in through the mailbridge_service.  
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/attributerelations/children/alternativeobjecttypeforattributes_param/valueProcess.js b/entity/AttributeFilter_entity/entityfields/attributerelations/children/alternativeobjecttypeforattributes_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b111482e01700c32a7642db41eedd0fbb1ba6daa
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/attributerelations/children/alternativeobjecttypeforattributes_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SupportTicket");
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/attributerelations/children/objectrowid_param/valueProcess.js b/entity/AttributeFilter_entity/entityfields/attributerelations/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..05a79f474aef4bac394c795c961f7b40b4739e3c
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/attributerelations/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ATTRIBUTE_FILTERID"));
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/attributerelations/children/objecttype_param/valueProcess.js b/entity/AttributeFilter_entity/entityfields/attributerelations/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8b4e72e74a0a4696ff39e83135aa6100ef908c0
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/attributerelations/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/AttributeFilter_entity/entityfields/component/displayValueProcess.js b/entity/AttributeFilter_entity/entityfields/component/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..207fb23ce070c893085ff285c9c2d701b01302c9
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/component/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+var res = KeywordUtils.getViewValue($KeywordRegistry.inboxFilterComponent(), vars.get("$field.COMPONENT"));
+result.string(res);
+    
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/component/valueProcess.js b/entity/AttributeFilter_entity/entityfields/component/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5fe77183635dddb34470d15922a2edd81c6d6ced
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/component/valueProcess.js
@@ -0,0 +1,8 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$this.value") == null)
+{
+    result.string($KeywordRegistry.inboxFilterComponent$body());
+}
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js b/entity/AttributeFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..64479ebd9bb18b8a9cee9fdd7fe752eb155d5955
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$param.InboxfiltergroupId_param"));
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/keywordcomparisonmethod/children/containername_param/valueProcess.js b/entity/AttributeFilter_entity/entityfields/keywordcomparisonmethod/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c710f667be9263864a25b4728686f58829ebe04
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/keywordcomparisonmethod/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.attributeFilterComparisonMethod());
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js b/entity/AttributeFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a408f4cb9d1bf617619462c1fce14cc0cc0f79b
--- /dev/null
+++ b/entity/AttributeFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.inboxFilterComponent());
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeFilter_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a50d5629fa5c71d25833c7e623c2baeda121c332
--- /dev/null
+++ b/entity/AttributeFilter_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhere()
+            .andIfSet("ATTRIBUTE_FILTER.INBOXFILTERGROUP_ID", "$param.InboxfiltergroupId_param");
+
+result.string(cond.toString());
+
diff --git a/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/attribute_count.value/expression.js b/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/attribute_count.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..8e2114b1e924d2dec5195d09940f1adc6af5680d
--- /dev/null
+++ b/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/attribute_count.value/expression.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("Context_lib");
+import("Sql_lib");
+
+var sql = newSelect("count(*)")
+.from("AB_ATTRIBUTERELATION")
+.where("AB_ATTRIBUTERELATION.OBJECT_ROWID = ATTRIBUTE_FILTER.ATTRIBUTE_FILTERID")
+.and("AB_ATTRIBUTERELATION.OBJECT_TYPE", ContextUtils.getCurrentContextId());
+
+result.string(sql.toString());
\ No newline at end of file
diff --git a/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/component.displayvalue/expression.js b/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/component.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b2a46f7ac7cac3ae44f5198ba9ce85b1b458e16
--- /dev/null
+++ b/entity/AttributeFilter_entity/recordcontainers/db/recordfieldmappings/component.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.inboxFilterComponent(), "ATTRIBUTE_FILTER.COMPONENT"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index bcffd16ce9484546ea10a4ddab545537259968ff..c4372e2b686e35123529bdfc05421c68524b2f29 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -244,6 +244,11 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityParameter>
+      <name>AlternativeObjectTypeForAttributes_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/alternativeobjecttypeforattributes_param/documentation.adoc</documentation>
+    </entityParameter>
     <entityField>
       <name>VALIDATIONPARAMETERS</name>
       <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/validationparameters/valueProcess.js</valueProcess>
diff --git a/entity/AttributeRelation_entity/entityfields/alternativeobjecttypeforattributes_param/documentation.adoc b/entity/AttributeRelation_entity/entityfields/alternativeobjecttypeforattributes_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..50af5eca1de102867cd8b438e9e737bea5adf710
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/alternativeobjecttypeforattributes_param/documentation.adoc
@@ -0,0 +1 @@
+If attributes from another context should be selectable for an attribute relation, the name of the context can be specified with this parameter.
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
index 5c2ba1e99bd66da1cbc065319b7644302880879f..ba01dbb520422326b171a87c785d0a8c895b0613 100644
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
+result.string(vars.get("$param.AlternativeObjectTypeForAttributes_param") || vars.get("$param.ObjectType_param"));
diff --git a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
index 82f3b1f94c0b96e18502caae219c2ea4f3ed31b9..2ab899187975bea1d0c64454e39d0fd19ddd912e 100644
--- a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
+++ b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
@@ -3,7 +3,7 @@
   <name>ClassificationGroup_entity</name>
   <title>Classification</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/ClassificationGroup_entity/documentation.adoc</documentation>
+  <documentation>%aditoprj%/entity/ClassificationGroup_entity/documentation.adoc</documentation> 
   <contentTitleProcess>%aditoprj%/entity/ClassificationGroup_entity/contentTitleProcess.js</contentTitleProcess>
   <titlePlural>Classifications</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 4b39e0dc6708254140a89a27b6d22e5d5fc97a9c..04502c9dc4f68de65aab0870a413750a1fa7d211 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -582,6 +582,7 @@
     <indexRecordContainer>
       <name>index</name>
       <configMode>INDEXGROUP_DEFINITION</configMode>
+      <searchIndexGroups />
       <indexRecordAlias>Data_alias</indexRecordAlias>
       <query>%aditoprj%/entity/Contract_entity/recordcontainers/index/query.js</query>
       <affectedTables>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index 75ad6975d070c255295d1e8469372a6cfd11cf50..947867fa8c232b07a2b27ab0cc520b2cc1270f57 100644
--- a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
+++ b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
@@ -2,7 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
   <name>DefaultAdminView_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
+  <documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation> 
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index f113a88dd1d4953783869d6ed0748ad6e1d9d928..e56a313c7a5029b7b3bb60905fac02089cbe1875 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -4,6 +4,7 @@
   <title>Attachment</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/documentation.adoc</documentation>
+  
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
index dbc5c8b1007ed7a9822b590d526dc28d5d012c1f..664501b0a72d2311cda8a0c0f435b5a9cdf2c087 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
@@ -1,3 +1,3 @@
 import("system.result");
 
-result.object(["Person", "Organisation", "Offer", "MarketingWorkflowLauncher", "Advertising"]);
\ No newline at end of file
+result.object(["SupportTicket","Person", "Organisation", "Offer", "MarketingWorkflowLauncher", "Advertising"]);
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod b/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..883ae0e5a5f2aff59b74b4531c12b01abb760277
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>DocumentTemplateTicketCategory_entity</name>
+  <title>Ticket category</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <siblings />
+  <titlePlural>Ticket categories</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_TICKETCATEGORYID</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_ticketcategoryid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_ID</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>CLASSIFICATION</name>
+      <title>Category</title>
+      <consumer>KeywordsCathegories</consumer>
+      <displayValueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>DocumentTemplateId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordsCathegories</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/keywordscathegories/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>DocumentTemplateClasificationsProv</name>
+      <titlePlural>Serviceticket categories</titlePlural>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <title>Date edit</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <title>Date new</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATION.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.DOCUMENTTEMPLATE_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_TICKETCATEGORYID.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.DOCUMENTTEMPLATE_TICKETCATEGORYID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLASSIFICATION.displayValue</name>
+          <expression>%aditoprj%/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/recordfieldmappings/classification.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.USER_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.USER_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.DATE_EDIT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DOCUMENTTEMPLATE_TICKETCATEGORY.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>f496a77d-1cdc-46fc-a92e-9afb24e3b88a</name>
+          <tableName>DOCUMENTTEMPLATE_TICKETCATEGORY</tableName>
+          <primaryKey>DOCUMENTTEMPLATE_TICKETCATEGORYID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/classification/displayValueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/classification/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2afe26447e4a371fd3ebb24ed6eff54635e1834f
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/classification/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.ticketCategory(), vars.get("$field.CLASSIFICATION")));
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/date_edit/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/date_new/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_id/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce1fa6599270d244f20d7b7af7335bd6c6447407
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_id/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+ 
+var documenttemplateId = vars.get("$param.DocumentTemplateId_param");
+if (documenttemplateId)
+{
+    result.string(documenttemplateId);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_ticketcategoryid/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_ticketcategoryid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..06599cbc59f80a569993e3ef32824b007ac12289
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/documenttemplate_ticketcategoryid/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/keywordscathegories/children/containername_param/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/keywordscathegories/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..41b0c58f1ffe5e105d040c154670115bc953ccb6
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/keywordscathegories/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.ticketCategory());
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/user_edit/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/entityfields/user_new/valueProcess.js b/entity/DocumentTemplateTicketCategory_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..59a94371b918c1a7edf98ef0fe13220e95b05d52
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Sql_lib");
+
+
+var cond = newWhere();
+cond.andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.DOCUMENTTEMPLATE_ID", "$param.DocumentTemplateId_param");     
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/recordfieldmappings/classification.displayvalue/expression.js b/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/recordfieldmappings/classification.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..46bb72e9e5381eb270e07d71b099499ee8de7c5b
--- /dev/null
+++ b/entity/DocumentTemplateTicketCategory_entity/recordcontainers/db/recordfieldmappings/classification.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.ticketCategory(), "CLASSIFICATION"); 
+
+result.string(sql);
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 245ea52fe1173ad92b2cf87fec7e2a810745f209..fb4bec478f297c77470018b6dd982c9c8e592628 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -2,7 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
   <name>DocumentTemplateTypeCategory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
+  <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation> 
   <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 59d3e3d3a79dcc35163280358c4eb6a06246b895..f469057bff6bd2b169c28392d1bb7d7d47d39914 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -20,6 +20,7 @@
     <entityField>
       <name>DATE_EDIT</name>
       <title>Date edit</title>
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DESCRIPTION</name>
@@ -28,7 +29,6 @@
     </entityField>
     <entityField>
       <name>DOCUMENTTEMPLATEID</name>
-      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DATE_NEW</name>
@@ -55,6 +55,7 @@
     </entityField>
     <entityField>
       <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>NAME</name>
@@ -80,6 +81,8 @@
     </entityField>
     <entityConsumer>
       <name>Documents</name>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>Document_entity</entityName>
@@ -120,6 +123,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>Attributes</name>
+      <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js</stateProcess>
       <onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
       <dependency>
@@ -141,7 +145,7 @@
     <entityField>
       <name>Content</name>
       <title>Text</title>
-      <contentType>LONG_TEXT</contentType>
+      <contentType>HTML</contentType>
       <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/content/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js</displayValueProcess>
@@ -151,14 +155,16 @@
       <title>Classification</title>
       <consumer>DocumentTemplateTypeCategory</consumer>
       <groupable v="true" />
-      <mandatoryProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/mandatoryProcess.js</mandatoryProcess>
+      <mandatory v="false" />
       <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
+      <titleProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
       </onValueChangeTypes>
+      <onValidation></onValidation>
     </entityField>
     <entityConsumer>
       <name>DocumentTemplateTypeCategory</name>
@@ -179,12 +185,13 @@
       <name>Attachments</name>
       <targetContextField>TARGET_CONTEXT</targetContextField>
       <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
-      <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc</documentation>
+      <targetConsumerProcess></targetConsumerProcess>
       <titlePlural>Attachments</titlePlural>
       <recordContainer>db</recordContainer>
     </entityProvider>
     <entityConsumer>
       <name>Links</name>
+      <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
@@ -214,7 +221,15 @@
       <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
       <children>
         <entityParameter>
-          <name>ComingFrom_param</name>
+          <name>DocumentTemplateType_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>DocumentTemplateTypeClassification_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ClasifcationMail_param</name>
           <expose v="true" />
         </entityParameter>
       </children>
@@ -228,6 +243,13 @@
       <name>TARGET_CONTEXT</name>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
     </entityField>
+    <entityActionField>
+      <name>openAdminView</name>
+      <title>Open admin view</title>
+      <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CURLY_BRACKETS</iconId>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+    </entityActionField>
     <entityField>
       <name>REPLACEMENTNAME</name>
       <title>Replacement name</title>
@@ -241,7 +263,7 @@
       <title>Preview</title>
       <description>This field is needed until the html editor does not remove pictures.</description>
       <contentType>HTML</contentType>
-      <state>INVISIBLE</state>
+      <state>READONLY</state>
       <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/preview/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/preview/valueProcess.js</valueProcess>
     </entityField>
@@ -262,6 +284,10 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityParameter>
+      <name>ExcludeDocumentTemplates_param</name>
+      <expose v="true" />
+    </entityParameter>
     <entityParameter>
       <name>ComingFrom_param</name>
       <expose v="true" />
@@ -270,6 +296,17 @@
       <name>DOCUMENTTEMPLATE_OBJECTTYPE</name>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplate_objecttype/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>CONTENTHTML</name>
+      <title>Text</title>
+      <contentType>HTML</contentType>
+      <state>EDITABLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/contenthtml/stateProcess.js</stateProcess>
+    </entityField>
+    <entityParameter>
+      <name>ClasifcationMail_param</name>
+      <expose v="true" />
+    </entityParameter>
     <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
@@ -280,26 +317,43 @@
       <contentType>HTML</contentType>
       <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmledit/valueProcess.js</valueProcess>
     </entityField>
-    <entityActionField>
-      <name>openHtmlEditor</name>
-      <title>Edit HTML</title>
-      <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js</onActionProcess>
-      <iconId>NEON:PENCIL</iconId>
+    <entityConsumer>
+      <name>DocumentTemplateTicketCategories</name>
       <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js</stateProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>openAdminView</name>
-      <title>Open admin view</title>
-      <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CURLY_BRACKETS</iconId>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
-    </entityActionField>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplateTicketCategory_entity</entityName>
+        <fieldName>DocumentTemplateClasificationsProv</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateId_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/children/documenttemplateid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>ALL_TICKET_CATEGORIES</name>
+      <title>Use all serviceticket categories</title>
+      <contentType>BOOLEAN</contentType>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/stateProcess.js</stateProcess>
+      <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityParameter>
+      <name>IncludeDocumentTemplateIds_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
       <onDBDelete>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
@@ -338,8 +392,7 @@
         <dbRecordFieldMapping>
           <name>CLASSIFICATION.value</name>
           <recordfield>DOCUMENTTEMPLATE.CLASSIFICATION</recordfield>
-          <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isFilterable v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>KIND.value</name>
@@ -357,10 +410,20 @@
           <name>REPLACEMENTNAME.value</name>
           <recordfield>DOCUMENTTEMPLATE.REPLACEMENTNAME</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTENTHTML.value</name>
+          <recordfield>DOCUMENTTEMPLATE.TEMPLATECONTENT</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>KIND.displayValue</name>
           <expression>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ALL_TICKET_CATEGORIES.value</name>
+          <recordfield>DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
diff --git a/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d849f50cc222b21a6189dc935d8d04392ba717e
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/onValueChange.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.neon");
+import("Entity_lib");
+
+if(vars.get("$local.value") == "1")
+{
+    var ticketCategoriesConsumer = "DocumentTemplateTicketCategories";
+    var currentTicketCategories = EntityConsumerRowsHelper.getCurrentConsumerRows(ticketCategoriesConsumer, ["DOCUMENTTEMPLATE_TICKETCATEGORYID"]);
+    
+    currentTicketCategories.forEach(function(ticketCategory)
+    {
+        neon.deleteRecord(ticketCategoriesConsumer, ticketCategory["#UID"]);
+    });
+}
diff --git a/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..493c9e5e1410a2f271dc8c8c55ef51c9934f0984
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/stateProcess.js
@@ -0,0 +1,22 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+if(vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$mail())
+{
+    if( vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleexternal()
+    ||  vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleinternal()
+    ||  vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleall())
+{
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    }   
+}
+
+if(vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$letter())
+{
+    if(vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleall())
+    {
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    }
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js
index 9cffc2b80461245d94a17604f60cc531e2d63a6d..a5dfd3faff852597dd3e4f756e8efb62f5685efd 100644
--- a/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js
@@ -1,9 +1,16 @@
+import("system.vars");
 import("system.neon");
 import("system.result");
 import("Context_lib");
 import("Attribute_lib");
+import("KeywordRegistry_basic");
 
-if (AttributeUtil.hasAttributes(ContextUtils.getCurrentContextId()))
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+if( (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$mail()) && (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$signature()) )
+{
+    if (AttributeUtil.hasAttributes(ContextUtils.getCurrentContextId()))
+    {
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    }
+}
+
+   
diff --git a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
index 67f3a29c537f716f715291f86030ac7bf728e6f1..b6482e533bfaca580e8687788e6860726fe8520f 100644
--- a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
+++ b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
@@ -4,10 +4,12 @@ import("system.vars");
 
 // note: could not use only the valueProcess from $field.Content because then it refreshed $field.Content just before save.
 // --> only set in $field.Content.valueProcess if $field.Content is null and set it from here only if MASK triggered change
-if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW))
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
 {
-    var [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$local.value")));
+    [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field."), new FileUpload(vars.get("$local.value")));
 
     vars.set("$context.currentTemplateType", type);
-    vars.set("$field.Content", content)
+    vars.set("$field.Content", content);
+    vars.set("$field.CONTENTHTML", content);
+     
 }
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
index 549deaaa181e05318b957c59a6c3b9e54ab90a77..3e355079f4d1a56e8cb0750909f476765d887614 100644
--- a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
@@ -5,9 +5,17 @@ import("system.result");
 import("system.neon");
 
 if(vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$attachment() 
-|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$letter() && vars.exists("$context.currentTemplateType") && vars.get("$context.currentTemplateType") != DocumentTemplate.types.ODT)
+|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$signature()
+|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$replymail()
+    && vars.exists("$context.currentTemplateType") && vars.get("$context.currentTemplateType") != DocumentTemplate.types.ODT)
+{
     result.string(neon.COMPONENTSTATE_DISABLED);
+}
 else if(vars.get("$field.KIND") != "")
+{
     result.string(neon.COMPONENTSTATE_EDITABLE);
+}
 else
-    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/titleProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..23691b4658553365f1218df1a07e76753c36ee60
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/classification/titleProcess.js
@@ -0,0 +1,10 @@
+import("KeywordRegistry_basic");
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW  && vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$mail())
+{
+    result.string(translate.text("Categories"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/valueProcess.js
index c9a054a068c8e63b0f9fa1e4ae66adc9dc3146f8..abceb3b3045bfebbd35178c21b69b9d33435baca 100644
--- a/entity/DocumentTemplate_entity/entityfields/classification/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/classification/valueProcess.js
@@ -1,7 +1,11 @@
+import("Keyword_lib");
+import("system.db");
 import("system.result");
 import("KeywordRegistry_basic");
 import("system.vars");
 import("DocumentTemplate_lib");
+import("system.neon");
+
 
 if (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$letter() 
         && vars.exists("$context.currentTemplateType") 
diff --git a/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js
index d7715c0880e88f57908a1d752d6e4f03e98d69c9..56246f908f33ecb844a4444ac3b6e740a69f5bad 100644
--- a/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js
@@ -17,7 +17,7 @@ if (vars.exists("$context.currentTemplateType"))
         var template = new DocumentTemplate(util.encodeBase64String(vars.get("$field.Content")), type, "unknown", true)
 
         var contactId = EmployeeUtils.getCurrentContactId();
-        var preview = template.setOptions({onlyBody : true}).getReplacedContentByContactId(contactId);
+        var preview = template.getReplacedContentByContactId(contactId, false, true);
 
         if (type == DocumentTemplate.types.TXT)
             result.string(text.text2html(preview, false));
diff --git a/entity/DocumentTemplate_entity/entityfields/content/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/content/stateProcess.js
index 668475b8e0c15465ecd13fdef69e564b0e9a3055..d105c6c0da6e552c2028a1a71b0735c0607cbd64 100644
--- a/entity/DocumentTemplate_entity/entityfields/content/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/content/stateProcess.js
@@ -4,8 +4,7 @@ import("system.result");
 import("system.vars");
 import("system.neon");
 
-if (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$textModular() 
-    && vars.get("$field.CLASSIFICATION") != $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate())
+if (vars.get("$field.KIND") == "TEX"  && vars.get("$field.CLASSIFICATION") != $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate())
 {
     result.string(neon.COMPONENTSTATE_EDITABLE);
 }
diff --git a/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js
index fbecd887105302ba21c9e5b44e764daeb1c11d65..fe3332e4a0f7bb193a4bffafa00cae1f1bebd07f 100644
--- a/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/content/valueProcess.js
@@ -1,12 +1,15 @@
+import("Sql_lib");
+import("system.util");
+import("system.db");
 import("system.result");
 import("system.neon");
 import("system.neon");
 import("DocumentTemplate_lib");
 import("system.vars");
 
-if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
 {
-    var [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$field.BINDATA")));
+    [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATEID"), new FileUpload(vars.get("$field.BINDATA")));
     vars.set("$context.currentTemplateType", type);
     result.string(content);
-}
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/contenthtml/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/contenthtml/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d434bbea6d5ed8a1630be53672d91ee27d2a8122
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/contenthtml/stateProcess.js
@@ -0,0 +1,12 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+if( (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$mail()) ||  (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$signature())  || (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$replymail()) )
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+} else 
+{
+     result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/date_edit/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/date_edit/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..746f41a88b4f6f3450d1dfcb214eab27b8c429ee
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/date_edit/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("system.datetime");
+import("system.translate");
+
+var myDate = vars.get("$field.DATE_NEW");
+myDate = datetime.toDate(myDate, translate.text("dd.MM.YYYY HH:mm") , "UTC");
+result.string(myDate);
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/date_edit/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/date_new/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/date_new/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..54d1d4eccf637e71e6e699c4a0cd428377298df8
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/date_new/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.datetime");
+import("system.translate");
+
+var myDate = vars.get("$field.DATE_NEW");
+
+myDate = datetime.toDate(myDate, translate.text("dd.MM.YYYY HH:mm") , "UTC");
+
+result.string(myDate);
+
diff --git a/entity/DocumentTemplate_entity/entityfields/documents/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/documents/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..62d46782b24a1c776f9a5879cb044eb0323918fe
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documents/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic")
+
+if( (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$mail()) && (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$signature()) )
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/children/documenttemplateid_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/children/documenttemplateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8664993b9e558e2315aca8e89fb11698b5a6b2bf
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/children/documenttemplateid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a909d9db5d1065afd6001db747986160cb23f4a
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateticketcategories/stateProcess.js
@@ -0,0 +1,18 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+if(vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$mail() 
+|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$letter())
+{
+    if( vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleinternal()
+    || vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleexternal()
+    || vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$singleall())
+    {
+        if (vars.get("$field.ALL_TICKET_CATEGORIES") == "0")
+        {
+            result.string(neon.COMPONENTSTATE_EDITABLE);
+        }
+    }   
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js
index 96543fbc1bc515b9392ebfdbd51aa4c9eda93568..1d13b3c9515745523735f2e18b1fa4e05ff83184 100644
--- a/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.object(vars.get("$field.KIND"));
\ No newline at end of file
+result.object(vars.get("$field.KIND"));    
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/isolanguage/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/isolanguage/displayValueProcess.js
index 5ebcc2d6c6b20ff5f13dba82f1108577ec1d162e..0165de12e053ba4c3ffc9def43a94c7689877b1e 100644
--- a/entity/DocumentTemplate_entity/entityfields/isolanguage/displayValueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/isolanguage/displayValueProcess.js
@@ -1,11 +1,11 @@
 import("system.translate");
 import("system.result");
-import("system.vars");
 import("Sql_lib");
 
+
 var latinName = newSelect("NAME_LATIN")
                     .from("AB_LANGUAGE")
                     .whereIfSet("AB_LANGUAGE.ISO3", "$field.ISOLANGUAGE")
                     .cell(true)
 
-result.string(translate.text(latinName));
+result.string(translate.text(latinName));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/kind/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/kind/onValueChange.js
index e3504bc661812088d04445f888633a66f646cec1..ac09fda672cf93b051777cbae65b00c9c8155d7b 100644
--- a/entity/DocumentTemplate_entity/entityfields/kind/onValueChange.js
+++ b/entity/DocumentTemplate_entity/entityfields/kind/onValueChange.js
@@ -1,3 +1,4 @@
 import("system.vars");
 
-vars.set("$field.CLASSIFICATION", null);
\ No newline at end of file
+vars.set("$field.CLASSIFICATION", null);
+
diff --git a/entity/DocumentTemplate_entity/entityfields/kind/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/kind/stateProcess.js
index 49d3d53d991cc1a864d6db072347af1800f035cf..7348fa870b99d88158e105787bf879730e6da555 100644
--- a/entity/DocumentTemplate_entity/entityfields/kind/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/kind/stateProcess.js
@@ -1,7 +1,7 @@
 import("system.result");
 import("system.neon");
 import("system.vars");
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
     result.string(neon.COMPONENTSTATE_READONLY);
 }
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js
index d3d519af79dab457a4f0ec911aa477791ce74026..9913444327d7f4834997911a8888bee762b42306 100644
--- a/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js
@@ -2,8 +2,9 @@ import("system.result");
 import("KeywordRegistry_basic");
 import("system.vars");
 import("system.neon");
+import("KeywordRegistry_basic")
 
-if(vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$mail())
+if(vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$mail() && vars.get("field.KIND") != $KeywordRegistry.documentTemplateType$replymail())
 {
     result.string(neon.COMPONENTSTATE_INVISIBLE);
 }
diff --git a/entity/DocumentTemplate_entity/entityfields/preview/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/preview/valueProcess.js
index 946cf5a3112d7150d39fdafbb77ae29d06ee8c4f..64c7af13eda443d86db635e4da2686b7f9a0c099 100644
--- a/entity/DocumentTemplate_entity/entityfields/preview/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/preview/valueProcess.js
@@ -1,4 +1,15 @@
+import("system.neon");
+import("system.util");
+import("Employee_lib");
 import("system.vars");
 import("system.result");
+import("DocumentTemplate_lib");
 
-result.string(vars.get("$field.Content.displayValue"));
\ No newline at end of file
+if( (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) )
+{
+     result.string(vars.get("$field.Content"));
+} 
+else 
+{
+     result.string(vars.get("$field.Content.displayValue"));
+}
diff --git a/entity/DocumentTemplate_entity/entityfields/replacementname/onValidation.js b/entity/DocumentTemplate_entity/entityfields/replacementname/onValidation.js
index 5b01b767d3304f1bc0662ce521e0f5f6abf86848..4684a90b474ad7177678b078b701e0be712405df 100644
--- a/entity/DocumentTemplate_entity/entityfields/replacementname/onValidation.js
+++ b/entity/DocumentTemplate_entity/entityfields/replacementname/onValidation.js
@@ -9,8 +9,8 @@ var count = parseInt(newSelect("count(*)")
                         .where("DOCUMENTTEMPLATE.REPLACEMENTNAME", "$local.value")
                         .and("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", "$field.DOCUMENTTEMPLATEID", SqlBuilder.NOT_EQUAL())
                         .cell());
-
+                    
 if (count > 0)
 {
     result.string(translate.text("The replacement name has to be unique."));
-}
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/user_edit/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index 35836fe0a8792eac113906b90ac2e1ecd8b9e57a..3f86dff8db44ea6d741c26b364b951970465fd53 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -1,12 +1,14 @@
+import("KeywordRegistry_basic");
 import("system.result");
 import("system.vars");
 import("system.db");
 import("Sql_lib");
 
+
 var cond = newWhere()
     .andIfSet("DOCUMENTTEMPLATE.KIND", "$param.DocumentTemplateType_param")
     .andIfSet("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
-
+    
 if(vars.get("$param.ComingFrom_param"))
 {
     cond.and(null, newSelect("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATEPLACEOFUSEID")
@@ -15,4 +17,8 @@ if(vars.get("$param.ComingFrom_param"))
         .and("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID"), SqlBuilder.EXISTS());
 }
 
-result.string(cond.toString());
\ No newline at end of file
+cond.andIfSet("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", JSON.parse(vars.get("$param.IncludeDocumentTemplateIds_param")), SqlBuilder.IN());
+
+cond.andIfSet("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", JSON.parse(vars.get("$param.ExcludeDocumentTemplates_param")), SqlBuilder.NOT_IN());
+
+result.string(cond.toString());
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
index f26e45f82fa837f71d0e36e77a96dc713b49eaa0..3a6fd4c69af7960cfa02161f1817c33ce969aa48 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("Workflow_lib");
 import("DocumentTemplate_lib");
 import("system.vars");
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
index 868bf99d8db12ec4b84073fcd8e16fa00c30dded..c7a1cd8e0b38d9256137b3bbc45efa13a572abcb 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
@@ -16,4 +16,4 @@ if(htmlEdit != null && htmlEdit === DocumentTemplateUtils.getTemplateContent(row
 
 DocumentTemplateUtils.updateTemplateData(rowId, upload, rowdata["DOCUMENTTEMPLATE.KIND"], content, 
                                             rowdata["DOCUMENTTEMPLATE.CLASSIFICATION"], rowdata["DOCUMENTTEMPLATE.NAME"]);
-WorkflowSignalSender.updated();
+WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/orderClauseProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a2af557fb5b038e5e2404d8603d1838657de7bf1
--- /dev/null
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.db");
+import("system.result");
+
+result.object({"DOCUMENTTEMPLATE.NAME": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js b/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js
index c8f3819fed4e85372be055d5ad7cb4dac7723cc6..fc656e605d57279fcb32a34f2ef41a1caa14848a 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.documentTemplateType(), "DOCUMENTTEMPLATE.KIND");
-result.string(sql);
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.documentTemplateType(), "DOCUMENTTEMPLATE.KIND"); 
+result.string(sql);
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..074565ec0ec3b7cd631c59fa28a49de463dde84d
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>EmployeeGroupContactRelation_entity</name>
+  <title>Employee for Employee groups</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/EmployeeGroupContactRelation_entity/documentation.adoc</documentation>
+  <usePermissions v="false" />
+  <titlePlural>Employees for Employee groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CONTACT_ID</name>
+      <title>Employee</title>
+      <consumer>Employees</consumer>
+      <linkedContextProcess></linkedContextProcess>
+      <displayValueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEEGROUP_ID</name>
+      <title>Groups</title>
+      <consumer>EmployeeGroups</consumer>
+      <linkedContext>EmployeeGroup</linkedContext>
+      <valueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Employees</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>EmployeeGroups</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeGroup_entity</entityName>
+        <fieldName>EmployeesGroups</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityProvider>
+      <name>EmployeesForGroupId</name>
+      <titlePlural>Employee</titlePlural>
+      <children>
+        <entityParameter>
+          <name>groupId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>groupId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>contactId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>GROUPNAME</name>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <isRequireContainerFiltering v="true" />
+      <fromClauseProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_CONTACT_RELATIONID.value</name>
+          <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_CONTACT_RELATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_ID.displayValue</name>
+          <recordfield>EMPLOYEEGROUP.GROUPNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPNAME.value</name>
+          <recordfield>EMPLOYEEGROUP.GROUPNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+          <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.CONTACT_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_ID.value</name>
+          <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID</recordfield>
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>ebfc24be-ac9a-406f-b335-b631e375270a</name>
+          <tableName>EMPLOYEEGROUP_CONTACT_RELATION</tableName>
+          <primaryKey>EMPLOYEEGROUP_CONTACT_RELATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>22ade9fa-5895-4ceb-bf19-5744abe9e19c</name>
+          <tableName>EMPLOYEEGROUP</tableName>
+          <primaryKey>EMPLOYEEGROUPID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>e4749158-c6b2-4ab8-b15d-7e0a212068f8</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>c74be32d-66c6-485f-aed1-00299ba8f36f</name>
+          <tableName>PERSON</tableName>
+          <primaryKey>PERSONID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/EmployeeGroupContactRelation_entity/documentation.adoc b/entity/EmployeeGroupContactRelation_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d424dac7ac17119a5d779c79305d9155e326615e
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= EmployeeGroupContactRelation_entity
+
+Manages the the Relation between Employees and Employee Groups.  
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/displayValueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b88481ca126ea55d37937bd51fb8c2649af3ee6c
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/contact_id/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+import("system.neon");
+
+result.string(ContactUtils.getTitleByContactId(vars.get("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/displayValueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9ed0aae70e3b515856176ac76208dacac6ca087
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.GROUPNAME"));
+
+
diff --git a/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/valueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be59e48de49415cc8d10e8cd51785614557a7456
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/employeegroup_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.groupId_param") && vars.get("$param.groupId_param"))
+{    
+       result.string(vars.get("$param.groupId_param"));
+}
diff --git a/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/conditionProcess.js b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8172a36e3db37b75ad2f9a1490e76dd80231e092
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID", "$param.groupId_param", SqlBuilder.EQUAL());
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/fromClauseProcess.js b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b73c2d21b15f4191b1baa57cfac2c34f515669d4
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+
+
+result.string("EMPLOYEEGROUP_CONTACT_RELATION \n\
+    left join CONTACT on (EMPLOYEEGROUP_CONTACT_RELATION.CONTACT_ID = CONTACT.CONTACTID) \n\
+    left join EMPLOYEEGROUP on (EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID = EMPLOYEEGROUP.EMPLOYEEGROUPID )\n\
+    left join PERSON on (CONTACT.PERSON_ID = PERSON.PERSONID)");
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/orderClauseProcess.js b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9dcb3eec763f0845839b6121d24cbfad828da666
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.db");
+import("system.result");
+
+result.object({"PERSON.FIRSTNAME": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/recordfieldmappings/firstname.value/expression.js b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/recordfieldmappings/firstname.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod b/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8dcf242c38d495eebb7a87a1028ab22fc6a4b06e
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>EmployeeGroupRuleGroupRelation_entity</name>
+  <title>Employee group rule group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/documentation.adoc</documentation>
+  <usePermissions v="false" />
+  <titlePlural>Employee group rule groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>EMPLOYEEGROUP_ID</name>
+      <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEEGROUP_RULEGROUP_ID</name>
+      <title>Employee group filter group</title>
+      <consumer>EmpGorupRuGroups</consumer>
+      <displayValueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_rulegroup_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEEGROUP_RULEGROUP_RELATIONID</name>
+    </entityField>
+    <entityConsumer>
+      <name>EmpGorupRuGroups</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeGroupRuleGroup_entity</entityName>
+        <fieldName>EmpGroupRuGroups</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>TARGET_CONTEXT</name>
+      <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/target_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>EmployeeGroupId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>EmplGroupRuGroupRelations</name>
+      <targetContextField>TARGET_CONTEXT</targetContextField>
+      <targetIdField>EMPLOYEEGROUP_RULEGROUP_ID</targetIdField>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_RULEGROUP_ID.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_RULEGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_ID.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_RULEGROUP_RELATIONID.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_RULEGROUP_RELATIONID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>8b0e179f-c562-43b6-8358-c49784a9d9a1</name>
+          <tableName>EMPLOYEEGROUP_RULEGROUP_RELATION</tableName>
+          <primaryKey>EMPLOYEEGROUP_RULEGROUP_RELATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/documentation.adoc b/entity/EmployeeGroupRuleGroupRelation_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f16219ca252c1a05e39ab1f964627d2173d183b6
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= EmployeeGroupRuleGroupRelation_entity
+
+Manages the the Relation between Employee Groups and Rule Groups.  
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_id/valueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf3e581aff1acfcd9fbcc6fc2319a0d4ed0244d6
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+var empGroupId = vars.get("$param.EmployeeGroupId_param");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && empGroupId)
+{
+    result.string(empGroupId);
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_rulegroup_id/displayValueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_rulegroup_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b277256dc6720428c44c3e93a4ad7d5317bb1fc
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/employeegroup_rulegroup_id/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Sql_lib");
+import("system.vars");
+import("system.db");
+import("system.result");
+
+var sql = newSelect("EMPLOYEEGROUP_RULEGROUP.NAME")
+              .from("EMPLOYEEGROUP_RULEGROUP")
+              .where("EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID", vars.get("$field.EMPLOYEEGROUP_RULEGROUP_ID"))
+              .cell()
+result.string(sql);
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/target_context/valueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b1a079cf644dd9991e5387b3ed3c998e2f6bb1e
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("EmployeeGroupRuleGroup");
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/recordcontainers/db/conditionProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..219d32a37fdb1b931728721484050be15f64b573
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,9 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_ID", "$param.EmployeeGroupId_param", SqlBuilder.EQUAL());
+
+result.string(cond.toString());
+
+
diff --git a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..905bed00c03e40a70218d31481d3372dc70133de
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>EmployeeGroupRuleGroup_entity</name>
+  <title>Employee group rule group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/documentation.adoc</documentation>
+  <icon>VAADIN:CLIPBOARD_TEXT</icon>
+  <imageProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/imageProcess.js</imageProcess>
+  <titlePlural>Employee group rule groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>EMPLOYEEGROUP_RULEGROUPID</name>
+    </entityField>
+    <entityField>
+      <name>DATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>State</title>
+      <consumer>KeywordState</consumer>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityConsumer>
+      <name>EmpGroupRules</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeGroupRule_entity</entityName>
+        <fieldName>EmpGroupRules</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>EmpGroupRuGroupId_param</name>
+          <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/empgrouprules/children/empgrouprugroupid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>EmpGroupRuGroups</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityConsumer>
+      <name>KeywordState</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP.DATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP.NAME</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP.STATE</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_RULEGROUPID.value</name>
+          <recordfield>EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.displayValue</name>
+          <expression>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>85c56111-4c0f-424e-b984-8e71f5920c77</name>
+          <tableName>EMPLOYEEGROUP_RULEGROUP</tableName>
+          <primaryKey>EMPLOYEEGROUP_RULEGROUPID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/EmployeeGroupRuleGroup_entity/documentation.adoc b/entity/EmployeeGroupRuleGroup_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ec61292575ae20e7ae5301bab7cc3532610fcfa7
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= EmployeeGroupRuleGroup_entity
+
+A rule group combines several EmployeeGroupRules.  
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/empgrouprules/children/empgrouprugroupid_param/valueProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/empgrouprules/children/empgrouprugroupid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb00d679ed9206e9816c4c0b61728c37fbfb36ff
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/empgrouprules/children/empgrouprugroupid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EMPLOYEEGROUP_RULEGROUPID"));
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e9f88a35d115b186b703b226c2b2fe9d842a765
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.employeeGroupStatus());
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/imageProcess.js b/entity/EmployeeGroupRuleGroup_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..abb03f9f604f35b563ac4de4b59d4df9d86ef97f
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.NAME")));
diff --git a/entity/EmployeeGroupRuleGroup_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/EmployeeGroupRuleGroup_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb49dedeca7eb9b5e9066e15a6a0119f3f737f10
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
@@ -0,0 +1,11 @@
+import("system.logging");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.util");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.employeeGroupStatus(), "STATE"); 
+
+
+
+result.string(sql);
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod b/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4a1af553ed4747275090b49320f5207bbec5df9d
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>EmployeeGroupRule_entity</name>
+  <title>Employee group rule</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/EmployeeGroupRule_entity/documentation.adoc</documentation>
+  <titlePlural>Employee group rules</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>EMPLOYEEGROUP_RULEID</name>
+    </entityField>
+    <entityField>
+      <name>COND</name>
+      <title>Condition</title>
+      <contentType>FILTER_TREE</contentType>
+      <valueProcess>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/cond/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEEGROUP_RULEGROUP_ID</name>
+      <valueProcess>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/employeegroup_rulegroup_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>EmpGroupRules</name>
+      <titlePlural>Rule editor</titlePlural>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityParameter>
+      <name>EmpGroupRuGroupId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/EmployeeGroupRule_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>COND.value</name>
+          <recordfield>EMPLOYEEGROUP_RULE.COND</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_RULEGROUP_ID.value</name>
+          <recordfield>EMPLOYEEGROUP_RULE.EMPLOYEEGROUP_RULEGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_RULEID.value</name>
+          <recordfield>EMPLOYEEGROUP_RULE.EMPLOYEEGROUP_RULEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>EMPLOYEEGROUP_RULE.NAME</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>ff343976-09dc-4076-ae4d-9ed6f120925d</name>
+          <tableName>EMPLOYEEGROUP_RULE</tableName>
+          <primaryKey>EMPLOYEEGROUP_RULEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/EmployeeGroupRule_entity/documentation.adoc b/entity/EmployeeGroupRule_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e43435e71fdd2d7ec3219132565e1d7b67263979
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= EmployeeGroupRule_entity
+
+EmployeeGroupRules control, which Tickets the Employee Group the rule is assigned to can pick.  
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/entityfields/cond/valueProcess.js b/entity/EmployeeGroupRule_entity/entityfields/cond/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..337cb5ba81a04f81cfdcf57c6f5c006189a336cd
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/cond/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+var thisValueNotValid = "{\"entity\":\"\",\"filter\":{\"type\":\"group\",\"operator\":\"AND\",\"childs\":[]}}";
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$this.value") == null || vars.get("$this.value") == thisValueNotValid)) {
+    var entity = "SupportTicket_entity";
+    var condJson = JSON.stringify({entity: "" + entity + "", filter: {type: "group", operator: "AND", childs: []}});
+    result.string(condJson);
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/entityfields/employeegroup_rulegroup_id/valueProcess.js b/entity/EmployeeGroupRule_entity/entityfields/employeegroup_rulegroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ca4aac60bd7d9db180b6e147455453077b7bb45
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/employeegroup_rulegroup_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+var empGroupFiGroupId = vars.get("$param.EmpGroupRuGroupId_param");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && empGroupFiGroupId)
+{
+    result.string(empGroupFiGroupId);
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/recordcontainers/db/conditionProcess.js b/entity/EmployeeGroupRule_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ad5f15d0b605e6bc4e4a55d3d10765299dd2014
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("EMPLOYEEGROUP_RULE.EMPLOYEEGROUP_RULEGROUP_ID", "$param.EmpGroupRuGroupId_param", SqlBuilder.EQUAL());
+
+result.string(cond.toString());
diff --git a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a06c6303a3609dbbd3f8f68a2d5b0ab8ad269b69
--- /dev/null
+++ b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>EmployeeGroup_entity</name>
+  <title>Employee Group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/EmployeeGroup_entity/documentation.adoc</documentation>
+  <contentTitleProcess>%aditoprj%/entity/EmployeeGroup_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconId>VAADIN:GROUP</iconId>
+  <imageProcess>%aditoprj%/entity/EmployeeGroup_entity/imageProcess.js</imageProcess>
+  <usePermissions v="false" />
+  <titlePlural>Employee Groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>EMPLOYEEGROUPID</name>
+    </entityField>
+    <entityField>
+      <name>GROUPNAME</name>
+      <title>Group name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityProvider>
+      <name>EmployeesGroups</name>
+      <titlePlural></titlePlural>
+      <children>
+        <entityParameter>
+          <name>inboxId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordsStatus</consumer>
+      <mandatory v="true" />
+      <valueProcess></valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordsStatus</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/keywordsstatus/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/date/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>EmployeesForGroup</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeGroupContactRelation_entity</entityName>
+        <fieldName>EmployeesForGroupId</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>groupId_param</name>
+          <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/employeesforgroup/children/groupid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>inboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>EmplGroupRulGroups</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeGroupRuleGroupRelation_entity</entityName>
+        <fieldName>EmplGroupRuGroupRelations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>EmployeeGroupId_param</name>
+          <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/emplgrouprulgroups/children/employeegroupid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <onDBDelete>%aditoprj%/entity/EmployeeGroup_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUPID.value</name>
+          <recordfield>EMPLOYEEGROUP.EMPLOYEEGROUPID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPNAME.value</name>
+          <recordfield>EMPLOYEEGROUP.GROUPNAME</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>EMPLOYEEGROUP.STATUS</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/EmployeeGroup_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE.value</name>
+          <recordfield>EMPLOYEEGROUP.DATE</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>3e9b6291-aaa4-43e7-aa71-0651e87461cc</name>
+          <tableName>EMPLOYEEGROUP</tableName>
+          <primaryKey>EMPLOYEEGROUPID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/EmployeeGroup_entity/contentTitleProcess.js b/entity/EmployeeGroup_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..694ad3687c1f29b9f8441f78800c678e3f306368
--- /dev/null
+++ b/entity/EmployeeGroup_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.GROUPNAME"));
diff --git a/entity/EmployeeGroup_entity/documentation.adoc b/entity/EmployeeGroup_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d4e2514468fb12953c05120953a1207a900ec017
--- /dev/null
+++ b/entity/EmployeeGroup_entity/documentation.adoc
@@ -0,0 +1,4 @@
+= EmployeeGroupRelation_entity
+
+Declaration of group of employees. These can be used in conjunction with employee group rules to control 
+the picking of open tickets. 
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/date/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/date/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/date/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/emplgrouprulgroups/children/employeegroupid_param/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/emplgrouprulgroups/children/employeegroupid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6d11fdc467596e442f991755fef61957ec30b60f
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/emplgrouprulgroups/children/employeegroupid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EMPLOYEEGROUPID"));
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/employeesforgroup/children/groupid_param/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/employeesforgroup/children/groupid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f49c411872562fe1b79aced3f9b7b8d383d633b
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/employeesforgroup/children/groupid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.EMPLOYEEGROUPID"));
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/keywordsstatus/children/containername_param/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/keywordsstatus/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8d0c5e179649f535d08ce7502910937087bc7b0
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/keywordsstatus/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.employeeGroupStatus());
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/imageProcess.js b/entity/EmployeeGroup_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d2a2a18b7f749ea174f6f1b6a11c1e0385caa3c
--- /dev/null
+++ b/entity/EmployeeGroup_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.GROUPNAME"));
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/recordcontainers/db/onDBDelete.js b/entity/EmployeeGroup_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fe65415592e076201d5222b99bdc0fea8a61e0d
--- /dev/null
+++ b/entity/EmployeeGroup_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,7 @@
+import("Sql_lib");
+import("system.vars");
+import("system.db");
+
+
+newWhereIfSet("EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID", vars.getString("$field.EMPLOYEEGROUPID"))
+        .deleteData();
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/EmployeeGroup_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..457e173653479529664f2ade1cbd2d77f25ac394
--- /dev/null
+++ b/entity/EmployeeGroup_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,11 @@
+import("system.logging");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.util");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.employeeGroupStatus(), "STATUS"); 
+
+
+
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 373bba05405c3e7b34016dbf406a56d9ad821d02..1acb29fec518595786abe4d4f95cdbfa9ce13445 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -4,7 +4,6 @@
   <title>Employee</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Employee_entity/documentation.adoc</documentation>
-  <siblings />
   <grantDeleteProcess>%aditoprj%/entity/Employee_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Employee_entity/afterUiInit.js</afterUiInit>
diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
index 4a1dbe67e5fb2353cd24c297f9ca0c1eb08e9304..a0090b2f60fb25803f56986a9b5395b2fa1f36df 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -7,7 +7,7 @@ import("system.vars");
 import("Sql_lib");
 import("Employee_lib");
 
-var contactId = vars.get("local.value");
+var contactId = vars.get("$local.value");
 if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
     && contactId)
 {
diff --git a/entity/Employee_entity/entityfields/email_address/onValidation.js b/entity/Employee_entity/entityfields/email_address/onValidation.js
index c9ac4ef72de7b9c1de1c4acc80300c00f671ea03..6f315a32e2090826d7015dcf3def8008bdbc0ff5 100644
--- a/entity/Employee_entity/entityfields/email_address/onValidation.js
+++ b/entity/Employee_entity/entityfields/email_address/onValidation.js
@@ -4,7 +4,7 @@ import("system.vars");
 import("system.tools");
 import("system.translate");
 
-var email = vars.get("local.value");
+var email = vars.get("$local.value");
 var isTaken = tools.getUserByAttribute(tools.EMAIL, [email]);
 isTaken = isTaken 
     ? isTaken[tools.NAME] != vars.get("$field.UID")
diff --git a/entity/Employee_entity/entityfields/title/onValidation.js b/entity/Employee_entity/entityfields/title/onValidation.js
index 90091b0551710d07ce191daaf18db8a5d88e83ca..366aa7daa8c3ac0686ececd595e8874ca186e60d 100644
--- a/entity/Employee_entity/entityfields/title/onValidation.js
+++ b/entity/Employee_entity/entityfields/title/onValidation.js
@@ -5,7 +5,7 @@ import("system.vars");
 import("system.tools");
 import("Entity_lib");
 
-var title = vars.get("local.value");
+var title = vars.get("$local.value");
 var isOldTitle = false;
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
diff --git a/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod b/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9c60f4fd96df04b7bbd0d005062e2079ec992846
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxEmployeegroupRelation_entity</name>
+  <title>Employee Group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/InboxEmployeegroupRelation_entity/documentation.adoc</documentation>
+  <titlePlural>Employee Groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INBOX_EMPLOYEEGROUP_RELATIONID</name>
+      <title>InboxRelation</title>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEEGROUP_ID</name>
+      <title>Employee Group</title>
+      <consumer>EmployeesGroupsForCompanyGroup</consumer>
+      <displayValueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>INBOX_ID</name>
+      <title>Inboxes</title>
+      <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/inbox_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>EmployeesGroupsForCompanyGroup</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>EmployeeGroup_entity</entityName>
+        <fieldName>EmployeesGroups</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>inboxId_param</name>
+          <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/employeesgroupsforcompanygroup/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>inboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>EmployessGroupsForInboxId</name>
+      <targetContextField>TARGET_CONTEXT_EMPLOYEEGROUP</targetContextField>
+      <targetIdField>EMPLOYEEGROUP_ID</targetIdField>
+      <children>
+        <entityParameter>
+          <name>inboxId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>TARGET_CONTEXT_EMPLOYEEGROUP</name>
+      <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/target_context_employeegroup/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>GROUPNAME</name>
+      <title>Group name</title>
+    </entityField>
+    <entityField>
+      <name>INBOXNAME</name>
+      <title>Inmob name</title>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <fromClauseProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <description></description>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_ID.value</name>
+          <recordfield>INBOX_EMPLOYEEGROUP_RELATION.EMPLOYEEGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEEGROUP_ID.displayValue</name>
+          <recordfield>EMPLOYEEGROUP.GROUPNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>GROUPNAME.value</name>
+          <recordfield>EMPLOYEEGROUP.GROUPNAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXNAME.value</name>
+          <recordfield>INBOX.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.displayValue</name>
+          <recordfield>INBOX.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_EMPLOYEEGROUP_RELATIONID.value</name>
+          <recordfield>INBOX_EMPLOYEEGROUP_RELATION.INBOX_EMPLOYEEGROUP_RELATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.value</name>
+          <recordfield>INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>a592df7b-4cdc-4ab4-bcdf-82df5074abdc</name>
+          <tableName>INBOX_EMPLOYEEGROUP_RELATION</tableName>
+          <primaryKey>INBOX_EMPLOYEEGROUP_RELATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>8bb93532-89d0-40ba-a92c-9f944c11447a</name>
+          <tableName>INBOX</tableName>
+          <primaryKey>INBOXID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+        <linkInformation>
+          <name>06c9d29f-8b47-4081-bc32-84ed84a20e7f</name>
+          <tableName>EMPLOYEEGROUP</tableName>
+          <primaryKey>EMPLOYEEGROUPID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxEmployeegroupRelation_entity/documentation.adoc b/entity/InboxEmployeegroupRelation_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..acd4e84f12898be04a3fcb12cb7c1a1eb01089f8
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxEmployeeRelation_entity
+
+Manages the the Relation between Employees and Inboxes.  
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/displayValueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67d34dbd88aef9b004ebe57023e7af9010efa65d
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/employeegroup_id/displayValueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.GROUPNAME"));
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/employeesgroupsforcompanygroup/children/inboxid_param/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/employeesgroupsforcompanygroup/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fd78b4cd0a6aac02a641035a2d3a2835911344f2
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/employeesgroupsforcompanygroup/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.inboxId_param"));
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/inbox_id/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/inbox_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9430f92f76bbb64fe4138e4607b85044f82d5bdc
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/inbox_id/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+
+var inboxID = vars.get("$param.inboxId_param")
+if (inboxID)
+{
+    result.string(inboxID);
+}
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/target_context_employeegroup/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/target_context_employeegroup/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..77c88e1907bea655ec01391e7213ef43af7b6667
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/target_context_employeegroup/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("EmployeeGroup");
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/conditionProcess.js b/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..24a43a40aa87c4b9183c210cc0350906947cccb5
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID", "$param.inboxId_param", SqlBuilder.EQUAL());
+
+result.string(cond.toString());
diff --git a/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/fromClauseProcess.js b/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1422d16f9f32400e2803738c839d75479291578c
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+
+
+result.string("INBOX_EMPLOYEEGROUP_RELATION \n\
+    join EMPLOYEEGROUP on (EMPLOYEEGROUP.EMPLOYEEGROUPID = INBOX_EMPLOYEEGROUP_RELATION.EMPLOYEEGROUP_ID  )\n\
+    join INBOX on (INBOX.INBOXID = INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID)");
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod b/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..92faecb34e45bd35c6ba60390351fda5a23d87a7
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxFilterGroupRelation_entity</name>
+  <title>Inbox filter group</title>
+  <description></description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/InboxFilterGroupRelation_entity/documentation.adoc</documentation>
+  <icon>NEON:FILTER</icon>
+  <titlePlural>Inbox filter groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INBOXFILTERGROUP_ID</name>
+      <title>Inbox filter group</title>
+      <consumer>InboxFilterGroups</consumer>
+    </entityField>
+    <entityField>
+      <name>INBOX_ID</name>
+      <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/inbox_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>INBOXFILTERGROUP_RELATIONID</name>
+    </entityField>
+    <entityProvider>
+      <name>InboxFilterRelationGroups</name>
+      <targetContextField>TARGET_CONTEXT_INBOXFILTERGROUP</targetContextField>
+      <targetIdField>INBOXFILTERGROUP_ID</targetIdField>
+      <titlePlural>Control editor</titlePlural>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>InboxFilterGroups</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxFilterGroup_entity</entityName>
+        <fieldName>InboxFilterGroups</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludeInboxFilterGroups_param</name>
+          <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>TARGET_CONTEXT_INBOXFILTERGROUP</name>
+      <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/target_context_inboxfiltergroup/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.value</name>
+          <recordfield>INBOXFILTERGROUP_RELATION.INBOX_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERGROUP_ID.value</name>
+          <recordfield>INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERGROUP_RELATIONID.value</name>
+          <recordfield>INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_RELATIONID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERGROUP_ID.displayValue</name>
+          <expression>%aditoprj%/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>778fe0a4-357f-45a9-9698-e04e9401319d</name>
+          <tableName>INBOXFILTERGROUP_RELATION</tableName>
+          <primaryKey>INBOXFILTERGROUP_RELATIONID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxFilterGroupRelation_entity/documentation.adoc b/entity/InboxFilterGroupRelation_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..248effb466915c8991119153326e0d8a4c66152d
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxFilterGroupRelation_entity
+
+Manages the the Relation between Inboxes and Filtergroups.  
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/inbox_id/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/inbox_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5b1f14e2c8e35f0bc70071e6b28911d5930638e
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/inbox_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+var inboxid = vars.get("$param.InboxId_param");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(inboxid);
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..52e04d7128121199cd05f34d3d5a6181f35c4f45
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/inboxfiltergroups/children/excludeinboxfiltergroups_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+
+var sql = new SqlBuilder()
+              .select("INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID")
+              .from("INBOXFILTERGROUP_RELATION")
+              .where("INBOX_ID", vars.get("$param.InboxId_param"))
+              .arrayColumn(); 
+result.object(sql);
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/target_context_inboxfiltergroup/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/target_context_inboxfiltergroup/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa09626a4a1e3a6cec8456f950b7c3a563ed9c29
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/target_context_inboxfiltergroup/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("InboxFilterGroup");
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/recordcontainers/db/conditionProcess.js b/entity/InboxFilterGroupRelation_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..57a66b3313bdada7fad576881f00993fbf57ae0e
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+ 
+ var cond = newWhere("INBOXFILTERGROUP_RELATION.INBOX_ID", "$param.InboxId_param",SqlBuilder.EQUAL());
+ 
+ result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js b/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..234d5690451a6793590572b93a2e69423ab4c277
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/recordcontainers/db/recordfieldmappings/inboxfiltergroup_id.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("NAME")
+.from("INBOXFILTERGROUP")
+.where("INBOXFILTERGROUPID = INBOXFILTERGROUP_ID").toString());
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5b29af5b7352c4846a39f373e34e3671c2366dcf
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxFilterGroup_entity</name>
+  <title>Inbox filter group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/InboxFilterGroup_entity/documentation.adoc</documentation>
+  <icon>NEON:FILTER</icon>
+  <imageProcess>%aditoprj%/entity/InboxFilterGroup_entity/imageProcess.js</imageProcess>
+  <titlePlural>Inbox filter groups</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INBOXFILTERGROUPID</name>
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>State</title>
+      <consumer>KeywordState</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DATE</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <stateProcess></stateProcess>
+      <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>InboxFilters</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxFilter_entity</entityName>
+        <fieldName>InboxFilters</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxFilterGroup_param</name>
+          <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/inboxfilters/children/inboxfiltergroup_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordState</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>InboxFilterGroups</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityParameter>
+      <name>ExcludeInboxFilterGroups_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>PRIORITY</name>
+      <title>Priority</title>
+      <contentType>NUMBER</contentType>
+      <onValidation>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/priority/onValidation.js</onValidation>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityConsumer>
+      <name>AttributeFilters</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeFilter_entity</entityName>
+        <fieldName>AttributeFilters</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxfiltergroupId_param</name>
+          <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/attributefilters/children/inboxfiltergroupid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE.value</name>
+          <recordfield>INBOXFILTERGROUP.DATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERGROUPID.value</name>
+          <recordfield>INBOXFILTERGROUP.INBOXFILTERGROUPID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>INBOXFILTERGROUP.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <recordfield>INBOXFILTERGROUP.STATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRIORITY.value</name>
+          <recordfield>INBOXFILTERGROUP.PRIORITY</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>7213c359-95fe-4f05-8356-84fee62586e3</name>
+          <tableName>INBOXFILTERGROUP</tableName>
+          <primaryKey>INBOXFILTERGROUPID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxFilterGroup_entity/documentation.adoc b/entity/InboxFilterGroup_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..39d11c5f28fd0bddf13f3b24d06f5ad9b4194df5
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxFilterGroup_entity
+
+Combines several InboxFilters to groups.  
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/attributefilters/children/inboxfiltergroupid_param/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/attributefilters/children/inboxfiltergroupid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a32acd44dd4b88026f7273852b243c25e3bd053f
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/attributefilters/children/inboxfiltergroupid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXFILTERGROUPID"));
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..688912b6eb834a02c9d13067b823f8a32929797a
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/inboxfilters/children/inboxfiltergroup_param/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/inboxfilters/children/inboxfiltergroup_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a32acd44dd4b88026f7273852b243c25e3bd053f
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/inboxfilters/children/inboxfiltergroup_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXFILTERGROUPID"));
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8d0c5e179649f535d08ce7502910937087bc7b0
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/keywordstate/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.employeeGroupStatus());
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/priority/onValidation.js b/entity/InboxFilterGroup_entity/entityfields/priority/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfed0161a603a5fd051b4946435c88eee99345d6
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/priority/onValidation.js
@@ -0,0 +1,18 @@
+import("Sql_lib");
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+
+if(vars.get("$local.value"))
+{
+    var cond = new SqlBuilder().selectCount()
+    .from("INBOXFILTERGROUP")
+    .where("INBOXFILTERGROUP.PRIORITY",vars.get("$local.value"))
+    .and("INBOXFILTERGROUP.INBOXFILTERGROUPID",vars.get("$field.INBOXFILTERGROUPID"),SqlBuilder.NOT_EQUAL())
+    .cell(true) || "0";
+    if(cond != 0)
+    {
+        result.string(translate.text("This priority is already assigned."));
+    }
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/state/displayValueProcess.js b/entity/InboxFilterGroup_entity/entityfields/state/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca67b1dab810ea0843a7e7a42cc056da7334918b
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/state/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+var res = KeywordUtils.getViewValue($KeywordRegistry.employeeGroupStatus(), vars.get("$field.STATE"));
+result.string(res);
+    
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/imageProcess.js b/entity/InboxFilterGroup_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5bd45bae1ebbd4af2e9607e3e7770e070b8264a
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.NAME")));
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js b/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..79067f745f39cc71feb32de8cf86a3d9bfb87290
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("INBOXFILTERGROUP.INBOXFILTERGROUPID", "$param.ExcludeInboxFilterGroups_param",SqlBuilder.NOT_IN());
+
+result.string(cond.toString());  
+
+ 
diff --git a/entity/InboxFilter_entity/InboxFilter_entity.aod b/entity/InboxFilter_entity/InboxFilter_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..339721e84300865a9be66a2ff5150b412fcd689f
--- /dev/null
+++ b/entity/InboxFilter_entity/InboxFilter_entity.aod
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxFilter_entity</name>
+  <title>Ticket filter</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/InboxFilter_entity/documentation.adoc</documentation>
+  <icon>NEON:FILTER</icon>
+  <titlePlural>Inbox filters</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INBOXFILTERID</name>
+    </entityField>
+    <entityField>
+      <name>INBOXFILTERGROUP_ID</name>
+      <valueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>COMPONENT</name>
+      <title>Component</title>
+      <consumer>KeywordComponent</consumer>
+      <displayValueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/component/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>InboxFilters</name>
+      <recordContainer>db</recordContainer>
+    </entityProvider>
+    <entityParameter>
+      <name>InboxFilterGroup_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordComponent</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>SEARCHTERM</name>
+      <title>Search term</title>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>TICKETTEMPLATE_ID</name>
+      <title>Ticket template</title>
+      <consumer>Tickettemplates</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/tickettemplate_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Tickettemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicketTemplate_entity</entityName>
+        <fieldName>SupportTicketTemplates</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/InboxFilter_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>COMPONENT.value</name>
+          <recordfield>INBOXFILTER.COMPONENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERID.value</name>
+          <recordfield>INBOXFILTER.INBOXFILTERID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SEARCHTERM.value</name>
+          <recordfield>INBOXFILTER.SEARCHTERM</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TICKETTEMPLATE_ID.displayValue</name>
+          <expression>%aditoprj%/entity/InboxFilter_entity/recordcontainers/db/recordfieldmappings/tickettemplate_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXFILTERGROUP_ID.value</name>
+          <recordfield>INBOXFILTER.INBOXFILTERGROUP_ID</recordfield>
+          <columnAlias></columnAlias>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TICKETTEMPLATE_ID.value</name>
+          <recordfield>INBOXFILTER.TICKETTEMPLATE_ID</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>d640b779-222e-46fd-b9f8-82b9ed9b9df4</name>
+          <tableName>INBOXFILTER</tableName>
+          <primaryKey>INBOXFILTERID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxFilter_entity/documentation.adoc b/entity/InboxFilter_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cec863ca8a1ad082dd3fec7c5334ac4afb5e0ecf
--- /dev/null
+++ b/entity/InboxFilter_entity/documentation.adoc
@@ -0,0 +1,4 @@
+= InboxFilter_entity
+
+An InboxFilter contains a search term, the component of the Mail, which is going the be searched, and the Service Ticket Template,
+which should be used to create the ticket automatically, if the search term is found.  
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/component/displayValueProcess.js b/entity/InboxFilter_entity/entityfields/component/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..207fb23ce070c893085ff285c9c2d701b01302c9
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/component/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+var res = KeywordUtils.getViewValue($KeywordRegistry.inboxFilterComponent(), vars.get("$field.COMPONENT"));
+result.string(res);
+    
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js b/entity/InboxFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a39c48b716d27e2889c2290962949d4f673cd63
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/inboxfiltergroup_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var inboxFilterGroupId = vars.get("$param.InboxFilterGroup_param");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) && inboxFilterGroupId)
+{
+    result.string(inboxFilterGroupId);
+}
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js b/entity/InboxFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a408f4cb9d1bf617619462c1fce14cc0cc0f79b
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/keywordcomponent/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.inboxFilterComponent());
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/tickettemplate_id/displayValueProcess.js b/entity/InboxFilter_entity/entityfields/tickettemplate_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6605f7798cc6c7d7fd1ef6fb9fc1c40b2d690061
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/tickettemplate_id/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("TEMPLATENAME")
+.from("TICKETTEMPLATE")
+.where("TICKETTEMPLATE.TICKETTEMPLATEID", vars.get("$field.TICKETTEMPLATE_ID"))
+.cell());
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/recordcontainers/db/conditionProcess.js b/entity/InboxFilter_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fbc249dec387d9ace38ba890c7e4502cb59342c
--- /dev/null
+++ b/entity/InboxFilter_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+ 
+ var cond = newWhere("INBOXFILTER.INBOXFILTERGROUP_ID", "$param.InboxFilterGroup_param",SqlBuilder.EQUAL());
+ 
+ result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/recordcontainers/db/recordfieldmappings/tickettemplate_id.displayvalue/expression.js b/entity/InboxFilter_entity/recordcontainers/db/recordfieldmappings/tickettemplate_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..59780211b222fa4f4bcd30a667d2a4552f430aa8
--- /dev/null
+++ b/entity/InboxFilter_entity/recordcontainers/db/recordfieldmappings/tickettemplate_id.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("TEMPLATENAME")
+.from("TICKETTEMPLATE")
+.where("TICKETTEMPLATE.TICKETTEMPLATEID = INBOXFILTER.TICKETTEMPLATE_ID"));
\ No newline at end of file
diff --git a/entity/InboxTicketChartMail_entity/InboxTicketChartMail_entity.aod b/entity/InboxTicketChartMail_entity/InboxTicketChartMail_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..33ad1c40744213859f050ce481febf85bf6b909b
--- /dev/null
+++ b/entity/InboxTicketChartMail_entity/InboxTicketChartMail_entity.aod
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxTicketChartMail_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/InboxTicketChartMail_entity/documentation.adoc</documentation>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>X</name>
+    </entityField>
+    <entityField>
+      <name>Y</name>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/InboxTicketChartMail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxTicketChartMail_entity/documentation.adoc b/entity/InboxTicketChartMail_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..804a2110a45dda6cd5582559fbedb13b0b1dc787
--- /dev/null
+++ b/entity/InboxTicketChartMail_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxTicketChartMail_entity
+
+Chart of Number of tickets per inbox (Mail)
\ No newline at end of file
diff --git a/entity/InboxTicketChartMail_entity/recordcontainers/jdito/contentProcess.js b/entity/InboxTicketChartMail_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ff46bfa340f75e71186734f3f08f6424960de3c
--- /dev/null
+++ b/entity/InboxTicketChartMail_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,215 @@
+import("system.SQLTYPES");
+import("Turnover_lib");
+import("system.vars");
+import("system.result");
+import("Money_lib");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.translate");
+import("Sql_lib");
+
+var inboxId = vars.get("$param.InboxId_param");
+var dateToday = vars.get("$sys.date");
+var thisMonth = datetime.toDate(dateToday, "MM");
+var lastMonth = thisMonth == 1? 12: (thisMonth-1);
+var thisYear = datetime.toDate(dateToday, "yyyy");
+var lastYear = thisYear - 1;
+
+var inboxMails;
+var sqlMask = new SqlMaskingUtils();
+
+if(inboxId)
+{
+    inboxMails = new SqlBuilder()
+                     .select("MAILSIGNATURE.MAIL_ADDRESS")
+                     .from("MAILSIGNATURE")
+                     .where("MAILSIGNATURE.INBOX_ID", inboxId)
+                     .arrayColumn();
+}
+else
+{
+    inboxMails = new SqlBuilder()
+                     .select("MAILSIGNATURE.MAIL_ADDRESS")
+                     .from("MAILSIGNATURE")
+                     .arrayColumn();
+}
+
+var cond = newWhereIfSet("TICKET.INBOX_ID",inboxId);
+
+if(thisMonth == 1)
+{
+    cond.and(newWhere()
+          .and("TASK.START_DATE", thisMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .and("TASK.START_DATE", thisYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER))
+        .or(newWhere()
+          .and("TASK.START_DATE", lastMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .and("TASK.START_DATE", lastYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER));
+}
+else
+{
+    cond.and(newWhere()
+          .or("TASK.START_DATE", thisMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .or("TASK.START_DATE", lastMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER))
+        .and("TASK.START_DATE", thisYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER);
+}
+   
+var data = new SqlBuilder()
+               .select(["MAILSIGNATURE.MAIL_ADDRESS", sqlMask.monthFromDate("TASK.START_DATE"), sqlMask.dayFromDate("TASK.START_DATE"), "1"])
+               .from ("TICKET")
+               .join("TASK","TICKET.TASK_ID = TASK.TASKID")
+               .join("MAILSIGNATURE","MAILSIGNATURE_ID = MAILSIGNATUREID")
+               .where(cond)
+               .orderBy("TASK.START_DATE asc")
+               .table();   
+               
+// this object is for better code with readable names to access the data-fields
+var columns = {
+    inboxMail: 0,
+    month: 1,
+    day: 2,
+    amount: 3
+};
+
+var chartData = [];
+var countData = {}
+
+var monthDate;
+
+
+var lastDayOfMonth;
+var dateForLastDay;
+
+for (let m = 0; m < 2; m++) 
+{    
+    let month = (m == 0? lastMonth.toString(): thisMonth.toString());
+    
+    dateForLastDay = thisYear + "-" + month + "-" + "01";
+    
+    if(month.length == 1)
+        month = "0" + month;
+    
+    lastDayofMonth = new Date(thisYear, month + 1, 0);
+    lastDayofMonth = lastDayofMonth.getDate();
+
+    for(let d = 1; d <= lastDayOfMonth; d++)
+    {
+        inboxMails.forEach(function(inboxMailResolved)
+        {
+            _addCount([inboxMailResolved, [month, getMonthMapping(month)], "" + d], 0);
+        });
+    }
+}
+
+data.forEach(function(row) 
+{    
+    if(row[columns.month].length == 1)
+        row[columns.month] = "0" + row[columns.month];
+    
+    _addCount([row[columns.inboxMail], [row[columns.month], getMonthMapping("" + row[columns.month])], "" + row[columns.day]], row[columns.amount]);
+        
+});
+
+for (let key in countData) 
+{
+    var countDataSet = countData[key];
+    if(countDataSet.x != "unkategorisiert")
+    {
+        chartData.push([key, countDataSet.parent, countDataSet.category, countDataSet.x, countDataSet.count])
+    };
+}
+result.object(chartData);
+
+/**
+ * _addCount
+ *  - It counts the final values for each layer. So if you put in: (simplified)
+ *  [year1, month5, 50.8]
+ *  it counts +50.8 for each layer:
+ *  year1; += 50.8
+ *  year1;month5; += 50.8
+ *  
+ *  This values are all stored in the "countData" object and the keys of it are later used as UID.
+ *  The Keys just consist of the concatenated id's mentioned in 1.
+ *  
+ *  You can provide any count of keys so if you need another layer, just add it to the data (1.) and add the keyid (or [keyid, keydisplayvalue]) to the _addCount-calls appended to the array provided as first parameter
+ *  
+ * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
+ *                      the first key is the Category
+ *                      e.g.
+ *                      [ 
+ *                          category,
+ *                          year,
+ *                          [ 
+ *                             month(number),
+ *                             monthName(displayValue)
+ *                          ]
+ *                      ]
+ * This will lead to 2 layers: year -> month
+ *                      
+ * @param {float} pValue the value to display
+ */
+function _addCount(pKeys, pValue) 
+{
+    var key = "";
+    
+    // iterate through all keys (e.g. through each layer) and count for each of them seperately
+    for (let i = 0; i < pKeys.length; i++) 
+    {
+        let keyId;
+        let keyName;
+        
+        // if the key type is not "object" it is a string ("object" means Array of ["id", "displayValue"], "string" means only "id"
+        if (typeof pKeys[i] != "object")
+        {
+            // add key as id and display value
+            keyId = pKeys[i];
+            keyName = pKeys[i];
+        }
+        else 
+        {
+            // handle array: first is id seccond is name for X-value
+            keyId = pKeys[i][0];
+            keyName = pKeys[i][1];
+        }
+        var parent = key;
+        // if we are first or second: we are category or the top layer -> we have no parent
+        if (i < 2)
+        {
+            parent = ""
+        }
+        
+        // concatenate the previous (parent) key with the new one to get a new unique id
+        key += ";" + keyId;
+        // if we are not category
+        if (i > 0)
+        {
+            // add the data to the count-object
+            if (countData[key] == undefined)
+            {
+                // if the key was not added before create it with initial value 0.0
+                countData[key] = {parent: parent, count: 0.0, category: pKeys[0], x: keyName}; // keys[0] is the category
+            }
+            
+            // count
+            countData[key].count += parseFloat(pValue);
+        }
+    }
+}
+
+function getMonthMapping (pKey) 
+{
+    return translate.text({
+        "01": 'January',
+        "02": 'February',
+        "03": 'March',
+        "04": 'April',
+        "05": 'May',
+        "06": 'June',
+        "07": 'July',
+        "08": 'August',
+        "09": 'September',
+        "10": 'October',
+        "11": 'November',
+        "12": 'December'
+    }[pKey]);
+}
\ No newline at end of file
diff --git a/entity/InboxTicketChartMedium_entity/InboxTicketChartMedium_entity.aod b/entity/InboxTicketChartMedium_entity/InboxTicketChartMedium_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d8732f0505da5e93fe69264adddfba6129c827ea
--- /dev/null
+++ b/entity/InboxTicketChartMedium_entity/InboxTicketChartMedium_entity.aod
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxTicketChartMedium_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/InboxTicketChartMedium_entity/documentation.adoc</documentation>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>X</name>
+    </entityField>
+    <entityField>
+      <name>Y</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+    </entityField>
+    <entityParameter>
+      <name>InboxName_param</name>
+      <expose v="true" />
+      <title>Inbox Name</title>
+    </entityParameter>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/InboxTicketChartMedium_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxTicketChartMedium_entity/documentation.adoc b/entity/InboxTicketChartMedium_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..8f69ce9b2a3a1a06f89ad35751e4ac5e68323697
--- /dev/null
+++ b/entity/InboxTicketChartMedium_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxTicketChartMedium_entity
+
+Chart of Number of tickets per inbox (Medium)
\ No newline at end of file
diff --git a/entity/InboxTicketChartMedium_entity/recordcontainers/jdito/contentProcess.js b/entity/InboxTicketChartMedium_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..86fafa77517a309dccd3bb75d16102be8aed94e4
--- /dev/null
+++ b/entity/InboxTicketChartMedium_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,205 @@
+import("system.SQLTYPES");
+import("Sql_lib");
+import("Turnover_lib");
+import("system.vars");
+import("system.result");
+import("Money_lib");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.translate");
+
+
+var inboxId = vars.get("$param.InboxId_param");
+var dateToday = vars.get("$sys.date");
+var thisMonth = datetime.toDate(dateToday, "MM");
+var lastMonth = thisMonth == 1? 12: (thisMonth-1);
+var thisYear = datetime.toDate(dateToday, "yyyy");
+var lastYear = thisYear -1;
+var medium = [$KeywordRegistry.activityCategory$phone(),
+$KeywordRegistry.activityCategory$mail()];
+var sqlMask = new SqlMaskingUtils();
+
+medium = medium.map(function(mediumKey)
+{
+    return KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), mediumKey);
+});
+
+var cond = newWhereIfSet("TICKET.INBOX_ID",inboxId);
+
+if(thisMonth == 1)
+{
+    cond.and(newWhere()
+          .and("TASK.START_DATE", thisMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .and("TASK.START_DATE", thisYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER))
+        .or(newWhere()
+          .and("TASK.START_DATE", lastMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .and("TASK.START_DATE", lastYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER));
+}
+else
+{
+    cond.and(newWhere()
+          .or("TASK.START_DATE", thisMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .or("TASK.START_DATE", lastMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER))
+        .and("TASK.START_DATE", thisYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER);
+}
+
+var data = new SqlBuilder()
+               .select(["TICKET.MEDIUM",sqlMask.monthFromDate("TASK.START_DATE"), sqlMask.dayFromDate("TASK.START_DATE"), "1"])
+               .from("TICKET")
+               .join("TASK","TICKET.TASK_ID = TASK.TASKID")
+               .where("TICKET.MEDIUM is not null")
+               .and(cond)
+               .orderBy("TASK.START_DATE asc")
+               .table();
+              
+// this object is for better code with readable names to access the data-fields
+var columns = {
+    medium: 0,
+    month: 1,
+    day: 2,
+    amount: 3
+};
+
+var chartData = [];
+var countData = {}
+
+var monthDate;
+
+
+var lastDayOfMonth;
+var dateForLastDay;
+
+for (let m = 0; m < 2; m++) 
+{    
+    let month = (m == 0? lastMonth.toString(): thisMonth.toString());
+    
+    dateForLastDay = thisYear + "-" + month + "-" + "01";
+    
+    if(month.length == 1)
+        month = "0" + month;
+    
+    lastDayofMonth = new Date(thisYear, month + 1, 0);
+    lastDayofMonth = lastDayofMonth.getDate();  
+
+    for(let d = 1; d <= lastDayOfMonth; d++)
+    {
+        medium.forEach(function(mediumResolved)
+        {
+            _addCount([mediumResolved, [month, getMonthMapping(month)], "" + d], 0);
+        });
+    }
+}
+
+data.forEach(function(row) 
+{    
+    if(row[columns.month].length == 1)
+        row[columns.month] = "0" + row[columns.month];
+    
+    _addCount([KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), row[columns.medium]), [row[columns.month], getMonthMapping("" + row[columns.month])], "" + row[columns.day]], row[columns.amount]);
+        
+});
+
+for (let key in countData) 
+{
+    var countDataSet = countData[key];
+    if(countDataSet.x != "unkategorisiert")
+    {
+        chartData.push([key, countDataSet.parent, countDataSet.category, countDataSet.x, countDataSet.count]);
+    }
+}
+result.object(chartData);
+
+/**
+ * _addCount
+ *  - It counts the final values for each layer. So if you put in: (simplified)
+ *  [year1, month5, 50.8]
+ *  it counts +50.8 for each layer:
+ *  year1; += 50.8
+ *  year1;month5; += 50.8
+ *  
+ *  This values are all stored in the "countData" object and the keys of it are later used as UID.
+ *  The Keys just consist of the concatenated id's mentioned in 1.
+ *  
+ *  You can provide any count of keys so if you need another layer, just add it to the data (1.) and add the keyid (or [keyid, keydisplayvalue]) to the _addCount-calls appended to the array provided as first parameter
+ *  
+ * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
+ *                      the first key is the Category
+ *                      e.g.
+ *                      [ 
+ *                          category,
+ *                          year,
+ *                          [ 
+ *                             month(number),
+ *                             monthName(displayValue)
+ *                          ]
+ *                      ]
+ * This will lead to 2 layers: year -> month
+ *                      
+ * @param {float} pValue the value to display
+ */
+function _addCount(pKeys, pValue) 
+{
+    var key = "";
+    
+    // iterate through all keys (e.g. through each layer) and count for each of them seperately
+    for (let i = 0; i < pKeys.length; i++) 
+    {
+        let keyId;
+        let keyName;
+        
+        // if the key type is not "object" it is a string ("object" means Array of ["id", "displayValue"], "string" means only "id"
+        if (typeof pKeys[i] != "object")
+        {
+            // add key as id and display value
+            keyId = pKeys[i];
+            keyName = pKeys[i];
+        }
+        else 
+        {
+            // handle array: first is id seccond is name for X-value
+            keyId = pKeys[i][0];
+            keyName = pKeys[i][1];
+        }
+        var parent = key;
+        // if we are first or second: we are category or the top layer -> we have no parent
+        if (i < 2)
+        {
+            parent = ""
+        }
+        
+        // concatenate the previous (parent) key with the new one to get a new unique id
+        key += ";" + keyId;
+        // if we are not category
+        if (i > 0)
+        {
+            // add the data to the count-object
+            if (countData[key] == undefined)
+            {
+                // if the key was not added before create it with initial value 0.0
+                countData[key] = {parent: parent, count: 0.0, category: pKeys[0], x: keyName}; // keys[0] is the category
+            }
+            
+            // count
+            countData[key].count += parseFloat(pValue);
+        }
+    }
+}
+
+function getMonthMapping (pKey) 
+{
+    return translate.text({
+        "01": 'January',
+        "02": 'February',
+        "03": 'March',
+        "04": 'April',
+        "05": 'May',
+        "06": 'June',
+        "07": 'July',
+        "08": 'August',
+        "09": 'September',
+        "10": 'October',
+        "11": 'November',
+        "12": 'December'
+    }[pKey]);
+}
\ No newline at end of file
diff --git a/entity/InboxTicketChart_entity/InboxTicketChart_entity.aod b/entity/InboxTicketChart_entity/InboxTicketChart_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..50f1f5480398da2fd37d46e33659ddbdd762b12b
--- /dev/null
+++ b/entity/InboxTicketChart_entity/InboxTicketChart_entity.aod
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>InboxTicketChart_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>CATEGORY</name>
+    </entityField>
+    <entityField>
+      <name>PARENT</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>X</name>
+    </entityField>
+    <entityField>
+      <name>Y</name>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#0</outputFormat>
+    </entityField>
+    <entityParameter>
+      <name>InboxName_param</name>
+      <expose v="true" />
+      <title>Inbox Name</title>
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/InboxTicketChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/InboxTicketChart_entity/recordcontainers/jdito/contentProcess.js b/entity/InboxTicketChart_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1814c73b858db1ef095cc5aa07310ffebb85e6a
--- /dev/null
+++ b/entity/InboxTicketChart_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,208 @@
+import("system.SQLTYPES");
+import("Sql_lib");
+import("Ticket_lib");
+import("Turnover_lib");
+import("system.vars");
+import("system.result");
+import("Money_lib");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.translate");
+
+var inboxId = vars.get("$param.InboxName_param");
+var dateToday = vars.get("$sys.date");
+var thisMonth = datetime.toDate(dateToday, "MM");
+var lastMonth = thisMonth == 1? 12: (thisMonth-1);
+var thisYear = datetime.toDate(dateToday, "yyyy");
+var lastYear = thisYear -1;
+var sqlMask = new SqlMaskingUtils();
+
+const taskStatusContainer = $KeywordRegistry.taskStatus();
+var ticketType =$KeywordRegistry.ticketType$supportTicket();
+
+var availableTicketStatus = TicketUtils.begin(ticketType).getAvailableStatus();
+
+var status = availableTicketStatus.map(function(statusKey)
+{
+    return translate.text(KeywordUtils.getViewValue(taskStatusContainer, statusKey.trim()) );
+});
+
+var cond = newWhereIfSet("TICKET.INBOX_ID",inboxId);
+
+if(thisMonth == 1)
+{
+    cond.and(newWhere()
+          .and("TASK.START_DATE", thisMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .and("TASK.START_DATE", thisYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER))
+        .or(newWhere()
+          .and("TASK.START_DATE", lastMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .and("TASK.START_DATE", lastYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER));
+}
+else
+{
+    cond.and(newWhere()
+          .or("TASK.START_DATE", thisMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER)
+          .or("TASK.START_DATE", lastMonth, sqlMask.monthFromDate("#") + " = ?", SQLTYPES.INTEGER))
+        .and("TASK.START_DATE", thisYear, sqlMask.yearFromDate("#") + " = ?", SQLTYPES.INTEGER);
+}
+
+var data = new SqlBuilder()
+               .select(["TASK.STATUS",sqlMask.monthFromDate("TASK.START_DATE"), sqlMask.dayFromDate("TASK.START_DATE"), "1"])
+               .from("TICKET")
+               .join("TASK","TICKET.TASK_ID = TASK.TASKID")
+               .where(cond)
+               .orderBy("TASK.START_DATE asc")
+               .table();
+
+// this object is for better code with readable names to access the data-fields
+var columns = {
+    status: 0,
+    month: 1,
+    day: 2,
+    amount: 3
+};
+
+var chartData = [];
+var countData = {}
+
+var monthDate;
+
+
+var lastDayOfMonth;
+var dateForLastDay;
+
+for (let m = 0; m < 2; m++) 
+{    
+    let month = (m == 0? lastMonth.toString(): thisMonth.toString());
+    
+    dateForLastDay = thisYear + "-" + month + "-" + "01";
+    
+    if(month.length == 1)
+        month = "0" + month;
+         
+    lastDayofMonth = new Date(thisYear, month + 1, 0);
+    lastDayofMonth = lastDayofMonth.getDate(); 
+
+    for(let d = 1; d <= lastDayOfMonth; d++)
+    {
+        status.forEach(function(statusResolved)
+        {   
+            _addCount([statusResolved, [month, getMonthMapping(month)], "" + d], 0);
+        });
+    }
+}
+
+
+data.forEach(function(row) 
+{    
+    if(row[columns.month].length == 1)
+        row[columns.month] = "0" + row[columns.month];
+    
+    _addCount([KeywordUtils.getViewValue(taskStatusContainer, row[columns.status]), [row[columns.month], getMonthMapping("" + row[columns.month])], "" + row[columns.day]], row[columns.amount]);      
+});
+
+
+for (let key in countData) 
+{
+    var countDataSet = countData[key];
+    if(countDataSet.x != "unkategorisiert")
+    {
+        chartData.push([key, countDataSet.parent, countDataSet.category, countDataSet.x, countDataSet.count]);
+    }
+}
+result.object(chartData);
+
+/**
+ * _addCount
+ *  - It counts the final values for each layer. So if you put in: (simplified)
+ *  [year1, month5, 50.8]
+ *  it counts +50.8 for each layer:
+ *  year1; += 50.8
+ *  year1;month5; += 50.8
+ *  
+ *  This values are all stored in the "countData" object and the keys of it are later used as UID.
+ *  The Keys just consist of the concatenated id's mentioned in 1.
+ *  
+ *  You can provide any count of keys so if you need another layer, just add it to the data (1.) and add the keyid (or [keyid, keydisplayvalue]) to the _addCount-calls appended to the array provided as first parameter
+ *  
+ * @param {Array} pKeys an array containing all keys for this value. If the x-value for one key is different from the key-value: add an array [key, value] instead of only the key
+ *                      the first key is the Category
+ *                      e.g.
+ *                      [ 
+ *                          category,
+ *                          year,
+ *                          [ 
+ *                             month(number),
+ *                             monthName(displayValue)
+ *                          ]
+ *                      ]
+ * This will lead to 2 layers: year -> month
+ *                      
+ * @param {float} pValue the value to display
+ */
+function _addCount(pKeys, pValue) 
+{
+    var key = "";
+    
+    // iterate through all keys (e.g. through each layer) and count for each of them seperately
+    for (let i = 0; i < pKeys.length; i++) 
+    {
+        let keyId;
+        let keyName;
+        
+        // if the key type is not "object" it is a string ("object" means Array of ["id", "displayValue"], "string" means only "id"
+        if (typeof pKeys[i] != "object")
+        {
+            // add key as id and display value
+            keyId = pKeys[i];
+            keyName = pKeys[i];
+        }
+        else 
+        {
+            // handle array: first is id seccond is name for X-value
+            keyId = pKeys[i][0];
+            keyName = pKeys[i][1];
+        }
+        var parent = key;
+        // if we are first or second: we are category or the top layer -> we have no parent
+        if (i < 2)
+        {
+            parent = ""
+        }
+        
+        // concatenate the previous (parent) key with the new one to get a new unique id
+        key += ";" + keyId;
+        // if we are not category
+        if (i > 0)
+        {
+            // add the data to the count-object
+            if (countData[key] == undefined)
+            {
+                // if the key was not added before create it with initial value 0.0
+                countData[key] = {parent: parent, count: 0.0, category: pKeys[0], x: keyName}; // keys[0] is the category
+            }
+            
+            // count
+            countData[key].count += parseFloat(pValue);
+        }
+    }
+}
+
+function getMonthMapping (pKey) 
+{
+    return translate.text({
+        "01": 'January',
+        "02": 'February',
+        "03": 'March',
+        "04": 'April',
+        "05": 'May',
+        "06": 'June',
+        "07": 'July',
+        "08": 'August',
+        "09": 'September',
+        "10": 'October',
+        "11": 'November',
+        "12": 'December'
+    }[pKey]);
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/Inbox_entity.aod b/entity/Inbox_entity/Inbox_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b01802ed73f089654a9a96314f7e9fbf7e88d23f
--- /dev/null
+++ b/entity/Inbox_entity/Inbox_entity.aod
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>Inbox_entity</name>
+  <title>Inboxes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Inbox_entity/documentation.adoc</documentation>
+  <contentTitleProcess>%aditoprj%/entity/Inbox_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconId>VAADIN:ENVELOPES</iconId>
+  <imageProcess>%aditoprj%/entity/Inbox_entity/imageProcess.js</imageProcess>
+  <usePermissions v="false" />
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>INBOXID</name>
+    </entityField>
+    <entityField>
+      <name>INBOXNAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>EMAILADDRESS</name>
+      <title>E-Mail Adresse</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>INBOXDATE</name>
+      <title>Creation date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/inboxdate/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordsInboxStatus</consumer>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Inbox_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Indexes</name>
+    </entityProvider>
+    <entityConsumer>
+      <name>KeywordsInboxStatus</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/keywordsinboxstatus/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>EmployeeGroupsForInbox</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxEmployeegroupRelation_entity</entityName>
+        <fieldName>EmployessGroupsForInboxId</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>inboxId_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/employeegroupsforinbox/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Mails</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>MailSignature_entity</entityName>
+        <fieldName>Mails</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/mails/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>InboxFilterGroupsRelation</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxFilterGroupRelation_entity</entityName>
+        <fieldName>InboxFilterRelationGroups</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/inboxfiltergroupsrelation/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>REOPENDELAY</name>
+      <title>Ticket reopen delay</title>
+      <contentType>NUMBER</contentType>
+      <titleProcess>%aditoprj%/entity/Inbox_entity/entityfields/reopendelay/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Inbox_entity/entityfields/reopendelay/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CLOSURE_DAYS</name>
+      <title>Ticket Closure</title>
+      <titleProcess>%aditoprj%/entity/Inbox_entity/entityfields/closure_days/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Inbox_entity/entityfields/closure_days/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>SuportTicketsForInbox</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicket_entity</entityName>
+        <fieldName>TicketsProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/suportticketsforinbox/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>InboxTicketChartStatus</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxTicketChart_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxName_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/inboxticketchartstatus/children/inboxname_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>InboxTicketChartMails</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxTicketChartMail_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/inboxticketchartmails/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>InboxTicketChartMediums</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>InboxTicketChartMedium_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/inboxticketchartmediums/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ExcludedInboxes_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionField>
+      <name>openAdminView</name>
+      <title>Open admin view</title>
+      <onActionProcess>%aditoprj%/entity/Inbox_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CURLY_BRACKETS</iconId>
+      <stateProcess>%aditoprj%/entity/Inbox_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>ReopenDelayPreview</name>
+      <title>Reopen delay</title>
+      <titleProcess>%aditoprj%/entity/Inbox_entity/entityfields/reopendelaypreview/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Inbox_entity/entityfields/reopendelaypreview/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>Closure_daysPreview</name>
+      <title>Closure</title>
+      <titleProcess>%aditoprj%/entity/Inbox_entity/entityfields/closure_dayspreview/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/Inbox_entity/entityfields/closure_dayspreview/displayValueProcess.js</displayValueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/Inbox_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <onDBDelete>%aditoprj%/entity/Inbox_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>EMAILADDRESS.value</name>
+          <recordfield>INBOX.EMAIL_ADDRESS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXDATE.value</name>
+          <recordfield>INBOX.INBOXDATE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXNAME.value</name>
+          <recordfield>INBOX.NAME</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>INBOX.STATUS</recordfield>
+          <expression></expression>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Inbox_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXID.value</name>
+          <recordfield>INBOX.INBOXID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REOPENDELAY.value</name>
+          <recordfield>INBOX.REOPEN_DELAY</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CLOSURE_DAYS.value</name>
+          <recordfield>INBOX.CLOSURE_DAYS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>Closure_daysPreview.value</name>
+          <recordfield>INBOX.CLOSURE_DAYS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ReopenDelayPreview.value</name>
+          <recordfield>INBOX.REOPEN_DELAY</recordfield>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>731f2163-b9c7-4bb0-959d-ca013410eb35</name>
+          <tableName>INBOX</tableName>
+          <primaryKey>INBOXID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Inbox_entity/contentTitleProcess.js b/entity/Inbox_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fe2f397786be8c5816cf828234df3aaafc3f7aa6
--- /dev/null
+++ b/entity/Inbox_entity/contentTitleProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.INBOXNAME"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/documentation.adoc b/entity/Inbox_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6b81a5cb59d8755cbbaa088246ec203f3e7a3631
--- /dev/null
+++ b/entity/Inbox_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxTicketChartMail_entity
+
+Chart for Number of tickets per inbox (Mail).
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/closure_days/displayValueProcess.js b/entity/Inbox_entity/entityfields/closure_days/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b631c304931014bb7ab968e6c80f8518568963fc
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/closure_days/displayValueProcess.js
@@ -0,0 +1,16 @@
+import("system.neon");
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW )
+{
+    if(vars.get("$field.CLOSURE_DAYS"))
+    {
+        result.string(vars.get("$field.CLOSURE_DAYS") +" "+ translate.text("days"));
+    }
+    else
+    {
+        result.string("-");
+    }
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/closure_days/titleProcess.js b/entity/Inbox_entity/entityfields/closure_days/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f4313b4a759812bad949e4d25e5e0c585e0711
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/closure_days/titleProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.result");
+if( (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) || (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) )
+{
+    result.string(translate.text("Ticket closure (days)"));
+}
+else
+{
+     result.string(translate.text("Ticket closure"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/closure_dayspreview/displayValueProcess.js b/entity/Inbox_entity/entityfields/closure_dayspreview/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b631c304931014bb7ab968e6c80f8518568963fc
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/closure_dayspreview/displayValueProcess.js
@@ -0,0 +1,16 @@
+import("system.neon");
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW )
+{
+    if(vars.get("$field.CLOSURE_DAYS"))
+    {
+        result.string(vars.get("$field.CLOSURE_DAYS") +" "+ translate.text("days"));
+    }
+    else
+    {
+        result.string("-");
+    }
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/closure_dayspreview/titleProcess.js b/entity/Inbox_entity/entityfields/closure_dayspreview/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f4313b4a759812bad949e4d25e5e0c585e0711
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/closure_dayspreview/titleProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.result");
+if( (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) || (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) )
+{
+    result.string(translate.text("Ticket closure (days)"));
+}
+else
+{
+     result.string(translate.text("Ticket closure"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/employeegroupsforinbox/children/inboxid_param/valueProcess.js b/entity/Inbox_entity/entityfields/employeegroupsforinbox/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..beb834bb187a3e1a33d23c3e31867574b44fbd55
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/employeegroupsforinbox/children/inboxid_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.INBOXID"));
+
+
+
diff --git a/entity/Inbox_entity/entityfields/inboxdate/valueProcess.js b/entity/Inbox_entity/entityfields/inboxdate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..358adf46ccdbe302865ce8815f028bd57a4c22e2
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/inboxdate/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/inboxfiltergroupsrelation/children/inboxid_param/valueProcess.js b/entity/Inbox_entity/entityfields/inboxfiltergroupsrelation/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2235e630bbccf45b3375cd1cd029bdcc980450ff
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/inboxfiltergroupsrelation/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXID"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/inboxticketchartmails/children/inboxid_param/valueProcess.js b/entity/Inbox_entity/entityfields/inboxticketchartmails/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2235e630bbccf45b3375cd1cd029bdcc980450ff
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/inboxticketchartmails/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXID"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/inboxticketchartmediums/children/inboxid_param/valueProcess.js b/entity/Inbox_entity/entityfields/inboxticketchartmediums/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2235e630bbccf45b3375cd1cd029bdcc980450ff
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/inboxticketchartmediums/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXID"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/inboxticketchartstatus/children/inboxname_param/valueProcess.js b/entity/Inbox_entity/entityfields/inboxticketchartstatus/children/inboxname_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2235e630bbccf45b3375cd1cd029bdcc980450ff
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/inboxticketchartstatus/children/inboxname_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXID"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/keywordsinboxstatus/children/containername_param/valueProcess.js b/entity/Inbox_entity/entityfields/keywordsinboxstatus/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e5768e559f3649cf52920d86e3b93205d06a639
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/keywordsinboxstatus/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.inboxStatus());
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/mails/children/inboxid_param/valueProcess.js b/entity/Inbox_entity/entityfields/mails/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2235e630bbccf45b3375cd1cd029bdcc980450ff
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/mails/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXID"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/openadminview/onActionProcess.js b/entity/Inbox_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..61edb36ce16684bf214b48b346614b8a1ca5c0ac
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("Context_lib");
+
+AdminViewUtils.open("INBOX_ID", [
+    ["INBOXNAME", vars.get("$field.INBOXNAME")]
+]);
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/openadminview/stateProcess.js b/entity/Inbox_entity/entityfields/openadminview/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/reopendelay/displayValueProcess.js b/entity/Inbox_entity/entityfields/reopendelay/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a006bb0ee9965aca924f0658b4f6de63b5c1e65
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/reopendelay/displayValueProcess.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW )
+{
+    if(vars.get("$field.REOPENDELAY"))
+    {
+        result.string(vars.get("$field.REOPENDELAY") +" "+ translate.text("days"));
+    }
+    else
+    {
+        result.string("-");
+    }
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/reopendelay/titleProcess.js b/entity/Inbox_entity/entityfields/reopendelay/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d35a97a427bcd428147d951ae1917b64d33694e
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/reopendelay/titleProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.result");
+if( (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) || (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) )
+{
+    result.string(translate.text("Ticket reopen delay (days)"));
+}
+else
+{
+     result.string(translate.text("Ticket reopen delay"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/reopendelaypreview/displayValueProcess.js b/entity/Inbox_entity/entityfields/reopendelaypreview/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4304473e81d84abc12b21ced33183c08eb6667d9
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/reopendelaypreview/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW )
+    if(vars.get("$field.REOPENDELAY"))
+        result.string(vars.get("$field.REOPENDELAY") +" "+ translate.text("days"));
+    else
+        result.string("-");
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/reopendelaypreview/titleProcess.js b/entity/Inbox_entity/entityfields/reopendelaypreview/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8c6f19da96fbb3dceb1db77064961f4a8a660f19
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/reopendelaypreview/titleProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.neon");
+import("system.vars");
+import("system.result");
+if( (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) || (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) )
+{
+    result.string(translate.text("Reopen delay (days)"));
+}
+else
+{
+     result.string(translate.text("Reopen delay"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/status/displayValueProcess.js b/entity/Inbox_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0725ef8a7b1a7d90e225aaca03fce27f26d90504
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+var res = KeywordUtils.getViewValue($KeywordRegistry.inboxStatus(), vars.get("$field.STATUS"));
+result.string(res);
+    
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/status/valueProcess.js b/entity/Inbox_entity/entityfields/status/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f144ff85784d5a1ce4092083e655a29bcc8f3d57
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/status/valueProcess.js
@@ -0,0 +1,11 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string($KeywordRegistry.inboxStatus$active());
+}
+    
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/suportticketsforinbox/children/inboxid_param/valueProcess.js b/entity/Inbox_entity/entityfields/suportticketsforinbox/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2235e630bbccf45b3375cd1cd029bdcc980450ff
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/suportticketsforinbox/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INBOXID"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/imageProcess.js b/entity/Inbox_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0361aa03489595ceb0a5889aaa360f4f2cea9cff
--- /dev/null
+++ b/entity/Inbox_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.INBOXNAME"));
\ No newline at end of file
diff --git a/entity/Inbox_entity/recordcontainers/db/conditionProcess.js b/entity/Inbox_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a9e3d427d938e32300d01ef4375f5c9831e31197
--- /dev/null
+++ b/entity/Inbox_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,22 @@
+import("Util_lib");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+
+var cond = newWhere();
+
+var excludeInboxes = Utils.parseJSON(vars.get("$param.ExcludedInboxes_param")); 
+var str_inboxId = vars.get( "$param.InboxId_param");
+
+if (excludeInboxes && excludeInboxes.length > 0)
+{
+    cond.and("INBOX.INBOXID", excludeInboxes, SqlBuilder.NOT_IN());
+}
+
+if(str_inboxId)
+{
+    cond.and("INBOX.INBOXID",str_inboxId);
+}    
+    
+result.string(cond);
\ No newline at end of file
diff --git a/entity/Inbox_entity/recordcontainers/db/onDBDelete.js b/entity/Inbox_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..822cd6d44276a07416ff880be0be41a469ec0100
--- /dev/null
+++ b/entity/Inbox_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,10 @@
+import("Sql_lib");
+import("system.vars");
+import("system.db");
+
+let inboxID = vars.getString("$field.INBOXID");
+if(inboxID)
+{
+    newWhereIfSet("INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID", inboxID).deleteData();
+    newWhereIfSet("INBOXFIITERGROUP_RELATION.INBOX_ID",inboxID).deleteData();
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Inbox_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..44f00d6164888c0d74d27f00708f4af523ab4fa0
--- /dev/null
+++ b/entity/Inbox_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.inboxStatus(), "STATUS"); 
+
+result.string(sql);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 997ef899c33c00882f9bc3bd37239a3891e5028b..ea21137b33c47c8c3a2e0107005d768b24d72dec 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -4,7 +4,6 @@
   <title>Keyword Entry</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
-  <siblings />
   <grantDelete v="false" />
   <grantDeleteProcess>%aditoprj%/entity/KeywordEntry_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index 67a9351abb04151d93cc71ec10085ce55be35d74..1824d2d30009f94ab12dd75970863e9d6ff2826d 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -424,7 +424,6 @@
         <dbRecordFieldMapping>
           <name>RESPONSIBLE_CONTACT_ID.value</name>
           <recordfield>KNOWLEDGEMANAGEMENT.RESPONSIBLE_CONTACT_ID</recordfield>
-          <columnAlias></columnAlias>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 8d06b2a2c21234c506eb4576631b93a53453ee02..49d119b9c52388b5ca8a7442d55cc17a6c0fddfe 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -35,6 +35,11 @@
         <entityParameter>
           <name>ComingFrom_param</name>
           <valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>IncludeDocumentTemplateIds_param</name>
+          <valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -80,6 +85,14 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>TicketCategory_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ActionName_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
index 489ff072d50288d03c732806a74e476c8eb99807..3e13e00bc051c6f70f830b1c02ab242268887787 100644
--- a/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
@@ -1,4 +1,9 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.comingfrom"));
\ No newline at end of file
+var actionName = vars.get("$param.ActionName_param")
+
+if(actionName != "ServiceLetter")
+{
+    result.string(vars.get("$field.comingfrom"));
+}
\ No newline at end of file
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
index 0d05a506567dad0210c813c06a41f89e9a0d26c0..2db34ec5ae810d121fdab2280e91c78d72f5d1a2 100644
--- a/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
@@ -1,4 +1,10 @@
+import("system.vars");
 import("KeywordRegistry_basic");
 import("system.result");
 
-result.string($KeywordRegistry.documentTemplateType$letter());
\ No newline at end of file
+var actionName = vars.get("$param.ActionName_param")
+
+if (actionName != "ServiceLetter")
+{
+    result.string($KeywordRegistry.documentTemplateType$letter());
+}
\ No newline at end of file
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..87c558625abc2db1e8a706eecbeadc6335f2ccd2
--- /dev/null
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
@@ -0,0 +1,20 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("Sql_lib");
+
+var actionName = vars.get("$param.ActionName_param")
+var documenttemplates = "";
+
+if (actionName == "ServiceLetter")
+{
+   documenttemplates = newSelect("DOCUMENTTEMPLATEID")
+        .from("DOCUMENTTEMPLATE")
+        .leftJoin("DOCUMENTTEMPLATE_TICKETCATEGORY", "DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATEID")
+        .whereIfSet("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$letter())
+        .andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param")
+        .or("DOCUMENTTEMPLATE.CLASSIFICATION", 10)
+        .or("DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES", 1)
+        .arrayColumn();
+        result.string(JSON.stringify(documenttemplates));
+}
diff --git a/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod b/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
index afae0bf21456527fb0dc3bc68f8adb543dcd85fe..a88fd6d086c3f2550028f9d0b9f958514ae25086 100644
--- a/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
+++ b/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
@@ -4,7 +4,6 @@
   <title>Member</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MSTTeamMember_entity/documentation.adoc</documentation>
-  <siblings />
   <titlePlural>Members</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
diff --git a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
index cd48a813bf263d150a7f6eba7d19fed0ff9cc38f..0077c5f3d2239618dcbec244d0e2608496f181da 100644
--- a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
+++ b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
@@ -3,7 +3,7 @@
   <name>MSTeamsActivityImport_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MSTeamsActivityImport_entity/documentation.adoc</documentation>
-  <siblings />
+  
   <afterUiInit>%aditoprj%/entity/MSTeamsActivityImport_entity/afterUiInit.js</afterUiInit>
   <recordContainer>dataless</recordContainer>
   <entityFields>
diff --git a/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod b/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
index f61de16eed00b99c9a5b9b6aefa844bba212004d..a2b249f7a291fe59495abd03350fa9558792fbf9 100644
--- a/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
+++ b/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
@@ -4,7 +4,6 @@
   <title>Channel</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MSTeamsChannel_entity/documentation.adoc</documentation>
-  <siblings />
   <contentTitleProcess>%aditoprj%/entity/MSTeamsChannel_entity/contentTitleProcess.js</contentTitleProcess>
   <titlePlural>Channels</titlePlural>
   <recordContainer>jdito</recordContainer>
diff --git a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
index 07c7f724cd85d1961540f848750302b1b62a21ad..706c583c75e0b253bd7dd1a7344f3fe633ebf36b 100644
--- a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
+++ b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
@@ -3,7 +3,6 @@
   <name>MSTeamsDocument_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/MSTeamsDocument_entity/documentation.adoc</documentation>
-  <siblings />
   <recordContainer>dataless</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/MailSignatureDefaultSignature_entity/MailSignatureDefaultSignature_entity.aod b/entity/MailSignatureDefaultSignature_entity/MailSignatureDefaultSignature_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e63eb8c508124f8f9c1ae71cda81f0a172e504fc
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/MailSignatureDefaultSignature_entity.aod
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>MailSignatureDefaultSignature_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainer>dataless</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>NEWDEFAULTSIGNATURE_ID</name>
+      <title>Signature to set default</title>
+      <consumer>NewMailSignature</consumer>
+      <mandatory v="true" />
+      <state>EDITABLE</state>
+      <displayValueProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/newdefaultsignature_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>OLDDEFAULTSIGNATURE_ID</name>
+      <title>Existing default signature</title>
+      <consumer>DefaultMailSignature</consumer>
+      <mandatoryProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/mandatoryProcess.js</mandatoryProcess>
+      <state>EDITABLE</state>
+      <displayValueProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>NewMailSignature</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>MailSignature_entity</entityName>
+        <fieldName>Mails</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/inboxid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>DefaultSignature_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/defaultsignature_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>DefaultMailSignature</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>MailSignature_entity</entityName>
+        <fieldName>Mails</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+        </entityParameter>
+        <entityParameter>
+          <name>DefaultSignature_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/defaultmailsignature/children/defaultsignature_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>save</name>
+      <title>Save</title>
+      <onActionProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/save/onActionProcess.js</onActionProcess>
+      <iconId>NEON:SAVE</iconId>
+      <stateProcess>%aditoprj%/entity/MailSignatureDefaultSignature_entity/entityfields/save/stateProcess.js</stateProcess>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <datalessRecordContainer>
+      <name>dataless</name>
+      <alias>Data_alias</alias>
+    </datalessRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/defaultmailsignature/children/defaultsignature_param/valueProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/defaultmailsignature/children/defaultsignature_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0488a23572b30f97174720a23726a09b8b266381
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/defaultmailsignature/children/defaultsignature_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(1);
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/newdefaultsignature_id/displayValueProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/newdefaultsignature_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..732a08becf894db865c05df00894859bbab9919c
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/newdefaultsignature_id/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+var id = vars.get("$field.NEWDEFAULTSIGNATURE_ID");
+var email = newSelect("MAIL_ADDRESS")
+.from("MAILSIGNATURE")
+.where("MAILSIGNATURE.MAILSIGNATUREID", id)
+.cell();
+
+result.string(email);
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/defaultsignature_param/valueProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/defaultsignature_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9358b57687a079539606124e88b74f15c7e3ac72
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/defaultsignature_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(0);
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/inboxid_param/valueProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/inboxid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..016521997c840a2b8482a98588c71f5544d0427f
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/newmailsignature/children/inboxid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.InboxId_param"));
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/displayValueProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef474706792834812566692410c9e0fd8e27ff77
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+var id = vars.get("$field.OLDDEFAULTSIGNATURE_ID");
+var email = newSelect("MAIL_ADDRESS")
+.from("MAILSIGNATURE")
+.where("MAILSIGNATURE.MAILSIGNATUREID", id)
+.cell();
+
+result.string(email);
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/mandatoryProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b73829eb59b50593f7446be11979d80e4766d114
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/olddefaultsignature_id/mandatoryProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+
+if (vars.get("$global.default_mailsignature") == 1)
+{
+    result.string(true);
+}
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/save/onActionProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/save/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..382c10456c738742114270a284dc2da6e6c258f6
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/save/onActionProcess.js
@@ -0,0 +1,22 @@
+import("system.neon");
+import("Sql_lib");
+import("system.vars");
+
+var newDefaultSignature = vars.get("$field.NEWDEFAULTSIGNATURE_ID");
+var oldDefaultSignature = vars.get("$field.OLDDEFAULTSIGNATURE_ID");
+
+if (vars.get("$global.default_mailsignature") != 0)
+{
+    newWhere("MAILSIGNATURE.MAILSIGNATUREID", oldDefaultSignature)
+        .updateFields({
+            "DEFAULTSIGNATURE": 0
+        });
+}
+
+newWhere("MAILSIGNATURE.MAILSIGNATUREID", newDefaultSignature)
+    .updateFields({
+        "DEFAULTSIGNATURE": 1
+    });
+vars.set("$global.default_mailsignature", 1);
+
+neon.openContext("Inbox", "InboxMain_view", [vars.get("$param.InboxId_param")], neon.OPERATINGSTATE_VIEW, null);
\ No newline at end of file
diff --git a/entity/MailSignatureDefaultSignature_entity/entityfields/save/stateProcess.js b/entity/MailSignatureDefaultSignature_entity/entityfields/save/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9503b381a0560537c3c285c43a0dab805b70e33
--- /dev/null
+++ b/entity/MailSignatureDefaultSignature_entity/entityfields/save/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.validationerrors"))
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/MailSignature_entity.aod b/entity/MailSignature_entity/MailSignature_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2c04407a7049bcab69dfa7471f4c2e67140585dd
--- /dev/null
+++ b/entity/MailSignature_entity/MailSignature_entity.aod
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>MailSignature_entity</name>
+  <title>Mail</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/MailSignature_entity/documentation.adoc</documentation>
+  <contentTitleProcess>%aditoprj%/entity/MailSignature_entity/contentTitleProcess.js</contentTitleProcess>
+  <imageProcess>%aditoprj%/entity/MailSignature_entity/imageProcess.js</imageProcess>
+  <titlePlural>Mails</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>MAILSIGNATUREID</name>
+    </entityField>
+    <entityField>
+      <name>MAIL_ADDRESS</name>
+      <title>Mail Address</title>
+      <onValidation>%aditoprj%/entity/MailSignature_entity/entityfields/mail_address/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>SIGNATURE</name>
+      <title>Signature</title>
+      <consumer>DocumentTemplates</consumer>
+    </entityField>
+    <entityField>
+      <name>INBOX_ID</name>
+      <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/inbox_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Mails</name>
+      <children>
+        <entityParameter>
+          <name>InboxId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>DocumentTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordsCompanygroup</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/keywordscompanygroup/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_ID</name>
+      <title>Reply Template</title>
+      <consumer>ReplyDocumentTemplates</consumer>
+      <mandatoryProcess>%aditoprj%/entity/MailSignature_entity/entityfields/documenttemplate_id/mandatoryProcess.js</mandatoryProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ReplyDocumentTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>DateTypes_param</name>
+      <valueProcess></valueProcess>
+    </entityParameter>
+    <entityConsumer>
+      <name>keywordsTicketStatus</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedKeyIdsSubquery_param</name>
+          <valueProcess></valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>WhitelistIds_param</name>
+          <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>DEFAULT_TICKETTEMPLATE_ID</name>
+      <title>Default ticket template</title>
+      <consumer>TicketTemplates</consumer>
+      <mandatory v="true" />
+      <titleProcess>%aditoprj%/entity/MailSignature_entity/entityfields/default_tickettemplate_id/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/default_tickettemplate_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>TicketTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicketTemplate_entity</entityName>
+        <fieldName>SupportTicketTemplates</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>WORKFLOW</name>
+      <title>Workflow</title>
+      <consumer>Workflows</consumer>
+      <linkedContext>WorkflowDefinition</linkedContext>
+    </entityField>
+    <entityConsumer>
+      <name>Workflows</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>WorkflowDefinition_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>SEND_MAIL</name>
+      <title>Send Answer</title>
+      <contentType>BOOLEAN</contentType>
+    </entityField>
+    <entityField>
+      <name>ANSWER_MAIL_ADDRESS</name>
+      <title>Answer Address</title>
+      <onValidation>%aditoprj%/entity/MailSignature_entity/entityfields/answer_mail_address/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>DEFAULTSIGNATURE</name>
+      <title>Default Signature</title>
+      <contentType>BOOLEAN</contentType>
+      <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/defaultsignature/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>DefaultSignature_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionGroup>
+      <name>setDefaultSignature</name>
+      <children>
+        <entityActionField>
+          <name>setAsDefaultSignature</name>
+          <title>Set as default signature</title>
+          <onActionProcess>%aditoprj%/entity/MailSignature_entity/entityfields/setdefaultsignature/children/setasdefaultsignature/onActionProcess.js</onActionProcess>
+          <isMenuAction v="true" />
+          <isObjectAction v="false" />
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <conditionProcess>%aditoprj%/entity/MailSignature_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.value</name>
+          <recordfield>MAILSIGNATURE.INBOX_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAIL_ADDRESS.value</name>
+          <recordfield>MAILSIGNATURE.MAIL_ADDRESS</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAILSIGNATUREID.value</name>
+          <recordfield>MAILSIGNATURE.MAILSIGNATUREID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SIGNATURE.value</name>
+          <recordfield>MAILSIGNATURE.SIGNATURE_DOCUMENTTEMPLATE_ID</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID.value</name>
+          <recordfield>MAILSIGNATURE.DOCUMENTTEMPLATE_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEFAULT_TICKETTEMPLATE_ID.value</name>
+          <recordfield>MAILSIGNATURE.DEFAULT_TICKETTEMPLATE_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEFAULT_TICKETTEMPLATE_ID.displayValue</name>
+          <expression>%aditoprj%/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/default_tickettemplate_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>WORKFLOW.value</name>
+          <recordfield>MAILSIGNATURE.WORKFLOW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SEND_MAIL.value</name>
+          <recordfield>MAILSIGNATURE.SEND_MAIL</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ANSWER_MAIL_ADDRESS.value</name>
+          <recordfield>MAILSIGNATURE.ANSWER_MAIL_ADDRESS</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEFAULTSIGNATURE.value</name>
+          <recordfield>MAILSIGNATURE.DEFAULTSIGNATURE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID.displayValue</name>
+          <expression>%aditoprj%/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SIGNATURE.displayValue</name>
+          <expression>%aditoprj%/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/signature.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>c8ae92e4-8e8b-4e84-a772-f3ef4de37eb5</name>
+          <tableName>MAILSIGNATURE</tableName>
+          <primaryKey>MAILSIGNATUREID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/MailSignature_entity/contentTitleProcess.js b/entity/MailSignature_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c842ec8d78ed6b3bb2ad53be0c71e07cbb2b8190
--- /dev/null
+++ b/entity/MailSignature_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.MAIL_ADDRESS"));
diff --git a/entity/MailSignature_entity/documentation.adoc b/entity/MailSignature_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..8b288e01be66df937802aecfdd292abf662704d4
--- /dev/null
+++ b/entity/MailSignature_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= MailSignature_entity
+
+Store mail-address, answer-mail-address, workflows and signatures as well as default settings for answers mail and service ticket template.   
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/answer_mail_address/onValidation.js b/entity/MailSignature_entity/entityfields/answer_mail_address/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..2481f3c3f240c3401b58cf6cf05cc00965ce09fa
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/answer_mail_address/onValidation.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("Communication_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.vars");
+
+
+if (vars.get("$local.value") != "" && vars.get("$local.value") != null)
+{
+    var commMedium = "COMMEMAIL";
+
+    var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(commMedium, $KeywordRegistry.communicationMedium());
+    var commCategory = keywordAttributes.contentType || "TEXT";
+
+    var fn = CommValidationUtil.makeValidationFn(commCategory);
+    if (fn != null)
+    {
+        var commAddr = vars.get("$local.value");
+        var additional = CommValidationUtil.getExtensionsBlueprint();
+
+        var res = fn.call(null, commAddr, additional);
+        if (res != null)
+            result.string(res);
+    } 
+}
diff --git a/entity/MailSignature_entity/entityfields/default_tickettemplate_id/displayValueProcess.js b/entity/MailSignature_entity/entityfields/default_tickettemplate_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a984d59bc6bc751a8d0828f6a2f0c48112cce5ca
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/default_tickettemplate_id/displayValueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("TEMPLATENAME")
+.from("TICKETTEMPLATE")
+.where("TICKETTEMPLATE.TICKETTEMPLATEID", vars.get("$field.DEFAULT_TICKETTEMPLATE_ID")).cell());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/default_tickettemplate_id/titleProcess.js b/entity/MailSignature_entity/entityfields/default_tickettemplate_id/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f5f67ea535d6b38bf2f980c13fd8d805c455b30f
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/default_tickettemplate_id/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Dflt. ticket temp."))
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js b/entity/MailSignature_entity/entityfields/defaultsignature/valueProcess.js
similarity index 71%
rename from entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
rename to entity/MailSignature_entity/entityfields/defaultsignature/valueProcess.js
index 10c60ad094014a75c4a8baa7464624b65e4817f1..026e23dc6503c5534fccd53d05cd0539be8427e5 100644
--- a/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
+++ b/entity/MailSignature_entity/entityfields/defaultsignature/valueProcess.js
@@ -1,9 +1,8 @@
-import("system.util");
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-{
-    result.string(util.getNewUUID());
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(0);
 }
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/documenttemplate_id/mandatoryProcess.js b/entity/MailSignature_entity/entityfields/documenttemplate_id/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee60f7f363d2e146a543d64c88ef9210592f88f6
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/documenttemplate_id/mandatoryProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+
+
+if (vars.get("$field.SEND_MAIL") == true)
+{
+    result.string(true);
+}
+else
+{
+    result.string(false);
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js b/entity/MailSignature_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35346a25768d1ed2503641c351a738f7b26fbee7
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SIGNATURE");
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/inbox_id/valueProcess.js b/entity/MailSignature_entity/entityfields/inbox_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0530bb2e5cc21c5bd57f1b788d681a943488aab9
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/inbox_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+
+var inboxId = vars.get("$param.InboxId_param");
+
+if(inboxId)
+{
+    result.string(inboxId);
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/keywordscompanygroup/children/containername_param/valueProcess.js b/entity/MailSignature_entity/entityfields/keywordscompanygroup/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..26aaa5966f6e018da7435d8bbe9e6428e1286e99
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/keywordscompanygroup/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.firmenGruppe());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js b/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7e6399caf4cc0d3a6bfe852bba43576649ddeb
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js b/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9bb139ff28177b8db28f1e7ae2cb1f4b240e0023
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Ticket_lib");
+
+var ticketType =$KeywordRegistry.ticketType$supportTicket();
+result.object(TicketUtils.begin(ticketType).getAvailableStatus());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/mail_address/onValidation.js b/entity/MailSignature_entity/entityfields/mail_address/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..02cab60da6883adeb8db01a91e73c5517ad83657
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/mail_address/onValidation.js
@@ -0,0 +1,24 @@
+import("system.result");
+import("Communication_lib");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+
+var commMedium = "COMMEMAIL";
+
+var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(commMedium, $KeywordRegistry.communicationMedium());
+var commCategory = keywordAttributes.contentType || "TEXT";
+
+var fn = CommValidationUtil.makeValidationFn(commCategory);
+if (fn != null)
+{
+    var commAddr = vars.get("$local.value");
+    var additional = CommValidationUtil.getExtensionsBlueprint();
+
+    var res = fn.call(null, commAddr, additional);
+    if (res != null)
+    {
+        result.string(res);
+    }
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js b/entity/MailSignature_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa14066405c0670cdc046da6e01af226b317ec5e
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.documentTemplateType$replymail());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/setdefaultsignature/children/setasdefaultsignature/onActionProcess.js b/entity/MailSignature_entity/entityfields/setdefaultsignature/children/setasdefaultsignature/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c72a4e8cab110493c0c45c6008abecdae4276409
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/setdefaultsignature/children/setasdefaultsignature/onActionProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.neon");
+
+var params = {
+    "InboxId_param" : vars.get("$param.InboxId_param")
+}
+
+neon.openContext("MailSignatureDefaultSignature", "MailSignatureDefaultSignatureEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
\ No newline at end of file
diff --git a/entity/MailSignature_entity/imageProcess.js b/entity/MailSignature_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b05cf03e3f69fedf20eab4ed8f565dab48fcad2a
--- /dev/null
+++ b/entity/MailSignature_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.MAIL_ADDRESS"));
\ No newline at end of file
diff --git a/entity/MailSignature_entity/recordcontainers/db/conditionProcess.js b/entity/MailSignature_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ef8b14372db3bdac10253cb3f8c2456772b167c
--- /dev/null
+++ b/entity/MailSignature_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,21 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhere();
+
+cond.andIfSet("MAILSIGNATURE.INBOX_ID", "$param.InboxId_param");
+
+var defaultSignature = vars.get("$param.DefaultSignature_param");
+if (defaultSignature == 1)
+{
+    cond.andIfSet("MAILSIGNATURE.DEFAULTSIGNATURE", defaultSignature);
+}
+else if (defaultSignature == 0)
+{
+    cond.andIfSet("MAILSIGNATURE.DEFAULTSIGNATURE", [1], SqlBuilder.NOT_IN());
+}
+
+result.string(cond);
\ No newline at end of file
diff --git a/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/default_tickettemplate_id.displayvalue/expression.js b/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/default_tickettemplate_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3c5dc7f4988ce237b15caface548c0b0d280d3d
--- /dev/null
+++ b/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/default_tickettemplate_id.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("TEMPLATENAME")
+.from("TICKETTEMPLATE")
+.where("TICKETTEMPLATEID = DEFAULT_TICKETTEMPLATE_ID").toString());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id.displayvalue/expression.js b/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb731dd2cbfbe2c9b6c8dc5785b06d5a9d84f281
--- /dev/null
+++ b/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("Sql_lib");
+import("system.result");
+
+result.string(newSelect("NAME")
+.from("DOCUMENTTEMPLATE")
+.where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID = MAILSIGNATURE.DOCUMENTTEMPLATE_ID").toString());
\ No newline at end of file
diff --git a/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/signature.displayvalue/expression.js b/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/signature.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..f61ee5d6ff3d2d90fb64f1edc1a7e6f085282275
--- /dev/null
+++ b/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/signature.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("Sql_lib");
+import("system.result");
+
+result.string(newSelect("NAME")
+.from("DOCUMENTTEMPLATE")
+.where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID = MAILSIGNATURE.SIGNATURE_DOCUMENTTEMPLATE_ID").toString());
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js
index 8ff05e7ee4d836609b9f7d0255eca13a8a1ccefc..e6e750d04788d9ab345eb50e83c174f53b70f6fa 100644
--- a/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js
@@ -19,3 +19,4 @@ else if(vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
         result.string(ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")));
     }
 }
+
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 13bc11dbc172228530f71035a0205be735f637c1..572d9dfa8024c8d0ff5cb08ae87b03efd9a38253 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1168,6 +1168,12 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityActionField>
+      <name>newSupportTicket</name>
+      <title>New support ticket</title>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TICKET</iconId>
+    </entityActionField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..264784ddfb5c7463654d880f0963e5e7478852c8
--- /dev/null
+++ b/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Ticket_lib");
+
+TicketUtils.openNewSupportticket( vars.get( "$field.OFFERID"), null, vars.get( "$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/OrderLink_entity/OrderLink_entity.aod b/entity/OrderLink_entity/OrderLink_entity.aod
index e6d20e4080787e38bc7de7a01091ecd46c05341c..2e2a77a347322feb6497c089135bd6f3e1b150a4 100644
--- a/entity/OrderLink_entity/OrderLink_entity.aod
+++ b/entity/OrderLink_entity/OrderLink_entity.aod
@@ -100,42 +100,32 @@
       <recordFieldMappings>
         <dbRecordFieldMapping>
           <name>DATE_EDIT.value</name>
-          <recordfield>SALESORDERLINK.DATE_EDIT</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DATE_NEW.value</name>
-          <recordfield>SALESORDERLINK.DATE_NEW</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>OBJECT_ROWID.value</name>
-          <recordfield>SALESORDERLINK.OBJECT_ROWID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>OBJECT_TYPE.value</name>
-          <recordfield>SALESORDERLINK.OBJECT_TYPE</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SALESORDER_ID.value</name>
-          <recordfield>SALESORDERLINK.SALESORDER_ID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SALESORDERLINKID.value</name>
-          <recordfield>SALESORDERLINK.SALESORDERLINKID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_EDIT.value</name>
-          <recordfield>SALESORDERLINK.USER_EDIT</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_NEW.value</name>
-          <recordfield>SALESORDERLINK.USER_NEW</recordfield>
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
           <name>ee3c9a6f-53e4-4579-b2b8-994913cba502</name>
-          <tableName>SALESORDERLINK</tableName>
-          <primaryKey>SALESORDERLINKID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
diff --git a/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..17dc629c2371efc399be5f7d143f3533fae661e1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Ticket_lib");
+
+
+TicketUtils.openNewSupportticketWithLinks( [["Organisation", vars.get( "$field.CONTACTID")]]);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index e712aba6c63b5bb0e02c5852c3b58bbd82710e0e..d2b4539e177e0f0e1e3f1ab83203a3b1c24b6211 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -348,6 +348,14 @@
       <name>Contact</name>
       <documentation>%aditoprj%/entity/Person_entity/entityfields/contact/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>9f2c0a82-404e-4f0f-a1ed-ebe9b8a368c8</name>
+          <entityName>SupportTicket_entity</entityName>
+          <fieldName>ContactRequestors</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
       <children>
         <entityParameter>
           <name>OrgId_param</name>
@@ -1350,6 +1358,30 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityActionField>
+      <name>newSupportTicket</name>
+      <title>New Service ticket</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TICKET</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>Serviceticket</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicket_entity</entityName>
+        <fieldName>TicketsProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ReturnEmpty_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>TaskRequestorContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Person_entity/entityfields/newsupportticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ce97cf9edc967900a590b6fb95efbbd7efa9c08
--- /dev/null
+++ b/entity/Person_entity/entityfields/newsupportticket/onActionProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+
+var obj_links = {
+    TaskRequestorContactId_param: vars.get( "$field.CONTACTID"),
+    "PresetLinks_param":JSON.stringify([["Person",vars.get("$field.CONTACTID")]]) 
+};
+neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW, obj_links);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/onlyactive_param/valueProcess.js b/entity/Person_entity/entityfields/onlyactive_param/valueProcess.js
index c95b5dd1b4fc9b39fda3524b5ac7702157952322..b79bed7d644e36b82da688b0125065c3a1b66904 100644
--- a/entity/Person_entity/entityfields/onlyactive_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/onlyactive_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(false);
\ No newline at end of file
+result.string(true);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js b/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b691020ed6224d159383287eb2b841b9d5d225bd
--- /dev/null
+++ b/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+
+result.string( true);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js b/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b23f26109233dca26cc4e8ebcf0307ddefcd13f
--- /dev/null
+++ b/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string( vars.get( "$field.CONTACTID"))
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 945ccca62dcf278787dc9e7650e445926f89d74e..77bbb4b42f93a7b4fbaa4c1ce0a6c02eccbb32ec 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -206,6 +206,27 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>SUPPORTTICKET_ID</name>
+    </entityField>
+    <entityConsumer>
+      <name>QuickEntrySupportTickets</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicket_entity</entityName>
+        <fieldName>TicketsProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>TaskRequestorContactId_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ReturnEmpty_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/returnempty_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/returnempty_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/returnempty_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b691020ed6224d159383287eb2b841b9d5d225bd
--- /dev/null
+++ b/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/returnempty_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+
+result.string( true);
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/taskrequestorcontactid_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/taskrequestorcontactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16c85500b5355a72548030867e3d300661e9d4aa
--- /dev/null
+++ b/entity/QuickEntry_entity/entityfields/quickentrysupporttickets/children/taskrequestorcontactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 258c2c5bb899f248724f3f7cccc3932288b4568c..7ae3955e8783ae63382c06770088419984e244e2 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -4,6 +4,7 @@
   <title>Touchpoint</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectSource_entity/documentation.adoc</documentation>
+  
   <iconId>VAADIN:HANDSHAKE</iconId>
   <titlePlural>Touchpoints</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/ServiceEmailAllDocuments_entity/ServiceEmailAllDocuments_entity.aod b/entity/ServiceEmailAllDocuments_entity/ServiceEmailAllDocuments_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9d4bf87c642a958706edcc043593d02b442e3519
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/ServiceEmailAllDocuments_entity.aod
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>ServiceEmailAllDocuments_entity</name>
+  <title>Documents</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ServiceEmailAllDocuments_entity/documentation.adoc</documentation>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/ServiceEmailAllDocuments_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>TicketId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>TicketFieldDocuments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ServiceEmail_Documents_entity</entityName>
+        <fieldName>OriginallDocuments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>TicketId_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmailAllDocuments_entity/entityfields/ticketfielddocuments/children/ticketid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DOCUMENTFILE</name>
+      <consumer>TicketFieldDocuments</consumer>
+      <displayValueProcess>%aditoprj%/entity/ServiceEmailAllDocuments_entity/entityfields/documentfile/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityProvider>
+      <name>ticketMultiDocumentsProvider</name>
+      <children>
+        <entityParameter>
+          <name>TicketId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ServiceEmailAllDocuments_entity/documentation.adoc b/entity/ServiceEmailAllDocuments_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..1c9aaf819ce93b1b733bfc4a6b3452478be01283
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= ServiceEmailAllDocuments_entity
+
+Entity used to add any documents the ServiceEmail.
\ No newline at end of file
diff --git a/entity/ServiceEmailAllDocuments_entity/entityfields/documentfile/displayValueProcess.js b/entity/ServiceEmailAllDocuments_entity/entityfields/documentfile/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d1039bbe8559176b283e8c12d1f54b38b532ed5
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/entityfields/documentfile/displayValueProcess.js
@@ -0,0 +1,15 @@
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("system.result");
+
+let alias = SqlUtils.getBinariesAlias();
+let binaryDocumentID = vars.get("$this.value");
+if (binaryDocumentID)
+{
+    var myDocumentFilename = db.getBinaryMetadataForIds([binaryDocumentID], true, alias);
+
+    result.string(myDocumentFilename[0].filename);   
+}
+    
+
diff --git a/entity/ServiceEmailAllDocuments_entity/entityfields/ticketfielddocuments/children/ticketid_param/valueProcess.js b/entity/ServiceEmailAllDocuments_entity/entityfields/ticketfielddocuments/children/ticketid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..05fa1a8ec39f3236c1b13f5747ab70d5a6d503c0
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/entityfields/ticketfielddocuments/children/ticketid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+
+result.string(vars.get("$param.TicketId_param"));
\ No newline at end of file
diff --git a/entity/ServiceEmailAllDocuments_entity/entityfields/uid/valueProcess.js b/entity/ServiceEmailAllDocuments_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5130b28235423ef75eb6af51a5b6a3618c1d0ff7
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.util");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+      result.string("DocumentsAllEntity");
+}
+ 
\ No newline at end of file
diff --git a/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/contentProcess.js b/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..19c75397c843cd06e43c511a058ef306926998f1
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+
+ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ {
+     let myUUID = vars.get("$local.idvalues");
+      var mapDates = [myUUID];
+      result.object(mapDates); 
+ } 
\ No newline at end of file
diff --git a/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..45ed8d725a4070b06df480fe035950c76cb12216
--- /dev/null
+++ b/entity/ServiceEmailAllDocuments_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1 @@
+let varx;
\ No newline at end of file
diff --git a/entity/ServiceEmailFiles_entity/ServiceEmailFiles_entity.aod b/entity/ServiceEmailFiles_entity/ServiceEmailFiles_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7ba16f733080b7ead4faca1a9a84ef6d919f4cc3
--- /dev/null
+++ b/entity/ServiceEmailFiles_entity/ServiceEmailFiles_entity.aod
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>ServiceEmailFiles_entity</name>
+  <title>Attachment</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ServiceEmailFiles_entity/documentation.adoc</documentation>
+  <onValidation>%aditoprj%/entity/ServiceEmailFiles_entity/onValidation.js</onValidation>
+  <titlePlural>Attachments</titlePlural>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>Bindata</name>
+      <title>Attachment</title>
+      <contentType>FILE</contentType>
+      <onValueChange>&#xD;
+&#xD;
+</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/ServiceEmailFiles_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>Files</name>
+      <titlePlural>Attachments</titlePlural>
+      <recordContainer>jDito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>extraField</name>
+    </entityField>
+    <entityParameter>
+      <name>Extra_param</name>
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ServiceEmailFiles_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ServiceEmailFiles_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ServiceEmailFiles_entity/documentation.adoc b/entity/ServiceEmailFiles_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..229248aabc0cb0942be32826252ab17eda95b83f
--- /dev/null
+++ b/entity/ServiceEmailFiles_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= ServiceEmailFiles_entity
+
+Entity used to add file attachments the ServiceEmail.
\ No newline at end of file
diff --git a/entity/ServiceEmailFiles_entity/entityfields/uid/valueProcess.js b/entity/ServiceEmailFiles_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb395ff6095df345b4f43548c5f98de2e6a6f9b6
--- /dev/null
+++ b/entity/ServiceEmailFiles_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(tools.generateNewUserName());
+}
\ No newline at end of file
diff --git a/entity/ServiceEmailFiles_entity/onValidation.js b/entity/ServiceEmailFiles_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d3ab9978f442fcd7bff2a867eb7fd7a6bb7d91e
--- /dev/null
+++ b/entity/ServiceEmailFiles_entity/onValidation.js
@@ -0,0 +1 @@
+//IMPORTANT! Deleting this comment will lead to a memory leak! Cause is under investigation.
diff --git a/entity/ServiceEmailFiles_entity/recordcontainers/jdito/contentProcess.js b/entity/ServiceEmailFiles_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..55885b1a47e77f725f811e38ee34a7de5ed17a5d
--- /dev/null
+++ b/entity/ServiceEmailFiles_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ {
+     let myUUID = vars.get("$local.idvalues");
+      var mapDates = [myUUID];
+      result.object(mapDates); 
+ }
\ No newline at end of file
diff --git a/entity/ServiceEmailFiles_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmailFiles_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..50962413e8f920ea386325ab8e7b40ff23b2fceb
--- /dev/null
+++ b/entity/ServiceEmailFiles_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1 @@
+let varX;
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..dee200d3aa0421c6a25a144a94a3e346a40df7e5
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>ServiceEmailRecipients_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ServiceEmailRecipients_entity/documentation.adoc</documentation>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>Recipients</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityConsumer>
+      <name>ServiceMail</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>PersonsConsumer</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contacts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ServiceEmailRecipientsEmployeesConsumer</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ServiceEmailRecipientsPersonsConsumer</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>contact_id</name>
+      <title>Contact</title>
+      <consumer>PersonsConsumer</consumer>
+      <displayValueProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/contact_id/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>email_address</name>
+      <title>Email address</title>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess>
+      <textInputAllowed v="true" />
+      <valueProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>employee_contact_id</name>
+      <title>Employee</title>
+      <consumer>Employees</consumer>
+      <onValueChange>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/employee_contact_id/onValueChange.js</onValueChange>
+    </entityField>
+    <entityConsumer>
+      <name>Employees</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ServiceEmailRecipients_entity/documentation.adoc b/entity/ServiceEmailRecipients_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..649d11d69ce5842539f0688610788098135f48e7
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= ServiceEmailRecipients_entity
+
+Entity used to control recipients of the ServiceEmail (to, cc, bcc).
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/contact_id/displayValueProcess.js b/entity/ServiceEmailRecipients_entity/entityfields/contact_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d73102f53f37cb8418d52a41c0e3bb3d8252a3e
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/entityfields/contact_id/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+var title = ContactUtils.getTitleByContactId(vars.get("$field.contact_id"));
+result.string(title);
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/contact_id/onValueChange.js b/entity/ServiceEmailRecipients_entity/entityfields/contact_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6ddcc6493836aacc9c9cf44333f04ee32dae2e0
--- /dev/null
+++ b/entity/ServiceEmailRecipients_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/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a60a61e6419c210a0758f0f4dbb78a4ab9b55b3
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js
@@ -0,0 +1,21 @@
+import("Communication_lib");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = vars.get("$field.contact_id");
+
+if (contactId)
+{
+    var  emailAddresses = new SqlBuilder().selectDistinct(["COMMUNICATION.ADDR","COMMUNICATION.ADDR"])
+                         .from("COMMUNICATION")
+                         .where("COMMUNICATION.OBJECT_ROWID",contactId)
+                         .and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType())
+                         .and("COMMUNICATION.MEDIUM_ID",CommUtil.getMediumIdsByCategory("EMAIL"),SqlBuilder.IN())
+                         .table();
+    result.object(emailAddresses);
+}
+else
+{
+    result.object([])
+}
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..70bdc8be7d3596381114e66c64df05ac64e8c376
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.result");
+import("Communication_lib");
+
+var fn = CommValidationUtil.makeValidationFn("EMAIL");
+
+if (fn != null)
+{
+    var commAddr = vars.get("$local.value");
+    var res = fn.call(null, commAddr, null);
+    if (res != null)
+        result.string(res);
+}
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82c8780a5cf9e787dcceb94ce763b9612d0611a5
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Communication_lib");
+
+if (vars.get("$field.contact_id") && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(CommUtil.getStandardMail(vars.get("$field.contact_id")));
+}
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/employee_contact_id/onValueChange.js b/entity/ServiceEmailRecipients_entity/entityfields/employee_contact_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1d34954b99a5195e528d05c418dc9ec5b084e7e
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/entityfields/employee_contact_id/onValueChange.js
@@ -0,0 +1,11 @@
+import("system.tools");
+import("Employee_lib");
+import("Communication_lib");
+import("system.neon");
+import("system.vars");
+
+var contactId = vars.get("$local.value");
+if(contactId != "")
+{
+    neon.setFieldValue("$field.email_address",EmployeeUtils.getUserByContactId(contactId)[tools.PARAMS][tools.EMAIL]);
+}
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/uid/valueProcess.js b/entity/ServiceEmailRecipients_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb395ff6095df345b4f43548c5f98de2e6a6f9b6
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(tools.generateNewUserName());
+}
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/contentProcess.js b/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..005049e8d82b4abb168b56ae211d560d0398f532
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+
+ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ {
+     let myUUID = vars.get("$local.idvalues");
+      var mapDates = [myUUID];
+      result.object(mapDates); 
+ }
+      
\ No newline at end of file
diff --git a/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..50962413e8f920ea386325ab8e7b40ff23b2fceb
--- /dev/null
+++ b/entity/ServiceEmailRecipients_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1 @@
+let varX;
\ No newline at end of file
diff --git a/entity/ServiceEmail_Documents_entity/ServiceEmail_Documents_entity.aod b/entity/ServiceEmail_Documents_entity/ServiceEmail_Documents_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4be44c1501b3e26ab9888a9e608e632f77d6e3c1
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/ServiceEmail_Documents_entity.aod
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>ServiceEmail_Documents_entity</name>
+  <title>Documents</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ServiceEmail_Documents_entity/documentation.adoc</documentation>
+  <contentTitleProcess>%aditoprj%/entity/ServiceEmail_Documents_entity/contentTitleProcess.js</contentTitleProcess>
+  <titlePlural>Documents</titlePlural>
+  <recordContainer>jDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/ServiceEmail_Documents_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Filename</title>
+      <dropDownProcess>%aditoprj%/entity/ServiceEmail_Documents_entity/entityfields/name/dropDownProcess.js</dropDownProcess>
+      <state>AUTO</state>
+    </entityField>
+    <entityProvider>
+      <name>OriginallDocuments</name>
+      <titlePlural>Documents</titlePlural>
+      <recordContainer>jDito</recordContainer>
+      <children>
+        <entityParameter>
+          <name>TicketId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>TicketId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>preview</name>
+      <contentType>IMAGE</contentType>
+    </entityField>
+    <entityField>
+      <name>BINARY_FILENAME</name>
+    </entityField>
+    <entityField>
+      <name>BINARY_ID</name>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jDito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <isSortable v="true" />
+      <contentProcess>%aditoprj%/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <rowCountProcess></rowCountProcess>
+      <onInsert>%aditoprj%/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>BINARY_FILENAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>preview.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ServiceEmail_Documents_entity/contentTitleProcess.js b/entity/ServiceEmail_Documents_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f22d52a8799da97526a79c527293aa28aac8f749
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.BINARY_FILENAME"));
\ No newline at end of file
diff --git a/entity/ServiceEmail_Documents_entity/documentation.adoc b/entity/ServiceEmail_Documents_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..603923db4895b1c4c1d433594bd65c2f07c541cb
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= ServiceEmail_Documents_entity
+
+Entity used to add documents of an corresponding ticket to the ServiceEmail.
\ No newline at end of file
diff --git a/entity/ServiceEmail_Documents_entity/entityfields/name/dropDownProcess.js b/entity/ServiceEmail_Documents_entity/entityfields/name/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d955208bdc545425d13265311960fb97519db5c7
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/entityfields/name/dropDownProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+import("system.translate");
+import("system.result");
+
+
+let ticketID = vars.get("$param.TicketId_param");
+if (ticketID)
+{
+    let alias = SqlUtils.getBinariesAlias();
+    var ticketFileNames = db.getBinaryMetadataForIds([ticketID], true, alias);
+
+    result.object(ticketFileNames);   
+}
diff --git a/entity/ServiceEmail_Documents_entity/entityfields/uid/valueProcess.js b/entity/ServiceEmail_Documents_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb395ff6095df345b4f43548c5f98de2e6a6f9b6
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(tools.generateNewUserName());
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/contentProcess.js b/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..379a4d80a8ca2a9d9293cd39da12df5de28c55b7
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,27 @@
+import("system.util");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+
+ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ {
+     let myUUID = vars.get("$local.idvalues");
+     result.object([myUUID,"",""]);
+ } 
+ else 
+ {
+     
+    var mapDates = [];
+
+    let ticketID = vars.get("$param.TicketId_param");
+    if(ticketID)
+    {
+        let alias = SqlUtils.getBinariesAlias();
+        var ticketFileIds = db.getBinaryMetadata("TICKET", "DOCUMENT", ticketID, true, alias);
+        ticketFileIds.forEach(function(binaryMetaData){
+              mapDates.push([binaryMetaData.id,binaryMetaData.filename,binaryMetaData.preview])
+        });  
+    }
+    result.object(mapDates);
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..94327ff3c89d4c0e298502aec72a956f52aa810e
--- /dev/null
+++ b/entity/ServiceEmail_Documents_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,2 @@
+let varX;
+	 
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/ServiceEmail_entity.aod b/entity/ServiceEmail_entity/ServiceEmail_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f2e61038712b916db62480068ce5cc310b99ebac
--- /dev/null
+++ b/entity/ServiceEmail_entity/ServiceEmail_entity.aod
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>ServiceEmail_entity</name>
+  <title>Email</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/ServiceEmail_entity/documentation.adoc</documentation>
+  <icon>VAADIN:MAILBOX</icon>
+  <grantCreate v="true" />
+  <grantUpdate v="true" />
+  <grantDelete v="true" />
+  <contentTitleProcess>%aditoprj%/entity/ServiceEmail_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterUiInit>%aditoprj%/entity/ServiceEmail_entity/afterUiInit.js</afterUiInit>
+  <onValidation>%aditoprj%/entity/ServiceEmail_entity/onValidation.js</onValidation>
+  <recordContainer>JDito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>from</name>
+      <title>From</title>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/from/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>subject</name>
+      <title>Subject</title>
+      <mandatory v="true" />
+      <valueProcess></valueProcess>
+      <displayValueProcess></displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>EMAIL_BODY_CONTENT</name>
+      <title>Email content</title>
+      <contentType>HTML</contentType>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/email_body_content/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>BINDATA</name>
+      <title>Attachment</title>
+      <contentType>FILE</contentType>
+      <state>EDITABLE</state>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+      <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/uid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Recipients_CC</name>
+      <state>EDITABLE</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ServiceEmailRecipients_entity</entityName>
+        <fieldName>Recipients</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Recipients_TO</name>
+      <state>EDITABLE</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ServiceEmailRecipients_entity</entityName>
+        <fieldName>Recipients</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Recipients_BCC</name>
+      <state>EDITABLE</state>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ServiceEmailRecipients_entity</entityName>
+        <fieldName>Recipients</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>SignatureId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>SenderEmail_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>From_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>TicketSubject_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>CC_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>TicketId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>BCC_param</name>
+    </entityParameter>
+    <entityParameter>
+      <name>TicketCode_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ActionName_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>SendType_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ContactId_param</name>
+      <expose v="true" />
+      <description> TICKET_EDITOR_CONTACT_ID</description>
+    </entityParameter>
+    <entityField>
+      <name>DOCUMENT_TEMPLATE</name>
+      <title>Document templates</title>
+      <consumer>DocumentTemplates</consumer>
+      <state>EDITABLE</state>
+      <onValueChange>%aditoprj%/entity/ServiceEmail_entity/entityfields/document_template/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityConsumer>
+      <name>DocumentTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>IncludeDocumentTemplateIds_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js</valueProcess>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>TicketCategory_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>Inbox_ID_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>TICKET_STATUS_AFTER_SEND</name>
+      <title>New status</title>
+      <consumer>keywordsTicketStatus</consumer>
+      <state>EDITABLE</state>
+      <displayValueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/ticket_status_after_send/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>keywordsTicketStatus</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedKeyIdsSubquery_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>WhitelistIds_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>AttachamentsConsumer</name>
+      <refreshParent v="true" />
+      <dependency>
+        <name>dependency</name>
+        <entityName>ServiceEmailFiles_entity</entityName>
+        <fieldName>Files</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>TaskId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>TicketDocumentsCons</name>
+      <stateProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ServiceEmailAllDocuments_entity</entityName>
+        <fieldName>ticketMultiDocumentsProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>TicketId_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/children/ticketid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>OriginalDocuments</name>
+      <title>Documents</title>
+      <consumer>TicketDocumentsCons</consumer>
+      <state>EDITABLE</state>
+    </entityField>
+    <entityField>
+      <name>chooseTextToForward</name>
+      <title>Content to forward</title>
+      <dropDownProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/choosetexttoforward/dropDownProcess.js</dropDownProcess>
+      <onValueChange>%aditoprj%/entity/ServiceEmail_entity/entityfields/choosetexttoforward/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>signature</name>
+      <contentType>HTML</contentType>
+    </entityField>
+    <entityParameter>
+      <name>InitializeBody_param</name>
+    </entityParameter>
+    <entityField>
+      <name>emailHistoryRaw</name>
+      <contentType>HTML</contentType>
+    </entityField>
+    <entityField>
+      <name>choosenDocTemplateRow</name>
+    </entityField>
+    <entityParameter>
+      <name>SenderTitel_param</name>
+      <valueProcess></valueProcess>
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>ServiceEmailRecipientsEmployee</name>
+      <consumer>ServiceEmailRecipientsEmployeeConsumer</consumer>
+      <linkedContext>Employee</linkedContext>
+      <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/serviceemailrecipientsemployee/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ServiceEmailRecipientsEmployeeConsumer</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>DocumentTemplateType_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>Conclusion</name>
+      <title>Abgeschlossen</title>
+      <consumer>keywordsTicketConclusion</consumer>
+      <stateProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/conclusion/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/conclusion/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>keywordsTicketConclusion</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/ServiceEmail_entity/entityfields/keywordsticketconclusion/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>RequestorContactId_param</name>
+      <expose v="true" />
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>JDito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ServiceEmail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ServiceEmail_entity/afterUiInit.js b/entity/ServiceEmail_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..6684d982bdbfe52853f7125b3eba61304c560c01
--- /dev/null
+++ b/entity/ServiceEmail_entity/afterUiInit.js
@@ -0,0 +1,171 @@
+import("system.db");
+import("ServiceEmail_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+import("system.util");
+import("Employee_lib");
+import("system.text");
+import("system.vars");
+import("system.neon");
+import("system.translate");
+import("DocumentTemplate_lib");
+
+
+//VARIABLES ______________
+let ticketID = vars.get("$param.TicketId_param");
+
+var taskID ="";
+if(vars.get("$param.TaskId_param"))
+{
+    taskID = vars.get("$param.TaskId_param")
+} 
+else 
+{   
+    taskID = newSelect("TICKET.TASK_ID")
+             .from("TICKET")
+             .whereIfSet("TICKETID",ticketID)
+             .cell()
+}
+  
+var presetTo = {}
+
+if(vars.get("$param.RequestorContactId_param") &&  vars.get("$param.ActionName_param")  && (vars.get("$param.ActionName_param") != "forwardEmailAction" ))
+{
+    var requestorContactId = vars.get("$param.RequestorContactId_param");
+    presetTo["contact_id"] = requestorContactId;
+}
+
+if(vars.get("$param.SenderEmail_param") &&  vars.get("$param.ActionName_param")  && (vars.get("$param.ActionName_param") != "forwardEmailAction" ))
+{
+    var emailAddress = vars.get("$param.SenderEmail_param");
+    presetTo["email_address"] = emailAddress;
+}
+
+if (presetTo["email_address"] || presetTo["contact_id"])
+{
+    neon.addRecord("Recipients_TO",presetTo);
+}
+
+if(vars.get("$param.CC_param"))
+{
+    let myEmails = vars.get("$param.CC_param");
+    var myEmailsArray = myEmails.split(";");
+    myEmailsArray.forEach(function(email){
+        neon.addRecord("Recipients_CC", {
+            "email_address": email
+        });
+    });    
+}
+
+if(vars.get("$param.BCC_param"))
+{
+    myEmails = text.decodeMS(vars.get("$param.BCC_param"));
+   
+    myEmails.forEach(function(email){
+        neon.addRecord("Recipients_BCC", {
+            "email_address": email
+        });
+    });
+}
+
+// SUBJECT
+var title = "Re: ";
+
+if( vars.get("$param.ActionName_param")  && (vars.get("$param.ActionName_param") == "forwardEmailAction" )) 
+{
+   title = "Fw: ";
+} 
+
+if(vars.get("$param.TicketSubject_param"))
+{
+    title += vars.get("$param.TicketSubject_param"); 
+}
+
+if(vars.get("$param.TicketCode_param"))
+{
+    title += " [" + vars.get("$param.TicketCode_param") + "]"; 
+}
+
+
+ vars.set("$field.subject", title);
+
+
+// SIGNATURE
+if(vars.exists("$param.SignatureId_param") && vars.get("$param.SignatureId_param")) 
+{
+     vars.set("$field.signature", getSignatureContent(vars.get("$param.SignatureId_param")));
+}
+  
+// INITIAL BODY HISTORY
+ vars.set("$param.InitializeBody_param", "true");  // control to set body only one time on the beginning
+
+var initialEmailBodyRaw = "";
+
+// set body as last activity. if does not exist take the ticket description
+let mostRecentActivityBodyPart = getBodyHistoryFromActivity(null, ticketID, "mostRecent",
+                            vars.get("$param.From_param"),vars.get("$param.SenderEmail_param"));
+
+if(mostRecentActivityBodyPart)
+{
+    initialEmailBodyRaw = mostRecentActivityBodyPart;
+}
+else
+{
+    initialEmailBodyRaw =  getBodyHistory(
+                                vars.get("$param.From_param"), // from
+                                vars.get("$param.SenderEmail_param"), // sender
+                                vars.get("$param.TicketSubject_param"), //subject
+                                vars.get("$param.TicketCode_param"), //ticketCode
+                                vars.get("$param.TicketId_param"), //ticketID
+                                vars.get("$param.TaskId_param")); //taskID
+}
+
+// body without signature (in case will be used a documante teplate we have to recteare the email)                        
+vars.set("$field.emailHistoryRaw", initialEmailBodyRaw);   
+   
+
+//TAKE ORIGINAL ATACHAMENTS - for Fw email
+if( vars.get("$param.ActionName_param")  && (vars.get("$param.ActionName_param") == "forwardEmailAction" )) 
+{
+    let alias = SqlUtils.getBinariesAlias();
+    
+    // ADD ALSO ALL DOCUMENTS FROM CORESPONDENTING ACTIVITIES     
+    var activityRowIds = newSelect("ACTIVITYLINK.ACTIVITY_ID")
+                         .from("ACTIVITYLINK")
+                         .where("ACTIVITYLINK.OBJECT_ROWID",ticketID)
+                         .arrayColumn()
+    
+    activityRowIds.forEach(function(activityId)
+    {
+         var activityFileIds = db.getBinaryMetadata("ACTIVITY", "DOCUMENT", activityId, true, alias);
+         activityFileIds.forEach(function(fileID){
+            neon.addRecord("TicketDocumentsCons", {
+               "DOCUMENTFILE":fileID
+            });
+        });  
+    });  
+    
+    // ADD original ticket dockuments
+    var ticketFileIds = db.getBinaryMetadata("TICKET", "DOCUMENT", ticketID, true, alias);
+     ticketFileIds.forEach(function(fileID){
+          neon.addRecord("TicketDocumentsCons", {
+             "DOCUMENTFILE":fileID.id
+        });
+     });  
+}
+
+/// SET DEFAULS STATUS
+if( (vars.get("$param.ActionName_param")) )
+{
+    var actionName = vars.get("$param.ActionName_param");
+
+    if( (actionName == "replayEmailAction") || (actionName == "replayEmailToAllAction") )
+    {
+        vars.set("$field.TICKET_STATUS_AFTER_SEND",$KeywordRegistry.taskStatus$request());
+    }
+
+    if(actionName == "forwardEmailAction")
+    {
+        vars.set("$field.TICKET_STATUS_AFTER_SEND",$KeywordRegistry.taskStatus$internalreply()); 
+    }
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/contentTitleProcess.js b/entity/ServiceEmail_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67c10d8cca7a0a6208b3cadbabb8fb05e2446e2c
--- /dev/null
+++ b/entity/ServiceEmail_entity/contentTitleProcess.js
@@ -0,0 +1,16 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+var title = "";
+
+if(vars.get("$param.TicketCode_param") && vars.get("$param.TicketSubject_param") )
+{
+    title += "Ticket: " + vars.get("$param.TicketCode_param") + " | " + vars.get("$param.TicketSubject_param") ; 
+} 
+else 
+{
+    title = translate.text("Write email");
+}
+
+result.string(title);
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/documentation.adoc b/entity/ServiceEmail_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2cd8992a27864501d9002a8ff526a886ff6ba414
--- /dev/null
+++ b/entity/ServiceEmail_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= ServiceEMail_entity
+
+Entity used to send internal & external ServiceEmails via the actions "replyEmail" for external mails and "forwardTicket" for internal mails.
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/choosetexttoforward/dropDownProcess.js b/entity/ServiceEmail_entity/entityfields/choosetexttoforward/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a9c5695d6c7f31c214022d8086142bd6af73b23
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/choosetexttoforward/dropDownProcess.js
@@ -0,0 +1,31 @@
+import("Sql_lib");
+import("system.datetime");
+import("system.vars");
+import("system.translate");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var fwPosibilities = [ ["originalTicket", translate.text("Current ticket")] ];
+
+var allActivities =  new SqlBuilder()
+                     .select(["ACTIVITY.ACTIVITYID","ACTIVITY.SUBJECT","ACTIVITY.ENTRYDATE"])
+                     .from("ACTIVITY")
+                     .where("ACTIVITY.PARENT_CONTEXT",$KeywordRegistry.ticketType$supportTicket())
+                     .and("ACTIVITY.CATEGORY",$KeywordRegistry.activityCategory$mail())
+                     .and("ACTIVITY.PARENT_ID",vars.get("$param.TicketId_param"))
+                     .orderBy("ACTIVITY.DATE_NEW desc")
+                     .table();
+allActivities.forEach(function([pActivityId, pSubject, pEntrydate])
+{
+    var activityTitel = translate.text(pSubject) + " "  + 
+                        datetime.toDate(pEntrydate, "dd.MM.YYYY HH:mm" , "Europe/Berlin"); 
+
+    fwPosibilities.push([pActivityId,activityTitel]);
+});
+
+if(allActivities.length > 0)
+{
+   fwPosibilities.push(["allActivities", translate.text("Mail activities")]);
+}
+
+result.object(fwPosibilities);
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/choosetexttoforward/onValueChange.js b/entity/ServiceEmail_entity/entityfields/choosetexttoforward/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b8c69f934b6f6fe0130546612c5a4e0d47e2ee
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/choosetexttoforward/onValueChange.js
@@ -0,0 +1,45 @@
+import("ServiceEmail_lib");
+import("system.datetime");
+import("system.vars");
+import("system.db");
+import("system.translate");
+
+
+// DESCRIPTION
+var emailBodyHystoryText ="";
+let choosenValue = vars.get("$field.chooseTextToForward");
+
+if(choosenValue == "originalTicket")
+{
+   emailBodyHystoryText =  getBodyHistory(
+                        vars.get("$param.From_param"), // from
+                        vars.get("$param.SenderEmail_param"), // sender
+                        vars.get("$param.TicketSubject_param"), //subject
+                        vars.get("$param.TicketCode_param"), //ticketCode
+                        vars.get("$param.TicketId_param"), //ticketID
+                        vars.get("$param.TaskId_param")); //taskID
+   
+} 
+else if(choosenValue == "allActivities") 
+{                               
+    emailBodyHystoryText = getBodyHistoryForAllActivities(
+                                vars.get("$param.TicketId_param"), vars.get("$param.TaskId_param"),// ticketID, taskID, 
+                                "intern", // kind
+                                vars.get("$param.From_param"), vars.get("$param.SenderEmail_param"),  //from, sender,
+                                vars.get("$param.TicketSubject_param"), //subject
+                                vars.get("$param.TicketCode_param") //ticketCode    
+                            );
+} 
+else if(choosenValue != "")
+{  // one specific activityId
+    emailBodyHystoryText = getBodyHistoryFromActivity(choosenValue, null,"intern",
+                                    vars.get("$param.From_param"), vars.get("$param.SenderEmail_param"));
+}
+
+vars.set("$field.emailHistoryRaw", emailBodyHystoryText);
+
+// create complete Email and set the body
+vars.set("$field.EMAIL_BODY_CONTENT",  
+    createBodyEmail(vars.get("$field.choosenDocTemplateRow"), vars.get("$field.signature"), emailBodyHystoryText) );
+    
+ 
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/conclusion/displayValueProcess.js b/entity/ServiceEmail_entity/entityfields/conclusion/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..71e79f26bbb45537eec6292e4fb1085517fb7b46
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/conclusion/displayValueProcess.js
@@ -0,0 +1,14 @@
+import("Keyword_lib");
+import("system.vars");
+import("system.result");
+
+
+var subject = KeywordUtils.getViewValue("TICKETCONCLUSION", vars.get("$field.Conclusion"));
+if (!subject)
+{
+    result.string("-");
+}
+else
+{
+    result.string(subject);
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js b/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed6bf1f9fe8458ff48dc0e7c13a43888182e6b03
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/conclusion/stateProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+var str_ret = neon.COMPONENTSTATE_INVISIBLE;
+var str_status = vars.get( "$field.TICKET_STATUS_AFTER_SEND");
+
+if( [ $KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedAbandoned(), $KeywordRegistry.taskStatus$endedDone()].includes( str_status) != -1)
+{
+    str_ret = ( [neon.OPERATINGSTATE_EDIT, neon.OPERATINGSTATE_NEW].indexOf( vars.get( "$sys.recordstate")) != -1)? 
+        neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_READONLY;
+}
+result.string( str_ret);
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/conclusion/valueProcess.js b/entity/ServiceEmail_entity/entityfields/conclusion/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c269c3ccf07b3858ee341cd6be901bfd5c612301
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/conclusion/valueProcess.js
@@ -0,0 +1,14 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if ( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string ( vars.get( "$param.TicketConclusion_param"));
+}
+if (!vars.get("$this.value"))
+{
+    result.string($KeywordRegistry.ticketConclusion$success());
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/document_template/onValueChange.js b/entity/ServiceEmail_entity/entityfields/document_template/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c684cd661c65a0ae596c960bfa50a8b408d9f5e
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/document_template/onValueChange.js
@@ -0,0 +1,30 @@
+import("ServiceEmail_lib");
+import("system.translate");
+import("Employee_lib");
+import("Sql_lib");
+import("system.db");
+import("DocumentTemplate_lib");
+import("system.vars");
+import("system.util");
+import("DocumentTemplate_lib");
+
+var dokumentTemplateId = vars.get("$local.value");  
+
+var documentTemplateContent =  newSelect("TEMPLATECONTENT")
+                            .from("DOCUMENTTEMPLATE")
+                            .where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", dokumentTemplateId)
+                            .cell();
+    
+///REPLACE CONTENT WITH PLACEHOLDERS   
+let contactId = vars.get("$param.ContactId_param");
+if(contactId != undefined && contactId != null && contactId != "")
+{
+      var template = new DocumentTemplate(util.encodeBase64String(documentTemplateContent), DocumentTemplate.types.HTML, undefined, true)
+      documentTemplateContent = template.getReplacedContentByContactId(contactId, false, true);
+
+} 
+vars.set("$field.choosenDocTemplateRow", documentTemplateContent);
+
+vars.set("$field.EMAIL_BODY_CONTENT", 
+        createBodyEmail(documentTemplateContent, vars.get("$field.signature"), vars.get("$field.emailHistoryRaw")));   
+    
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff0a6c5305debd67631c04ad323b40fabcafbe24
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/documenttemplates/children/includedocumenttemplateids_param/valueProcess.js
@@ -0,0 +1,36 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("Sql_lib");
+
+var actionName = vars.get("$param.ActionName_param")
+var documenttemplates = "";
+
+if (actionName == "replayEmailAction")
+{
+   documenttemplates = newSelect("DOCUMENTTEMPLATEID")
+        .from("DOCUMENTTEMPLATE")
+        .leftJoin("DOCUMENTTEMPLATE_TICKETCATEGORY", "DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATEID")
+        .whereIfSet("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
+        .andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param")
+        .or("DOCUMENTTEMPLATE.CLASSIFICATION", 10)
+        .or("DOCUMENTTEMPLATE.CLASSIFICATION", 12)
+        .or("DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES", 1)
+        .arrayColumn();
+}
+
+if (actionName == "forwardEmailAction")
+{
+    documenttemplates = newSelect("DOCUMENTTEMPLATEID")
+        .from("DOCUMENTTEMPLATE")
+        .leftJoin("DOCUMENTTEMPLATE_TICKETCATEGORY", "DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATEID")
+        .whereIfSet("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
+        .andIfSet("DOCUMENTTEMPLATE_TICKETCATEGORY.CLASSIFICATION", "$param.TicketCategory_param")
+        .or("DOCUMENTTEMPLATE.CLASSIFICATION", 10)
+        .or("DOCUMENTTEMPLATE.CLASSIFICATION", 11)
+        .or("DOCUMENTTEMPLATE.ALL_TICKET_CATEGORIES", 1)
+        .arrayColumn();
+}
+
+
+result.string(JSON.stringify(documenttemplates));
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/email_body_content/valueProcess.js b/entity/ServiceEmail_entity/entityfields/email_body_content/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e0bc459e315b88e1da9b28e7d79f240b404f8ab
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/email_body_content/valueProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("ServiceEmail_lib");
+import("system.neon");
+import("system.vars");
+
+
+//BUG FIX FOR SETTING IN afterUiInit
+if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW )
+{  
+    if(vars.get("$param.InitializeBody_param"))
+    {
+        if(vars.get("$param.InitializeBody_param") == "true")
+        {
+           result.string(createBodyEmail(null, vars.get("$field.signature"), vars.get("$field.emailHistoryRaw"))); 
+            vars.set("$param.InitializeBody_param", "false");
+        }
+    }
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/from/valueProcess.js b/entity/ServiceEmail_entity/entityfields/from/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..85f7f31d961a61913f4fc8ac62adef2ab525aece
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/from/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+
+var emailFrom = vars.get("$param.From_param");
+if(emailFrom) 
+{
+    result.string(emailFrom);
+}
+
diff --git a/entity/ServiceEmail_entity/entityfields/keywordsticketconclusion/children/containername_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/keywordsticketconclusion/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..02f9175d670fb6478e47ce1f19a482e730f3b34e
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/keywordsticketconclusion/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+
+result.string( $KeywordRegistry.ticketConclusion());
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7e6399caf4cc0d3a6bfe852bba43576649ddeb
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f5116087517790fd336c6c9b251962582ca41451
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/excludedkeyidssubquery_param/valueProcess.js
@@ -0,0 +1,25 @@
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic")
+
+if(vars.get("$param.ActionName_param"))
+{
+    var actionName = vars.get("$param.ActionName_param");
+     
+    if(actionName != null)
+    {
+      
+        if( (actionName == "replayEmailAction") || (actionName == "replayEmailToAllAction") )
+        {           
+            result.string($KeywordRegistry.taskStatus$entry(),$KeywordRegistry.taskStatus$reopen(),$KeywordRegistry.taskStatus$inProgress(),$KeywordRegistry.taskStatus$internalreply());
+        }
+        if(actionName == 'forwardEmailAction')
+        {
+            result.string($KeywordRegistry.taskStatus$entry(),$KeywordRegistry.taskStatus$reopen(),$KeywordRegistry.taskStatus$request(),$KeywordRegistry.taskStatus$reply(),$KeywordRegistry.taskStatus$inProgress());
+        }
+    }
+}        
+
+
+
+
diff --git a/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40951ed8b392ab4303d98f6ce1695e4587159128
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/keywordsticketstatus/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("Ticket_lib");
+
+var ticketType = $KeywordRegistry.ticketType$supportTicket();
+result.object(TicketUtils.begin(ticketType).getAvailableStatus());
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js b/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1c1aeb894bea017b9e5478561706feb6daeb98f
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string( vars.get( "$param.ActionName_param"));
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/serviceemailrecipientsemployee/valueProcess.js b/entity/ServiceEmail_entity/entityfields/serviceemailrecipientsemployee/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1bd74ac2d445f5f806cae711d436c669376ab49
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/serviceemailrecipientsemployee/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(EmployeeUtils.getCurrentContactId());
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/ticket_status_after_send/displayValueProcess.js b/entity/ServiceEmail_entity/entityfields/ticket_status_after_send/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9bdf9c1a9c9fef25213515ea753806b659bfe738
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/ticket_status_after_send/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.TICKET_STATUS_AFTER_SEND")));
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/children/ticketid_param/valueProcess.js b/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/children/ticketid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..05fa1a8ec39f3236c1b13f5747ab70d5a6d503c0
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/children/ticketid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+
+result.string(vars.get("$param.TicketId_param"));
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/stateProcess.js b/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3313ba99bc8f0980f5a1f921621f4b26dd0e96ed
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/ticketdocumentscons/stateProcess.js
@@ -0,0 +1,56 @@
+import("Sql_lib");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if( vars.get("$param.ActionName_param")  && (vars.get("$param.ActionName_param") == "forwardEmailAction" )) 
+{
+        let alias = SqlUtils.getBinariesAlias();
+        let ticketID = vars.get("$param.TicketId_param");
+        var existAttDocs = false;
+        
+        var documentsCount=  new SqlBuilder(alias)
+                                        .selectCount()
+                                        .from("ASYS_BINARIES")
+                                        .where("ASYS_BINARIES.ROW_ID",ticketID)
+                                        .cell();
+        if(documentsCount > 0)  
+        {
+            existAttDocs = true;
+        } 
+        else 
+        {
+            // CHECK ALSO ALL DOCUMENTS FROM CORESPONDENTING ACTIVITIES     
+            var activityRowIds = new SqlBuilder()
+                                     .select("ACTIVITYLINK.ACTIVITY_ID")
+                                     .from("ACTIVITYLINK")
+                                     .where("ACTIVITYLINK.OBJECT_ROWID", ticketID)
+                                     .arrayColumn();
+
+            activityRowIds.forEach(function(activityId)
+            {
+                  documentsCount=  new SqlBuilder(alias)
+                                        .selectCount()
+                                        .from("ASYS_BINARIES")
+                                        .where("ASYS_BINARIES.ROW_ID",activityId)
+                                        .cell();
+                if(documentsCount > 0)
+                {
+                    existAttDocs = true;
+                    return;
+                }    
+            });  
+        }
+    if(existAttDocs) 
+    {
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    } 
+    else 
+    {
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+    }  
+}
+
+
+
+
diff --git a/entity/ServiceEmail_entity/entityfields/uid/valueProcess.js b/entity/ServiceEmail_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..89674894023f98dddc0c740355e6a75a616dce39
--- /dev/null
+++ b/entity/ServiceEmail_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.util")
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/onValidation.js b/entity/ServiceEmail_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..44b92991eac08e87aa241696ab5beae4f1ef470f
--- /dev/null
+++ b/entity/ServiceEmail_entity/onValidation.js
@@ -0,0 +1,100 @@
+import("Sql_lib");
+import("system.tools");
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var noRecipient = true;
+
+var recipientsTo = [];
+
+if(vars.exists("$field.Recipients_TO.insertedRows"))
+{
+    recipientsTo = vars.get("$field.Recipients_TO.insertedRows");
+    recipientsTo.forEach(function(obj)
+    {
+        if(obj.Recipient)
+        { 
+            noRecipient = false;   
+        }
+    });
+}
+ 
+if(noRecipient)
+{
+    if( vars.exists("$field.Recipients_ToLookup.insertedRows"))
+    {
+        recipientsTo = vars.get("$field.Recipients_ToLookup.insertedRows");
+        recipientsTo.forEach(function(obj)
+        {
+            if(obj.RecipientPerson)
+            {
+                noRecipient = false;   
+            }
+        });
+    }   
+}
+ 
+ //// CHECK SENDER
+
+// calculate Email User  
+var errorText = "";
+var isValid = false;
+
+if(vars.get("$param.Inbox_ID_param"))
+{
+    const inboxId = vars.get("$param.Inbox_ID_param");
+    var inboxEmail = newSelect("INBOX.EMAIL_ADDRESS")
+                     .from("INBOX")
+                     .where("INBOX.INBOXID", inboxId)
+                     .cell();
+    if(inboxEmail)
+    {
+        var senderUser = tools.getUserByAttribute(tools.EMAIL, [inboxEmail], tools.PROFILE_FULL);
+        if(senderUser)
+        {
+            var senderUserTitle = senderUser[tools.TITLE];
+  
+            if(senderUserTitle)
+            {
+                isValid = true;   
+            }                
+            else 
+            {
+                errorText = (translate.text("no TITLE for USER")+ ", " +translate.text("inboxEmail") + ": " + inboxEmail);
+            }            
+        } 
+        else 
+        {
+            errorText = ( translate.text("no USER for inboxEmail") + ": " +  inboxEmail);
+        }     
+    } 
+    else 
+    {  
+        errorText = translate.text("no inboxEmail for inbox") +": " + inboxId; 
+    }
+} 
+else 
+{  errorText = translate.text("no inbox") +"!"; 
+}
+
+if(isValid)
+{
+    vars.set("$param.SenderTitel_param", senderUserTitle);
+}   
+else
+{
+    result.string(errorText);
+}
+    
+
+
+    
+     
+
+       
+
+
+
+
diff --git a/entity/ServiceEmail_entity/recordcontainers/jdito/contentProcess.js b/entity/ServiceEmail_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e0540a4acf0ccba596546f1c8b10f5dab60fe57
--- /dev/null
+++ b/entity/ServiceEmail_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+
+
+ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ {
+     let myUUID = vars.get("$local.idvalues");
+      var mapDates = [myUUID];
+      result.object(mapDates); 
+ }
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cb651be1bb7534c4ff52488a1163eb808219d77
--- /dev/null
+++ b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,307 @@
+import("Employee_lib");
+import("system.db");
+import("Sql_lib");
+import("Document_lib");
+import("system.translate");
+import("system.util");
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("Context_lib");
+import("Email_lib");
+import("system.tools");
+import("KeywordRegistry_basic");
+import("ActivityTask_lib");
+
+
+var recArray    = [];
+var ccArray     = [];
+var bccArray    = [];
+var fromEmail   = vars.get("$field.from");
+var subject     = vars.get("$field.subject");
+
+var contentHtml = vars.get("$field.EMAIL_BODY_CONTENT");
+
+
+var contactId = vars.get("$param.ContactId_param");
+
+var ticketID = vars.get("$param.TicketId_param");
+var taskID = vars.get("$param.TaskId_param") || newSelect("TICKET.TASK_ID").from("TICKET").where("TICKET.TICKETID",ticketID);
+    
+//////////////////////////////////////////////////////    
+//// RECIPIENTS 
+
+//RECIPIENTS TO
+var recipientsTo = "";
+
+if( vars.exists("$field.Recipients_TO.insertedRows"))
+{
+    recipientsTo = vars.get("$field.Recipients_TO.insertedRows");
+    for(let i = 0; i <recipientsTo.length; i++)
+    {
+        if(recipientsTo[i].email_address)
+        {
+            recArray.push(recipientsTo[i].email_address);
+        }
+    }
+}
+
+
+   
+   
+//RECIPIENTS CC
+var recipientsCC = vars.get("$field.Recipients_CC.insertedRows");
+for(let i = 0; i <recipientsCC.length; i++)
+{
+    if(recipientsCC[i].email_address)
+    {
+        ccArray.push(recipientsCC[i].email_address);
+    }
+}
+
+
+//RECIPIENTS BCC
+var recipientsBCC = vars.get("$field.Recipients_BCC.insertedRows") ;
+for(let i = 0; i <recipientsBCC.length; i++)
+{ 
+    if(recipientsBCC[i].email_address)
+    {
+        bccArray.push(recipientsBCC[i].email_address);
+    }
+}
+
+
+
+/// recipients are in format: 
+//[ {//"EMAILADRESS": "dagmar.haeming@translogistik.eu","#UID": "3b967194-1844-4285-a7e6-99a1cb67a26e"},{} .... ]
+//OR for recipient 
+// [{"Recipient": "test_CC2@test",//"#UID": "5a8d9c16-0f1a-434c-a952-23a53627c628"}, {..} ]
+
+//// end RECIPIENTS 
+//////////////////////////////////////////////////////
+
+
+// Sending E-Mails  
+var eml             = new Email();
+eml.sender          = fromEmail;
+eml.subject         = subject;
+eml.body            = contentHtml;
+eml.toRecipients    = recArray;
+eml.ccRecipients    = ccArray;
+eml.bccRecipients   = bccArray;
+
+///////////////////////////////////////////////////////
+// ATACHAMENTS 
+var mySendedFiles = "";
+
+// ATACHAMENTS / choosen Documents to send(already in system) 
+if(vars.exists("$field.TicketDocumentsCons.insertedRows"))
+{
+    var documents = vars.get("$field.TicketDocumentsCons.insertedRows");
+    ///OLD documents = [{"#UID": "ec0020f8-680a-488e-981b-4c57a766f7d5","NAME": "IDe29c49-5270-445b-a2b0-545793ad1900"}, {..}  
+    ///documents =[   {"DOCUMENTFILE": "ID205e69-b74e-4d44-8138-bb3d35a9bdae","#UID": "860aa6b6-5d61-4c88-868a-46ff3bf75631"},{}
+
+    for(let i = 0; i <documents.length; i++)
+    {
+        let binaryDocumentID = documents[i].DOCUMENTFILE;
+        var contentBinary ="";     
+        var fileName =("file"+i);
+        
+        if(binaryDocumentID)
+        {
+            let alias = SqlUtils.getBinariesAlias();
+            var myDocumentInfos =  SqlUitils.getBinaryMetadata("TICKET", "DOCUMENT", binaryDocumentID, true, Alias);
+            fileName = myDocumentInfos.filename; 
+            
+            contentBinary =  db.getBinaryContent(myDocumentInfos.id, alias)
+            
+            fileSize = myDocumentInfos.size;
+            if(myDocumentInfos && contentBinary)
+            {
+                
+                eml.attachmentTemplates.push(
+                {
+                    content:  contentBinary,
+                    filename: fileName  
+                });
+                 
+                mySendedFiles += ('- "' + fileName + '" | Size: ' + fileSize +';<br/> ');
+            }
+        }
+    }
+}
+
+// ATACHAMENTS / Files 
+var bindata = vars.get("$field.AttachamentsConsumer.insertedRows");
+
+for(let i = 0; i < bindata.length; i++)
+{ 
+    var myData =  vars.get("$field.AttachamentsConsumer.insertedRows")[i].Bindata;
+    if(myData)
+    {
+        let fileName = DocumentUtil.getFilenameFromUpload(myData);
+        eml.attachmentTemplates.push(
+        {
+            content: DocumentUtil.getBindataFromUpload(myData), 
+            mimeType: DocumentUtil.getMimeTypeFromUpload(myData),
+            filename: fileName     
+        });
+        mySendedFiles +=('- "' + fileName + '";<br/> ');
+    }   
+}
+
+senderUserTitle = vars.get("$param.SenderTitel_param");  // calculated in onValidation
+var returnedMsgAfterSend = false;
+if(senderUserTitle)
+{
+    returnedMsgAfterSend = eml.send(senderUserTitle); // SENT THE EMAIL ! 
+}
+//@return  true, if the mail was sent sucessfully 
+//or ex(cached exception)
+
+var activityID, contentActivity;
+ 
+if(returnedMsgAfterSend == true)
+{
+    /// Type: intern or extern
+    let sendType = vars.get("$param.SendType_param");
+    var infoText = translate.text("Mailing to customer"); 
+    if(sendType != "external")
+    {
+        infoText = translate.text("Internal mailing");
+    }    
+
+    //insert Activity
+    activityID = util.getNewUUID();
+
+    contentActivity = ( 
+        "<p>"+ translate.text("Subject") + ': "' + subject.toString() +  '" '+ "<br/></p>" 
+        +"<p>"+ translate.text("To") + ': "' + recArray.toString() +  '" '+ "<br/></p>" 
+        +"<p>"+ translate.text("Content") + ': </p>"' +  contentHtml  +  '" '+ "<hr/>" 
+        + "<br/>"           
+        );
+    if(mySendedFiles != "")
+    {
+        contentActivity +=  ( translate.text("Files") + ': <br/>' + mySendedFiles );
+    }
+             
+    // insert for ACTIVITY
+    var DataPreset =
+    {
+        "directionKeywordId" : $KeywordRegistry.activityDirection$outgoing,
+        "subject"            : infoText,
+        "content"            : contentActivity,
+        "categoryKeywordId"  : $KeywordRegistry.activityCategory$mail() 
+    }
+    var ActivityLink =
+    {
+        "SupportTicket"  : ticketID
+    }
+    
+    ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+    
+    /// UPDATE TICKET FIELD:  CONCLUSION & DATE_EDIT_STATUS
+    if( ticketID)
+    {
+        var TicketfieldValues = {};
+        
+        var str_conclusion = vars.get( "$field.Conclusion") || "", 
+            str_ticketStatusAfterSend = vars.get( "$field.TICKET_STATUS_AFTER_SEND") || "";
+    
+        if( str_conclusion && [ $KeywordRegistry.taskStatus$ended(),$KeywordRegistry.taskStatus$endedAbandoned(),$KeywordRegistry.taskStatus$endedDone()].includes(str_ticketStatusAfterSend) != -1)
+        {
+            TicketfieldValues["CONCLUSION"] = str_conclusion;
+        }
+        TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
+        
+        
+        
+        
+        /// UPDATE TASK & TICKET FIELDS:  STATUS, EDITOR_CONTACT_ID
+        if( taskID && str_ticketStatusAfterSend)
+        {
+            str_ticketStatusAfterSend = vars.get( "$field.TICKET_STATUS_AFTER_SEND") || "";
+            TicketfieldValues["EDITOR_CONTACT_ID"] = EmployeeUtils.getCurrentContactId();
+            TaskfieldValues["STATUS"] = vars.get("$field.TICKET_STATUS_AFTER_SEND");
+        }
+        newWhere("TICKET.TICKETID", ticketID).updateFields(TicketfieldValues);
+        newWhere("TASK.TASKID", taskID).updateFields(TaskfieldValues);
+    }
+    
+
+    
+    //// SAVE ATACHAMENTS
+    var assignmentTable = "ACTIVITY";
+    var assignmentName = "DOCUMENT";
+    var assignmentRowId = activityID;
+    var description = translate.text("Activity") + ': "' + infoText + " | "  
+    + translate.text("Subject")  + ': "' + subject.toString() +  '" ';
+    let alias = "_____SYSTEMALIAS";
+    let keyword = 'MAINDOCUMENT';
+
+    for(let i = 0; i < bindata.length; i++)
+    { 
+        myData =  vars.get("$field.AttachamentsConsumer.insertedRows")[i].Bindata;
+        if(myData)
+        {
+            let filename = DocumentUtil.getFilenameFromUpload(myData);
+            let id = util.getNewUUID();
+            var content= DocumentUtil.getBindataFromUpload(myData);
+                
+            db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "", 
+                content, filename, description, keyword, alias, id);
+        }
+    }
+    
+} else {
+    
+    logging.log(JSON.stringify(["! email not sent ", eml], null, "\t"));
+     
+    /// IF THE EMAIL WAS NOT SENT
+    //// create activity with titel "Error email"
+    // but don't update the ticket
+    var returnMessage = "";
+    
+    if(returnedMsgAfterSend.toString().indexOf("[J-03-R-0191-S]") != -1)
+    {
+        returnMessage += translate.text("Error while sending mail as an unkown user.") + senderUserTitle;  
+    }
+    else if(returnedMsgAfterSend.toString().indexOf("[M-03-R-0132-S]") != -1)
+    {
+        returnMessage += translate.text("Error while assigning the recipient") + recArray.toString();  
+    }
+    else
+    {
+        returnMessage += translate.text("Not definet error") + ": " + logging.toLogString(eml.getMailError(), true);
+    }
+    
+    
+    //insert Activity
+    activityID = util.getNewUUID();
+    contentActivity = ( translate.text("<p>eml.send error!" )+ " <br/>"
+        + "Meldung: " + returnMessage.toString() + " <br/>"
+        + translate.text("Subject") + ': "' + subject.toString() +  '" '+ "<br/>" 
+        + translate.text("To") + ': "' + recArray.toString() +  '" '+ "<br/></p>" 
+        +  contentHtml 
+        + "<br/>" 
+        + translate.text("Files") + ': ' + (mySendedFiles ? ('<br/> '+ mySendedFiles) : translate.text("None"))
+        );
+    
+    // insert for ACTIVITY
+    var DataPreset =
+    {
+        "directionKeywordId"   : $KeywordRegistry.activityDirection$outgoing,
+        "responsibleContactId" : vars.get( "$param.ContactId_param"),
+        "subject"              : translate.text("EMAIL ERROR") + "!",
+        "content"              : contentActivity,
+        "categoryKeywordId"    : $KeywordRegistry.activityCategory$mail() 
+    }
+    var ActivityLink =
+    {
+        "SupportTicket"  : ticketID
+    }
+    
+    ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+     
+}
+
diff --git a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..378638beb1234789fd578d74acde6aca5e676e68
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>SupportTicketMultiSelect_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/SupportTicketMultiSelect_entity/documentation.adoc</documentation>
+  <onInit></onInit>
+  <recordContainer>datalessRecordContainer</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>STATUS</name>
+      <title>{$TICKET_STATUS}</title>
+      <consumer>KeywordTaskState</consumer>
+      <state>EDITABLE</state>
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+      <title>Category</title>
+      <consumer>KeywordTicketCategory</consumer>
+      <state>EDITABLE</state>
+    </entityField>
+    <entityField>
+      <name>PRIORITY</name>
+      <title>Priority</title>
+      <consumer>KeywordTaskPriority</consumer>
+      <state>EDITABLE</state>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordTaskState</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>WhitelistIds_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordTicketCategory</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordTaskPriority</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>TicketIds_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>InboxIds_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>TaskIds_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>EDITOR_CONTACT_ID</name>
+      <title>{$TICKET_EDITOR}</title>
+      <consumer>empl</consumer>
+      <state>EDITABLE</state>
+    </entityField>
+    <entityConsumer>
+      <name>empl</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityActionField>
+      <name>ChangeData</name>
+      <title>Save changes</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <datalessRecordContainer>
+      <name>datalessRecordContainer</name>
+      <alias>Data_alias</alias>
+    </datalessRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SupportTicketMultiSelect_entity/documentation.adoc b/entity/SupportTicketMultiSelect_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..345666b73148126e465161aeab9717260c312c86
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= SupportTicketMultiSelect_entity
+
+Entity used to change the Status, Category, Priority and Editor of a selection of tickets. 
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd746b7f0eb2f24b041346fc721ecd79fe12e2c2
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
@@ -0,0 +1,42 @@
+import("Util_lib");
+import("Sql_lib");
+import("system.neon");
+import("system.vars");
+
+var taskIDs= JSON.parse(vars.get("$param.TaskIds_param"));
+var TaskfieldValues = {};
+var TicketfieldValues = {};
+
+///  TASK
+if(vars.exists("$field.PRIORITY") && (vars.get("$field.PRIORITY") != "" ))
+{
+    TaskfieldValues["PRIORITY"] = vars.get("$field.PRIORITY");
+}
+
+if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
+{
+    TaskfieldValues["STATUS"] = vars.get("$field.STATUS");
+}
+
+/// UPDATE TASK
+TaskfieldValues["STATUS"] = vars.get("$field.TICKET_STATUS_AFTER_SEND"); 
+newWhere("TASK.TASKID",taskIDs,SqlBuilder.IN()).updateFields(TaskfieldValues);
+    
+///  TICKET
+var TicketfieldValues = {};
+
+if(vars.exists("$field.EDITOR_CONTACT_ID") && (vars.get("$field.EDITOR_CONTACT_ID") != "" ))
+{
+    TicketfieldValues["EDITOR_CONTACT_ID"] = vars.get("$field.EDITOR_CONTACT_ID");
+}
+if(vars.exists("$field.CATEGORY") && (vars.get("$field.CATEGORY") != "" ))
+{
+    TicketfieldValues["CATEGORY"] = vars.get("$field.CATEGORY");      
+} 
+
+/// UPDATE TICKET & TASK
+newWhere("TASK.TASKID",taskIDs,SqlBuilder.IN()).updateFields(TaskfieldValues);
+newWhere("TICKET.TASK_ID",taskIDs,SqlBuilder.IN()).updateFields(TicketfieldValues);
+
+
+neon.openContext("SupportTicket", "SupportTicketFilter_view", null, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e241431e6d5824a79bc1eb683559296952dcde12
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7e6399caf4cc0d3a6bfe852bba43576649ddeb
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a882a8f90bfa862a11aa86f04c2a7f5a43092edb
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Ticket_lib");
+import("KeywordRegistry_basic");
+
+var ticketType =$KeywordRegistry.ticketType$supportTicket();
+
+var availableTicketStatus = TicketUtils.begin(ticketType).getAvailableStatus();
+
+result.object(availableTicketStatus);
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..34e5c039c7540d6684719dcdf0783339816eb06a
--- /dev/null
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.ticketCategory());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9cd09ba7e60d26cc33572d8a8e1ca03e79701e59
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
+  <name>SupportTicketTemplate_entity</name>
+  <title>Service ticket template</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/SupportTicketTemplate_entity/documentation.adoc</documentation>
+  <icon>VAADIN:TWIN_COL_SELECT</icon>
+  <grantDelete v="true" />
+  <grantDeleteProcess>%aditoprj%/entity/SupportTicketTemplate_entity/grantDeleteProcess.js</grantDeleteProcess>
+  <contentTitleProcess>%aditoprj%/entity/SupportTicketTemplate_entity/contentTitleProcess.js</contentTitleProcess>
+  <imageProcess>%aditoprj%/entity/SupportTicketTemplate_entity/imageProcess.js</imageProcess>
+  <titlePlural>Service ticket templates</titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>TEMPLATE_ID</name>
+    </entityField>
+    <entityField>
+      <name>NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>INBOX_ID</name>
+      <title>Inbox</title>
+      <consumer>Inboxes</consumer>
+      <groupable v="false" />
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>CATEGORY</name>
+      <title>Category</title>
+      <consumer>KeywordTicketCategory</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>TITLE</name>
+      <title>Title</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+      <title>Description</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>REVIEW</name>
+      <title>Review</title>
+      <contentType>BOOLEAN</contentType>
+    </entityField>
+    <entityField>
+      <name>MATURINGTIME</name>
+      <title>Mature after days</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#0</outputFormat>
+      <inputFormat>#0</inputFormat>
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/maturingtime/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>STATUS</name>
+      <title>Status</title>
+      <consumer>KeywordTaskState</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>CONCLUSION</name>
+      <title>Conclusion</title>
+      <consumer>KeywordTicketConclusion</consumer>
+      <mandatoryProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusion/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusion/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusion/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>ACTIVE</name>
+      <title>Active</title>
+      <contentType>BOOLEAN</contentType>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/active/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>TEMPLATENO</name>
+      <title>Template No.</title>
+      <contentType>NUMBER</contentType>
+      <minValue v="1" />
+      <outputFormat>000</outputFormat>
+      <inputFormat>000</inputFormat>
+      <mandatory v="true" />
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/templateno/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PRIORITY</name>
+      <title>Priority</title>
+      <consumer>KeywordTaskPriority</consumer>
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/priority/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordTicketCategory</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordTaskState</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>WhitelistIds_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordTaskPriority</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Inboxes</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Inbox_entity</entityName>
+        <fieldName>Indexes</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>INBOXNAME</name>
+    </entityField>
+    <entityField>
+      <name>active_icon</name>
+      <title>Active</title>
+      <colorProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/active_icon/colorProcess.js</colorProcess>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/active_icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>SupportTicketTemplates</name>
+    </entityProvider>
+    <entityParameter>
+      <name>Active_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>KeywordTicketConclusion</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>STATUSMAILBRIDGE</name>
+      <title>Status (Mailbridge)</title>
+      <consumer>KeywordTaskStateMailbridge</consumer>
+      <mandatory v="true" />
+      <titleProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordTaskStateMailbridge</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>WhitelistIds_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/whitelistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>CONCLUSIONMAILBRIDGE</name>
+      <title>Conclusion (Mailbridge)</title>
+      <consumer>KeywordTicketConclusion</consumer>
+      <mandatoryProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/stateProcess.js</stateProcess>
+      <titleProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>INDIVIDUAL_ANSWER</name>
+      <title>Individual Answer</title>
+      <contentType>BOOLEAN</contentType>
+      <groupable v="true" />
+    </entityField>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_ID</name>
+      <title>Individual Reply Template</title>
+      <consumer>ReplyDocumentTemplates</consumer>
+      <mandatoryProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/mandatoryProcess.js</mandatoryProcess>
+      <titleProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js</titleProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>ReplyDocumentTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <fromClauseProcess>%aditoprj%/entity/SupportTicketTemplate_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/SupportTicketTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <alias>Data_alias</alias>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ACTIVE.value</name>
+          <recordfield>TICKETTEMPLATE.ACTIVE</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CATEGORY.value</name>
+          <recordfield>TICKETTEMPLATE.CATEGORY</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONCLUSION.value</name>
+          <recordfield>TICKETTEMPLATE.CONCLUSION</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+          <recordfield>TICKETTEMPLATE.DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.value</name>
+          <recordfield>TICKETTEMPLATE.INBOX_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MATURINGTIME.value</name>
+          <recordfield>TICKETTEMPLATE.MATURING_TIME</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>NAME.value</name>
+          <recordfield>TICKETTEMPLATE.TEMPLATENAME</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRIORITY.value</name>
+          <recordfield>TICKETTEMPLATE.PRIORITY</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REVIEW.value</name>
+          <recordfield>TICKETTEMPLATE.REVIEW</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.value</name>
+          <recordfield>TICKETTEMPLATE.STATUS</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TEMPLATE_ID.value</name>
+          <recordfield>TICKETTEMPLATE.TICKETTEMPLATEID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TEMPLATENO.value</name>
+          <recordfield>TICKETTEMPLATE.TEMPLATENO</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.value</name>
+          <recordfield>TICKETTEMPLATE.TITLE</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js</expression>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXNAME.value</name>
+          <recordfield>INBOX.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONCLUSION.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUSMAILBRIDGE.value</name>
+          <recordfield>TICKETTEMPLATE.STATUS_MAILBRIDGE</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONCLUSIONMAILBRIDGE.value</name>
+          <recordfield>TICKETTEMPLATE.CONCLUSION_MAILBRIDGE</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONCLUSIONMAILBRIDGE.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusionmailbridge.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INDIVIDUAL_ANSWER.value</name>
+          <recordfield>TICKETTEMPLATE.INDIVIDUAL_ANSWER</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID.value</name>
+          <recordfield>TICKETTEMPLATE.DOCUMENTTEMPLATE_ID</recordfield>
+          <isFilterable v="false" />
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+      <linkInformation>
+        <linkInformation>
+          <name>8aed6158-e681-4b9e-9eb7-0bb4e6cc0a61</name>
+          <tableName>TICKETTEMPLATE</tableName>
+          <primaryKey>TICKETTEMPLATEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>0d5647a9-39d7-406b-8e88-3f43c00ac2a5</name>
+          <tableName>INBOX</tableName>
+          <primaryKey>INBOXID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SupportTicketTemplate_entity/contentTitleProcess.js b/entity/SupportTicketTemplate_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb3011c0e9c59281ce250a7b9550ec2c9a4b2561
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+
+result.string( vars.get( "$field.NAME"));
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/documentation.adoc b/entity/SupportTicketTemplate_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..756fa81838a9ba02a66ef5aaff1b6b6b8cf4a004
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/documentation.adoc
@@ -0,0 +1,4 @@
+= SupportTicketTemplate_entity
+
+Entity allowing the creation of templates to preallocate fields during manual creation of tickets as well as enabling 
+automatic creation of tickets via the service mailbridge.
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/active/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/active/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3089da0f879adcc2e724f9c9d10c56e6f0f9e5c1
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/active/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if ( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(1);
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/active_icon/colorProcess.js b/entity/SupportTicketTemplate_entity/entityfields/active_icon/colorProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f6b4ca223fb99248e6dbf1c4dcae2aae67b7682
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/active_icon/colorProcess.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+var str_pmtType = vars.get( "$field.ACTIVE");
+var str_ret = "";
+switch( str_pmtType)
+{
+    case "0":
+        str_ret = neon.PRIORITY_HIGH_COLOR;
+        break;
+    case "1":
+        str_ret = neon.PRIORITY_LOW_COLOR;
+        break;
+}
+
+result.string( str_ret);
diff --git a/entity/SupportTicketTemplate_entity/entityfields/active_icon/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/active_icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..607621726ce043f5a512888e5938a2e06eb58e10
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/active_icon/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+var str_ret = "VAADIN:CIRCLE";
+
+
+result.string( str_ret);
diff --git a/entity/SupportTicketTemplate_entity/entityfields/category/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/category/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4434cda4bb876e9aaa3afd829fea66fd93f5dfd
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/category/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.ticketCategory(), vars.get("$field.CATEGORY")));
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusion/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusion/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4975faed1a6e64084dab480d43dcf05538a45fc4
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusion/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Keyword_lib");
+import("system.vars");
+import("system.result");
+
+
+var subject = KeywordUtils.getViewValue("TICKETCONCLUSION", vars.get("$field.CONCLUSION"));
+if (subject)
+{
+    result.string(subject || "-");
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusion/mandatoryProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusion/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4147675923951e3dd12d802aa5bd8044a5cd7cf4
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusion/mandatoryProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+if (vars.get ("$field.STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+    result.string("false");
+}
+else
+{
+    result.string("true");
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusion/stateProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusion/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f3a4ed6ab199663361ac96ff44f6cb14f71d01c
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusion/stateProcess.js
@@ -0,0 +1,23 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+
+
+var str_ret = neon.COMPONENTSTATE_INVISIBLE;
+var str_status = vars.get( "$field.STATUS");
+
+if( [ $KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedAbandoned(), $KeywordRegistry.taskStatus$endedDone()].includes( str_status)){
+    switch (vars.get( "$sys.recordstate")) 
+    {
+        case neon.OPERATINGSTATE_EDIT:
+            str_ret = neon.COMPONENTSTATE_EDITABLE;
+            break;
+        case neon.OPERATINGSTATE_NEW:
+            str_ret = neon.COMPONENTSTATE_EDITABLE;
+            break;
+        default:
+            str_ret = neon.COMPONENTSTATE_READONLY;
+    }
+}
+result.string( str_ret)
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1742e9dfad39fea1a3fa2726a085a7a33189d48b
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/displayValueProcess.js
@@ -0,0 +1,14 @@
+import("Keyword_lib");
+import("system.vars");
+import("system.result");
+
+
+var subject = KeywordUtils.getViewValue("TICKETCONCLUSION", vars.get("$field.CONCLUSIONMAILBRIDGE"));
+if (!subject)
+{
+    result.string("-");
+}
+else
+{
+    result.string(subject);
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/mandatoryProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c49aabdc96ebc9b93f20f22e38a2042634b18e2e
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/mandatoryProcess.js
@@ -0,0 +1,15 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if (vars.get ("$field.STATUSMAILBRIDGE") != $KeywordRegistry.taskStatus$ended())
+{
+    result.string("false");
+}
+else
+{
+    result.string("true");
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/stateProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc344f68275ea1fa284477395b9314f2f816c4db
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/stateProcess.js
@@ -0,0 +1,28 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var str_ret = neon.COMPONENTSTATE_INVISIBLE;
+var str_status = vars.get( "$field.STATUSMAILBRIDGE");
+
+if( [ $KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedAbandoned(), $KeywordRegistry.taskStatus$endedDone()].includes( str_status))
+{
+    switch (vars.get( "$sys.recordstate")) 
+    {
+        case neon.OPERATINGSTATE_EDIT:
+            str_ret = neon.COMPONENTSTATE_EDITABLE;
+            break;
+        case neon.OPERATINGSTATE_NEW:
+            str_ret = neon.COMPONENTSTATE_EDITABLE;
+            break;
+        default:
+            str_ret = neon.COMPONENTSTATE_READONLY;
+    }
+}
+else
+{
+    vars.set( "$field.CONCLUSIONMAILBRIDGE",null);
+}
+result.string( str_ret)
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/titleProcess.js b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..54e14cd45f3c6da755ca41eb5de5ac920bfc051e
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/conclusionmailbridge/titleProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Conclusion (MB)"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f5bed9490093a71bcd8def9c8b9a4c0547704e1
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+
+
+var sql = newSelect("DOCUMENTTEMPLATE.NAME")
+         .from("DOCUMENTTEMPLATE")
+         .where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID",vars.get("$field.DOCUMENTTEMPLATE_ID"))
+         .cell();
+result.string(sql.tostring);
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/mandatoryProcess.js b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..441f5ec1529955f29349c3b40a3576617a9c7f57
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/mandatoryProcess.js
@@ -0,0 +1,13 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+
+
+if(Utils.toBoolean(vars.get("$field.INDIVIDUAL_ANSWER")))
+{
+    result.string(true);
+}
+else
+{
+    result.string(false);
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7a8fcf1c133f4f10ab870a515581b9314cf29842
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/documenttemplate_id/titleProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Indv Rempl Temp"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6096b03af3b999b4abe5852e975d2adfefdebda
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskPriority());
+
+
+
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7e6399caf4cc0d3a6bfe852bba43576649ddeb
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1fc0225545fb482a717c941a3982079b79714ddb
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Ticket_lib");
+
+var ticketType=  $KeywordRegistry.ticketType$supportTicket();
+result.object(TicketUtils.begin(ticketType).getAvailableStatus());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/containername_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7e6399caf4cc0d3a6bfe852bba43576649ddeb
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/whitelistids_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1fc0225545fb482a717c941a3982079b79714ddb
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordtaskstatemailbridge/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("Ticket_lib");
+
+var ticketType=  $KeywordRegistry.ticketType$supportTicket();
+result.object(TicketUtils.begin(ticketType).getAvailableStatus());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..34e5c039c7540d6684719dcdf0783339816eb06a
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.ticketCategory());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ea634852b64e5c031fb8368e77cab679a1e260c
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string( $KeywordRegistry.ticketConclusion())
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/maturingtime/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/maturingtime/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4c0fd5c91bf48016822e090e56573ba7245ba4c
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/maturingtime/displayValueProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.result");
+
+
+
+
+var subject = vars.get("$field.MATURINGTIME");
+if (!subject)
+{
+    result.string("-");
+}
+else
+{
+    result.string(subject + " Tage");
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/priority/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/priority/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ddbebe26761e9b05589aa1e400bc640a227c8dfd
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/priority/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskPriority(), vars.get("$field.PRIORITY")));
diff --git a/entity/SupportTicketTemplate_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa14066405c0670cdc046da6e01af226b317ec5e
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/replydocumenttemplates/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.documentTemplateType$replymail());
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/status/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..17b675479c1b9b698ab41b6b7f97a0d929507c66
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUS")));
diff --git a/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/displayValueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..671b732de04a22c9251efa0f814dbb21695d4664
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUSMAILBRIDGE")));
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/titleProcess.js b/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..beb1c1517467410cfeb0525db0e2853a84902e6f
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/statusmailbridge/titleProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Status (MB)"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/templateno/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/templateno/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2ecc35230136b8b184a8610350048e5fb2f22ed
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/templateno/valueProcess.js
@@ -0,0 +1,13 @@
+import("Util_lib");
+import("system.neon");
+import("system.eMath");
+import("system.result");
+import("system.db");
+import("system.vars");
+
+var str_templateNo = vars.get( "$field.TEMPLATENO");
+
+if( !str_templateNo && [neon.OPERATINGSTATE_NEW, neon.OPERATINGSTATE_EDIT].includes( vars.get( "$sys.recordstate")))
+{
+    result.string(NumberSequencingUtils.getNextUniqueNumber("TEMPLATENO", "TICKETTEMPLATE"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/grantDeleteProcess.js b/entity/SupportTicketTemplate_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2472c4cd01f8b66c8757a4db0a23badac8885097
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/grantDeleteProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string( vars.get( "$field.ACTIVE") != 1)
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/imageProcess.js b/entity/SupportTicketTemplate_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab584eb0e02336391ad8a01294dd82664079e3f2
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.NAME"));
diff --git a/entity/SupportTicketTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicketTemplate_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f39cc29e2c6c03694cac15a95ba9f133665d514d
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Sql_lib");
+import("system.result");
+
+result.string( 
+    newWhereIfSet("TICKETTEMPLATE.ACTIVE", vars.get( "$param.Active_param"))
+);
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/recordcontainers/db/fromClauseProcess.js b/entity/SupportTicketTemplate_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7340bb85849dfdcd2a60799e261a6911feb138d
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+result.string("TICKETTEMPLATE"
+    +" left join INBOX on (INBOX.INBOXID = TICKETTEMPLATE.INBOX_ID)"
+);
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js b/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..65d7e2c07832b02c7c8448e23209c4d80856cc31
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("Keyword_lib");
+import("system.result");
+
+result.string( KeywordUtils.getResolvedTitleSqlPart("TICKETCONCLUSION", "CONCLUSION"))
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusionmailbridge.displayvalue/expression.js b/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusionmailbridge.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad3ea0266544a1bf1cf55e694fa3e7d8d795704d
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/conclusionmailbridge.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("Keyword_lib");
+import("system.result");
+
+result.string( KeywordUtils.getResolvedTitleSqlPart("TICKETCONCLUSION", "CONCLUSION_MAILBRIDGE"))
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js b/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f6111d7a8e2e464e0bd18e854a3660f2f31b97b
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("INBOX.NAME");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index af6e8030f6e0ff2a0b7184b873c17a7e29f8c676..85554d4445e95f9feeb56fcf024155eb89526906 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
   <name>SupportTicket_entity</name>
-  <title>Support Ticket</title>
+  <title>Service ticket</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SupportTicket_entity/documentation.adoc</documentation>
   <grantDeleteProcess>%aditoprj%/entity/SupportTicket_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -9,10 +9,11 @@
   <contentDescriptionProcess>%aditoprj%/entity/SupportTicket_entity/contentDescriptionProcess.js</contentDescriptionProcess>
   <afterUiInit>%aditoprj%/entity/SupportTicket_entity/afterUiInit.js</afterUiInit>
   <onValidation>%aditoprj%/entity/SupportTicket_entity/onValidation.js</onValidation>
-  <useFavorites v="true" />
+  <afterSave>%aditoprj%/entity/SupportTicket_entity/afterSave.js</afterSave>
+  <useFavorites v="false" />
   <iconId>VAADIN:CHAT</iconId>
   <imageProcess>%aditoprj%/entity/SupportTicket_entity/imageProcess.js</imageProcess>
-  <titlePlural>Support Tickets</titlePlural>
+  <titlePlural>Service tickets</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityActionGroup>
@@ -41,7 +42,7 @@
     </entityProvider>
     <entityField>
       <name>CODE</name>
-      <title>ticket number</title>
+      <title>Ticket no.</title>
       <contentType>NUMBER</contentType>
       <outputFormat>0000000</outputFormat>
       <inputFormat>0000000</inputFormat>
@@ -50,7 +51,8 @@
     </entityField>
     <entityField>
       <name>TASK_SUBJECT</name>
-      <title>subject</title>
+      <title>Title</title>
+      <consumer></consumer>
       <mandatory v="true" />
     </entityField>
     <entityField>
@@ -59,8 +61,11 @@
       <consumer>KeywordTaskState</consumer>
       <groupable v="true" />
       <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/stateProcess.js</stateProcess>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>TASK_PRIORITY</name>
@@ -75,36 +80,44 @@
       <name>TASK_REQUESTOR_CONTACT_ID</name>
       <title>{$TICKET_REQUESTOR}</title>
       <consumer>ContactRequestors</consumer>
+      <groupable v="true" />
       <linkedContext>Person</linkedContext>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/mandatoryProcess.js</mandatoryProcess>
       <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/displayValueProcess.js</displayValueProcess>
+      <onValueChange>%aditoprj%/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
-      <name>TASK_EDITOR_CONTACT_ID</name>
+      <name>TICKET_EDITOR_CONTACT_ID</name>
       <title>{$TICKET_EDITOR}</title>
       <consumer>ContactEditors</consumer>
+      <groupable v="true" />
       <linkedContext>Person</linkedContext>
-      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js</displayValueProcess>
+      <mandatory v="false" />
+      <mandatoryProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/mandatoryProcess.js</mandatoryProcess>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>TASK_START_DATE</name>
-      <title>Begin</title>
+      <title>Entry</title>
       <contentType>DATE</contentType>
       <resolution>MINUTE</resolution>
       <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
       <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
-      <groupable v="true" />
+      <groupable v="false" />
+      <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_start_date/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>TASK_MATURITY_DATE</name>
-      <title>Maturity</title>
+      <title>Task maturity date</title>
+      <colorProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js</colorProcess>
       <contentType>DATE</contentType>
-      <resolution>MINUTE</resolution>
-      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
-      <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
-      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js</valueProcess>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+      <groupable v="true" />
     </entityField>
     <entityField>
       <name>TASK_TYPE</name>
@@ -113,7 +126,7 @@
     </entityField>
     <entityField>
       <name>TASK_DESCRIPTION</name>
-      <title>description</title>
+      <title>Description</title>
       <contentType>LONG_TEXT</contentType>
     </entityField>
     <entityField>
@@ -161,10 +174,12 @@
         <entityParameter>
           <name>ObjectRowId_param</name>
           <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+          <mandatory v="false" />
         </entityParameter>
         <entityParameter>
           <name>ObjectType_param</name>
           <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+          <mandatory v="false" />
         </entityParameter>
         <entityParameter>
           <name>ShowEmpty_param</name>
@@ -309,6 +324,7 @@
         <entityParameter>
           <name>WhitelistIds_param</name>
           <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js</valueProcess>
+          <expose v="true" />
         </entityParameter>
       </children>
     </entityConsumer>
@@ -343,15 +359,18 @@
       <name>ContactRequestors</name>
       <dependency>
         <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contact</fieldName>
       </dependency>
     </entityConsumer>
     <entityActionField>
       <name>newActivity</name>
       <title>New activity</title>
       <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+      <isMenuAction v="true" />
+      <isObjectAction v="true" />
       <iconId>VAADIN:HOURGLASS_END</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/stateProcess.js</stateProcess>
       <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
     </entityActionField>
     <entityActionField>
@@ -394,12 +413,6 @@
       <name>ParentId_param</name>
       <expose v="true" />
     </entityParameter>
-    <entityActionField>
-      <name>newSupportticket</name>
-      <title>New Support ticket</title>
-      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CHAT</iconId>
-    </entityActionField>
     <entityParameter>
       <name>PresetLinks_param</name>
       <expose v="true" />
@@ -466,10 +479,12 @@
     </entityProvider>
     <entityField>
       <name>TASK_ICON_COLOR</name>
-      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>DATE_NEW</name>
+      <name>DATE_BEGIN</name>
+      <title>Begin</title>
+      <contentType>DATE</contentType>
+      <state>READONLY</state>
     </entityField>
     <entityField>
       <name>ACTIVE</name>
@@ -497,6 +512,437 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityParameter>
+      <name>InitialInboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>TicketsProvider</name>
+      <documentation>%aditoprj%/entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc</documentation>
+    </entityProvider>
+    <entityParameter>
+      <name>InboxId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>TicketId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>INBOXNAME</name>
+      <title>Inbox</title>
+      <mandatory v="false" />
+      <state>READONLY</state>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>INBOX_ID</name>
+      <title>Inbox</title>
+      <consumer>Inboxes</consumer>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/inbox_id/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/inbox_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ActionName_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>MAILSIGNATURE_ID</name>
+      <title>Mail address</title>
+    </entityField>
+    <entityField>
+      <name>TICKETCATEGORY</name>
+      <title>Category</title>
+      <consumer>KeywordTicketCategory</consumer>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/ticketcategory/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>MailSignatures</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>MailSignature_entity</entityName>
+        <fieldName>Mails</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>EMAILMAILSIGNATURE</name>
+      <state>READONLY</state>
+    </entityField>
+    <entityActionField>
+      <name>replyEmail</name>
+      <title>Reply</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js</onActionProcess>
+      <isObjectAction v="false" />
+      <iconId>VAADIN:AT</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/stateProcess.js</stateProcess>
+      <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/replyemail/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityField>
+      <name>SENDEREMAIL</name>
+      <title>Sender</title>
+      <groupable v="true" />
+    </entityField>
+    <entityActionField>
+      <name>forwardTicket</name>
+      <title>Forward</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/onActionProcess.js</onActionProcess>
+      <isObjectAction v="false" />
+      <iconId>NEON:EXPORT</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/stateProcess.js</stateProcess>
+      <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/forwardticket/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityField>
+      <name>CC_RECIPIENTS</name>
+    </entityField>
+    <entityField>
+      <name>ticket_title</name>
+      <title>Ticket</title>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/ticket_title/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionField>
+      <name>pullNextTicket</name>
+      <title>Pull tickets</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js</onActionProcess>
+      <isMenuAction v="true" />
+      <isObjectAction v="false" />
+      <iconId>VAADIN:ARCHIVE</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>BasedOnRoles_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>PULL_TICKET</name>
+      <title>Pull next ticket</title>
+    </entityField>
+    <entityField>
+      <name>MEDIUM</name>
+      <title>Medium</title>
+      <consumer>KeywordTicketMedium</consumer>
+      <groupable v="true" />
+      <mandatory v="true" />
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/medium/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/medium/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordTicketMedium</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedKeyIdsSubquery_param</name>
+          <title></title>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>DATE_EDIT_STATUS</name>
+      <title>Last status change</title>
+      <contentType>DATE</contentType>
+      <state>READONLY</state>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_edit_status/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_edit_status/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionGroup>
+      <name>FilterActionsGroup</name>
+      <children>
+        <entityActionField>
+          <name>changeMultiple</name>
+          <title>Change selected</title>
+          <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/filteractionsgroup/children/changemultiple/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <selectionType>MULTI</selectionType>
+          <iconId>VAADIN:PENCIL</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityConsumer>
+      <name>KeywordTicketCategory</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>counterActivities</name>
+      <title>Activities</title>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/counteractivities/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionField>
+      <name>newNote</name>
+      <title>New note</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newnote/onActionProcess.js</onActionProcess>
+      <isObjectAction v="false" />
+      <iconId>VAADIN:NOTEBOOK</iconId>
+      <tooltip></tooltip>
+      <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newnote/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>returnTicket</name>
+      <title>Return Ticket</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/onActionProcess.js</onActionProcess>
+      <isMenuAction v="true" />
+      <isObjectAction v="false" />
+      <iconId>VAADIN:INBOX</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js</stateProcess>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/titleProcess.js</titleProcess>
+      <tooltipProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/returnticket/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityParameter>
+      <name>TaskRequestorContactId_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>ALTERNATIVE_EMAILADDR</name>
+      <title>Alternative email</title>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/alternative_emailaddr/titleProcess.js</titleProcess>
+    </entityField>
+    <entityField>
+      <name>ALTERNATIVE_PHONEADDR</name>
+      <title>Alternative phone</title>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/alternative_phoneaddr/titleProcess.js</titleProcess>
+    </entityField>
+    <entityField>
+      <name>CommEmail</name>
+      <title>Email of contact</title>
+    </entityField>
+    <entityField>
+      <name>CommPhone</name>
+      <title>Phone of contact</title>
+    </entityField>
+    <entityConsumer>
+      <name>Inboxes</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Inbox_entity</entityName>
+        <fieldName>Indexes</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedInboxes_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>LinkedObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>TicketTasks</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/tickettasks/children/objectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/tickettasks/children/rowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ReturnEmpty_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>EMAIL_SUBJECT</name>
+      <title>Email subject</title>
+    </entityField>
+    <entityField>
+      <name>CONCLUSION</name>
+      <title>Conclusion</title>
+      <consumer>KeywordTicketConclusion</consumer>
+      <groupable v="true" />
+      <mandatoryProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/conclusion/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/conclusion/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/conclusion/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/conclusion/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>SupportTicket_template</name>
+      <title>Service ticket template</title>
+      <consumer>SupportTicketTemplates</consumer>
+      <onValueChange>%aditoprj%/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js</onValueChange>
+    </entityField>
+    <entityConsumer>
+      <name>SupportTicketTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicketTemplate_entity</entityName>
+        <fieldName>SupportTicketTemplates</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Active_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/supporttickettemplates/children/active_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordTicketConclusion</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>openAdminView</name>
+      <title>Open admin view</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CURLY_BRACKETS</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>duplicateTicket</name>
+      <title>Duplicate Ticket</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/duplicateticket/onActionProcess.js</onActionProcess>
+      <selectionType>UNBOUND</selectionType>
+      <iconId>VAADIN:COPY</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>TicketCategory_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>EMAIL_DESCRIPTION</name>
+      <contentType>HTML</contentType>
+    </entityField>
+    <entityParameter>
+      <name>TicketConclusion_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionField>
+      <name>reopenTicket</name>
+      <title>Re-open</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TIME_BACKWARD</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/reopenticket/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>resubmitTicket</name>
+      <title>Follow-Up</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/resubmitticket/onActionProcess.js</onActionProcess>
+      <selectionType>UNBOUND</selectionType>
+      <isSaveAction v="false" />
+      <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/resubmitticket/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityField>
+      <name>IS_OVERDUE_SYMBOL</name>
+      <title></title>
+      <color>priority-high-color</color>
+      <contentType>IMAGE</contentType>
+      <groupable v="false" />
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js</valueProcess>
+    </entityField>
+    <entityActionField>
+      <name>newTicket</name>
+      <title>Enter new Ticket</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newticket/onActionProcess.js</onActionProcess>
+      <isMenuAction v="true" />
+      <isObjectAction v="false" />
+      <iconId>VAADIN:CHAT</iconId>
+    </entityActionField>
+    <entityField>
+      <name>NEW_TICKET</name>
+      <title>Enter new Ticket</title>
+      <color>priority-medium-color</color>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/new_ticket/titleProcess.js</titleProcess>
+    </entityField>
+    <entityField>
+      <name>NEW_TICKETCONTACT</name>
+      <title>Enter new Ticket &amp; Contact</title>
+      <color>priority-low-color</color>
+      <titleProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/new_ticketcontact/titleProcess.js</titleProcess>
+    </entityField>
+    <entityActionField>
+      <name>newTicketContact</name>
+      <title>Enter new Ticket &amp; Contact</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js</onActionProcess>
+      <isObjectAction v="false" />
+      <iconId>VAADIN:CHAT</iconId>
+    </entityActionField>
+    <entityField>
+      <name>isoverdue</name>
+      <contentType>TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>DATE_END</name>
+      <title>End</title>
+      <contentType>DATE</contentType>
+      <state>READONLY</state>
+    </entityField>
+    <entityField>
+      <name>counterTicketTime</name>
+      <title>processing time</title>
+      <contentType>TEXT</contentType>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/countertickettime/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>TicketNo_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionField>
+      <name>newLetter</name>
+      <title>New letter</title>
+      <onActionProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newletter/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:ENVELOPE</iconId>
+      <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/newletter/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityField>
+      <name>EMAILMAILSIGNATURE_ANSWER</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -523,10 +969,9 @@
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>TASK_EDITOR_CONTACT_ID.value</name>
-          <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
+          <name>TICKET_EDITOR_CONTACT_ID.value</name>
+          <recordfield>TICKET.EDITOR_CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_MATURITY_DATE.value</name>
@@ -564,8 +1009,8 @@
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>TASK_EDITOR_CONTACT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js</expression>
+          <name>TICKET_EDITOR_CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/ticket_editor_contact_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TASK_REQUESTOR_CONTACT_ID.displayValue</name>
@@ -574,7 +1019,7 @@
         <dbRecordFieldMapping>
           <name>TASK_PROGRESS.value</name>
           <recordfield>TASK.PROGRESS</recordfield>
-          <isFilterable v="true" />
+          <isFilterable v="false" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
@@ -621,24 +1066,127 @@
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
         <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>TASK.START_DATE</recordfield>
+          <name>DATE_BEGIN.value</name>
+          <recordfield>TICKET.DATE_BEGIN</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ACTIVE.value</name>
           <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/active.value/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOXNAME.value</name>
+          <recordfield>INBOX.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAILSIGNATURE_ID.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/mailsignature_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAILSIGNATURE_ID.value</name>
+          <recordfield>MAILSIGNATURE.MAILSIGNATUREID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TICKETCATEGORY.value</name>
+          <recordfield>TICKET.CATEGORY</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMAILMAILSIGNATURE.value</name>
+          <recordfield>MAILSIGNATURE.MAIL_ADDRESS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SENDEREMAIL.value</name>
+          <recordfield>TICKET.SENDER_EMAIL</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CC_RECIPIENTS.value</name>
+          <recordfield>TICKET.CC_RECIPIENTS</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INBOX_ID.value</name>
+          <recordfield>TICKET.INBOX_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT_STATUS.value</name>
+          <recordfield>TICKET.DATE_EDIT_STATUS</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MEDIUM.value</name>
+          <recordfield>TICKET.MEDIUM</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MEDIUM.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ALTERNATIVE_PHONEADDR.value</name>
+          <recordfield>TICKET.ALTERNATIVE_PHONEADDR</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CommEmail.value</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commemail.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ALTERNATIVE_EMAILADDR.value</name>
+          <recordfield>TICKET.ALTERNATIVE_EMAILADDR</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CommPhone.value</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commphone.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMAIL_SUBJECT.value</name>
+          <recordfield>TICKET.EMAIL_SUBJECT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONCLUSION.value</name>
+          <recordfield>TICKET.CONCLUSION</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONCLUSION.displayValue</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMAIL_DESCRIPTION.value</name>
+          <recordfield>TICKET.EMAIL_DESCRIPTION</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>isoverdue.value</name>
+          <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/isoverdue.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_END.value</name>
+          <recordfield>TICKET.DATE_END</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMAILMAILSIGNATURE_ANSWER.value</name>
+          <recordfield>MAILSIGNATURE.ANSWER_MAIL_ADDRESS</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
-          <name>512c662b-33f6-4491-bd24-a8b862f2de84</name>
+          <name>b7d657ad-0945-40e7-90b7-296e15cfc9bb</name>
           <tableName>TICKET</tableName>
           <primaryKey>TICKETID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>4e818524-bb9c-46e7-a336-e48da60c06d1</name>
+          <name>d5035f6f-d4a9-49e7-aacb-aa2433c411e7</name>
           <tableName>TASK</tableName>
           <primaryKey>TASKID</primaryKey>
           <isUIDTable v="false" />
@@ -655,6 +1203,15 @@
           <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </filterExtension>
+        <filterExtensionSet>
+          <name>Attribute_filter</name>
+          <filterFieldsProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js</filterFieldsProcess>
+          <filterValuesProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
+          <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/groupQueryProcess.js</groupQueryProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtensionSet>
       </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/SupportTicket_entity/afterSave.js b/entity/SupportTicket_entity/afterSave.js
new file mode 100644
index 0000000000000000000000000000000000000000..d30368515c3502c41cb4990e10a8a5bd5729b398
--- /dev/null
+++ b/entity/SupportTicket_entity/afterSave.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.vars");
+import("system.neon");
+
+if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.ActionName_param"))
+{   
+    var actionName = vars.get("$param.ActionName_param");
+    // After change status redirect to home dashboard
+    if ( (actionName == "sendTicketBackAction") || (actionName == "changeStatusAfterForwardEmail"))
+    {
+        neon.openHome();     
+    }
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/afterUiInit.js b/entity/SupportTicket_entity/afterUiInit.js
index ecada6ad975a6f1d1b79ef0e39f3ad5372d5d593..9252649e28a6f17de1b403507d552069d0b7df89 100644
--- a/entity/SupportTicket_entity/afterUiInit.js
+++ b/entity/SupportTicket_entity/afterUiInit.js
@@ -5,9 +5,74 @@ import("Attribute_lib");
 import("system.neon");
 import("system.vars");
 import("ActivityTask_lib");
+import("KeywordRegistry_basic");
+import("system.project");
+import("system.entities");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
+    
+    if(vars.get("$param.ActionName_param"))
+    {
+        var actionName = vars.get("$param.ActionName_param");
+        if (actionName == "duplicateTicket")
+        {
+            var entity = ContextUtils.getEntity(ContextUtils.getCurrentContextId())
+            var structure = project.getEntityStructure(entity);
+            var fields = [];
+            var notCopiedFields = ["CODE","TICKETID","TASK_ID","TASK_TASKID","TASK_START_DATE","DATE_BEGIN","DATE_EDIT_STATUS","DATE_END"]
+            for (field in structure.fields)
+            {
+                if (structure.fields[field].fieldType == "FIELD" && !notCopiedFields.includes(structure.fields[field].name))
+                {
+                    fields.push(structure.fields[field].name);
+                }
+            }
+            var loadConfig = entities.createConfigForLoadingRows().entity(entity).fields(fields).uid(vars.get("$param.TicketId_param"));
+
+            var oldTicketData = entities.getRow(loadConfig);
+            
+            var fieldValues = {};
+            
+            Object.keys(oldTicketData).forEach(function (key)
+            {
+                if (key != "TICKETID" && key!= "TASK_ID" && key!="TASK_TASKID")
+                {
+                    fieldValues["$field."+key] = oldTicketData[key];
+                }
+                
+            });
+            neon.setFieldValues(fieldValues);
+        }   
+    }
+    
     TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes", TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
+
+    
+}
+
+// for actions: CHANGE CATHEGORY and INBOX 
+// reset Editor  // reset status : eingang
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    if(vars.get("$param.ActionName_param"))
+    {
+        var actionName = vars.get("$param.ActionName_param");
+        
+        if( (actionName == "sendTicketBackAction"))
+        {      
+            vars.set("$field.TICKET_EDITOR_CONTACT_ID", "");
+            vars.set("$field.TASK_STATUS", $KeywordRegistry.taskStatus$entry());
+        }
+        
+        if (actionName == "changeTicketInbox")
+        {
+            vars.set("$field.TASK_STATUS", $KeywordRegistry.taskStatus$entry());
+            vars.set("$field.INBOX_ID", "");
+            vars.set("$field.MAILSIGNATURE_ID", ""); 
+            vars.set("$field.TICKETCATEGORY", "");
+            vars.set("$field.TICKET_EDITOR_CONTACT_ID", "");
+        }
+    }
 }
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/contentDescriptionProcess.js b/entity/SupportTicket_entity/contentDescriptionProcess.js
index 1d91623c4ae8f611109db99446b52adabd903dfd..1f7017d97a63a7920c8af208b0940f731f99c3d1 100644
--- a/entity/SupportTicket_entity/contentDescriptionProcess.js
+++ b/entity/SupportTicket_entity/contentDescriptionProcess.js
@@ -7,12 +7,13 @@ import("system.result");
 
 var res = [];
 
-if(vars.get("$field.TASK_EDITOR_CONTACT_ID"))
-    res = [translate.text("{$TICKET_EDITOR}") + ": " + vars.get("$field.TASK_EDITOR_CONTACT_ID.displayValue")];
-    
-  res.push(translate.text("Maturity") + ": " + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), translate.text("dd.MM.yyyy")));
-  res.push(translate.text("Progress") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskProgress(), vars.get("$field.TASK_PROGRESS")));
-  res.push(translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy")));
+if(vars.get("$field.TICKET_EDITOR_CONTACT_ID"))
+{
+    res = [translate.text("{$TICKET_EDITOR}") + ": " + vars.get("$field.TICKET_EDITOR_CONTACT_ID.displayValue")];
+}
+res.push(translate.text("Maturity") + ": " + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), translate.text("dd.MM.yyyy")));
+res.push(translate.text("Progress") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskProgress(), vars.get("$field.TASK_PROGRESS")));
+res.push(translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.TASK_START_DATE"), translate.text("dd.MM.yyyy")));
 
 result.string(res.join(" | "));
     
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/documentation.adoc b/entity/SupportTicket_entity/documentation.adoc
index 29cf6440c15e985e864e6600b9f7bb94de583112..e58f196c7e950ceeab8165e9d2419127dc115617 100644
--- a/entity/SupportTicket_entity/documentation.adoc
+++ b/entity/SupportTicket_entity/documentation.adoc
@@ -1,4 +1,5 @@
 = SupportTicket_entity
 
-Entity representing the SupportTickets and the related process
-See context documentation for explanation how tickets work and how to add new TicketTypes
\ No newline at end of file
+Entity representing the ServiceTickets and the related process. Supportticket is called Serviceticket in all UI elements.
+See context documentation for explanation how tickets work and how to add new TicketTypes.
+
diff --git a/entity/SupportTicket_entity/entityfields/activities/children/objectid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/activities/children/objectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/activities/children/objectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/activities/children/rowid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/activities/children/rowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ab951a157ba044be2a4b28176af385742641cea
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/activities/children/rowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TICKETID"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/alternative_emailaddr/titleProcess.js b/entity/SupportTicket_entity/entityfields/alternative_emailaddr/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..75e6c611da6159c2fe285dac7a91454c53d3fba1
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/alternative_emailaddr/titleProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Alt. E-Mail"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/alternative_phoneaddr/titleProcess.js b/entity/SupportTicket_entity/entityfields/alternative_phoneaddr/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5eb8e9e8be995a4bc05c44dc3d4d8874b2550e9
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/alternative_phoneaddr/titleProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Alt. Phone"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/conclusion/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/conclusion/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5bb3f4ad5d00d2b1ae6e2e765f47bc3725d4b079
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/conclusion/displayValueProcess.js
@@ -0,0 +1,14 @@
+import("Keyword_lib");
+import("system.vars");
+import("system.result");
+
+
+var subject = KeywordUtils.getViewValue("TICKETCONCLUSION", vars.get("$field.CONCLUSION"));
+if (!subject)
+{
+    result.string("-");
+}
+else
+{
+    result.string(subject);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/conclusion/mandatoryProcess.js b/entity/SupportTicket_entity/entityfields/conclusion/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f26a9569ee012be944ae089a46c8266e79bcaeb5
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/conclusion/mandatoryProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+if (vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+    result.string("false");
+}
+else
+{
+    result.string("true");
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/conclusion/stateProcess.js b/entity/SupportTicket_entity/entityfields/conclusion/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..64a96782f9c143e994094d4a800f43540be9ae5d
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/conclusion/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+
+
+var str_ret = neon.COMPONENTSTATE_INVISIBLE;
+var str_status = vars.get( "$field.TASK_STATUS");
+
+if( [ $KeywordRegistry.taskStatus$ended(), $KeywordRegistry.taskStatus$endedDone(), $KeywordRegistry.taskStatus$endedAbandoned()].includes( str_status))
+{
+    str_ret = ( [neon.OPERATINGSTATE_EDIT, neon.OPERATINGSTATE_NEW].indexOf( vars.get( "$sys.recordstate")) != -1)? 
+        neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_READONLY;
+}
+result.string( str_ret);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/conclusion/valueProcess.js b/entity/SupportTicket_entity/entityfields/conclusion/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..92a1b1c610da29bcbb8e5cd0920ec727c1b50f10
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/conclusion/valueProcess.js
@@ -0,0 +1,10 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (!vars.get("$this.value") && vars.get("$field.TASK_STATUS") == $KeywordRegistry.taskStatus$ended())
+{
+    result.string($KeywordRegistry.ticketConclusion$success());
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/counteractivities/valueProcess.js b/entity/SupportTicket_entity/entityfields/counteractivities/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ee26efad0f035c6825bd04f0c91ce4eaf647e7e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/counteractivities/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("Context_lib");
+import("Sql_lib");
+import("system.result");
+
+
+result.string( newSelect("count(*)")
+    .from("ACTIVITY")
+    .where("ACTIVITY.PARENT_CONTEXT", ContextUtils.getCurrentContextId())
+    .and("ACTIVITY.PARENT_ID", vars.get("$field.TICKETID"))
+    .cell()
+);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/countertickettime/valueProcess.js b/entity/SupportTicket_entity/entityfields/countertickettime/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..60fda7e6dc3eee62bfa081c920d3b4101f9f7afe
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/countertickettime/valueProcess.js
@@ -0,0 +1,44 @@
+import("system.translate");
+import("system.result");
+import("system.datetime");
+import("system.vars");
+import("system.eMath");
+
+var date_begin = vars.get("$field.DATE_BEGIN");
+var date_end = vars.get("$field.DATE_END");
+var diff = "";
+
+if (date_begin != null && date_begin != "")
+{
+    if (date_end == null || date_end == "")
+    {
+        diff = datetime.date() - date_begin;
+        diff = diff/1000/60/60/24
+        diff = eMath.roundDec(diff, 0, eMath.ROUND_DOWN);
+        if (diff > 1 || diff == 0)
+        {
+            result.string(diff + " " + translate.text("days"));
+        }
+        else
+        {
+            result.string(diff + " " + translate.text("day"));
+        }
+    }
+    else
+    {
+        diff = date_end - date_begin;
+        diff = (Math.floor(diff/1000/60/60/24));
+        if (diff > 1 || diff == 0)
+        {
+            result.string(diff + " " + translate.text("days"));
+        }
+        else
+        {
+            result.string(diff + " " + translate.text("day"));
+        }
+    }
+}
+else
+{
+    result.string(translate.text("Open"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/date_edit_status/titleProcess.js b/entity/SupportTicket_entity/entityfields/date_edit_status/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..192a5175af1decc2b37bec6039859534d97e8512
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/date_edit_status/titleProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    result.string(translate.text("Last status change"))
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/date_edit_status/valueProcess.js b/entity/SupportTicket_entity/entityfields/date_edit_status/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..358adf46ccdbe302865ce8815f028bd57a4c22e2
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/date_edit_status/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/duplicateticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/duplicateticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d196ed2bcd7e1aafc02046459d979b44b9abf5fa
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/duplicateticket/onActionProcess.js
@@ -0,0 +1,13 @@
+import("Sql_lib");
+import("system.neon");
+import("system.vars");
+
+var obj_links = {
+
+    PresetLinks_param :JSON.stringify([["Supportticket",vars.get("$field.TICKETID")]]),
+    TicketId_param: vars.get("$field.TICKETID"),
+    TicketNo_param: vars.get("$field.CODE"),
+    ActionName_param: "duplicateTicket"
+};
+neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW, obj_links);
+
diff --git a/entity/SupportTicket_entity/entityfields/filteractionsgroup/children/changemultiple/onActionProcess.js b/entity/SupportTicket_entity/entityfields/filteractionsgroup/children/changemultiple/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcc1197652bdf6655d8cc596f9fbb21fc928046a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/filteractionsgroup/children/changemultiple/onActionProcess.js
@@ -0,0 +1,32 @@
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Ticket_lib")
+
+if(vars.exists("$sys.selectionRows"))
+{
+    
+    var selectedRows = vars.get("$sys.selectionRows");     
+    
+    var inboxIds= [],
+        taskIDs=[],
+        ticketIDs=[];
+        
+    
+     selectedRows.forEach(function(row){
+        taskIDs.push(row["TASK_TASKID"]);
+        ticketIDs.push(row["TICKETID"]);
+        
+        if(inboxIds.indexOf(row["INBOX_ID"]) < 0)
+            inboxIds.push(row["INBOX_ID"]);
+     });
+     
+    var params ={
+        "TaskIds_param": JSON.stringify(taskIDs), 
+        "TicketIds_param": JSON.stringify(ticketIDs),
+        "InboxIds_param": JSON.stringify(inboxIds)
+    }
+   
+    neon.openContext("SupportTicketMultiSelect", "SupportTicketMultiSelectEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/forwardticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/forwardticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be96f60fe8f8bee758038e3f3078b0cec9175af0
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/forwardticket/onActionProcess.js
@@ -0,0 +1,32 @@
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Ticket_lib")
+
+
+
+var params =
+{
+    SignatureId_param: vars.get("$field.MAILSIGNATURE_ID"), 
+    SenderEmail_param: vars.get("$field.SENDEREMAIL"),
+    TicketCode_param: vars.get("$field.CODE"),
+    TicketSubject_param: vars.get("$field.TASK_SUBJECT"),
+    TicketId_param: vars.get("$field.TICKETID"),
+    TaskId_param: vars.get("$field.TASK_ID"),
+    ActionName_param : "forwardEmailAction",
+    SendType_param : "internal",
+    ContactId_param : vars.get("$field.TASK_REQUESTOR_CONTACT_ID"),
+    TicketCategory_param : vars.get("$field.TICKETCATEGORY"),
+    Inbox_ID_param : vars.get("$field.INBOX_ID")
+}
+// if answer mail address is set uses is, else use standard mail address of signature
+if (vars.get("$field.EMAILMAILSIGNATURE_ANSWER"))
+{
+    params["From_param"] = vars.get("$field.EMAILMAILSIGNATURE_ANSWER");
+}
+else
+{
+    params["From_param"] = vars.get("$field.EMAILMAILSIGNATURE");
+}
+
+neon.openContext("ServiceEmail", "ServiceForwardEmailEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/forwardticket/stateProcess.js b/entity/SupportTicket_entity/entityfields/forwardticket/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..87bab95a655a0b84ddebe16dd32d7e97c301714a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/forwardticket/stateProcess.js
@@ -0,0 +1,24 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+
+var editor = vars.get("$field.TICKET_EDITOR_CONTACT_ID");
+var status = vars.get("$field.TASK_STATUS");
+
+if (status != $KeywordRegistry.taskStatus$ended())
+{
+    if (editor == null || editor == "")
+    {
+       result.string(neon.COMPONENTSTATE_DISABLED);
+    }
+    else
+    {
+       result.string(neon.COMPONENTSTATE_EDITABLE);
+    }   
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/forwardticket/tooltipProcess.js b/entity/SupportTicket_entity/entityfields/forwardticket/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be34e988e1057e6d9ef3701dd28e379696fbcd75
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/forwardticket/tooltipProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Forward ticket"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/inbox_id/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/inbox_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..af631ffab93d643bf017d1bcf92beaebc7d106c3
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/inbox_id/displayValueProcess.js
@@ -0,0 +1,32 @@
+import("Sql_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var isNotInboxAction = true;
+if(vars.get("$param.ActionName_param") && (vars.get("$param.ActionName_param") == "changeTicketInbox") )
+{
+       isNotInboxAction = false;
+}
+else
+{
+    if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    {
+        result.string(vars.get("$field.INBOXNAME"));
+    }
+    else 
+    {
+        if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+        {
+            var str_inboxId = vars.get( "$field.INBOX_ID");
+        }
+        if( str_inboxId) 
+        {
+            result.string(newSelect( "INBOX.NAME")
+                          .from( "INBOX")
+                          .where("INBOX.INBOXID", str_inboxId)
+                          .cell()
+                         );
+        }
+    }
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/inbox_id/valueProcess.js b/entity/SupportTicket_entity/entityfields/inbox_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0546e49b32d2f8bb64243441cc9706dd501bfcae
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/inbox_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if ( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string ( vars.get( "$param.InboxId_param"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..92147d3453d5ee06e7d309e10ce145653776797d
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/inboxes/children/excludedinboxes_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if(vars.exists("$param.InitialInboxId_param"))
+{
+    result.object([vars.get("$param.InitialInboxId_param")]);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js b/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98046686637b05ed28e7115e423eeedc5af93a60
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/is_overdue_symbol/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$field.isoverdue"))
+{
+    result.string("vaadin:warning");
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
index 0035c1d5e5ed84739103be35b6bf248bbddd8a61..33db9e5f8b0b112fd0d6c28ba63538f7821a7a35 100644
--- a/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
@@ -1,4 +1,5 @@
 import("system.vars");
 import("system.result");
 import("Ticket_lib");
+
 result.object(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getAvailableStatus())
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..34e5c039c7540d6684719dcdf0783339816eb06a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordticketcategory/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.ticketCategory());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aac3b38f48946a1e010bf845ed0f789709f9e832
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordticketconclusion/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+
+result.string( $KeywordRegistry.ticketConclusion())
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/containername_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1252705fd777fff30d15dac1d8d3714648abd98d
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.activityCategory());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/medium/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/medium/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d0af4b0b308b41d11082f0d2ace3954f57a2c35
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/medium/displayValueProcess.js
@@ -0,0 +1,7 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("system.vars");
+
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(),  vars.get("$field.MEDIUM")));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/medium/valueProcess.js b/entity/SupportTicket_entity/entityfields/medium/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c9ad0678100e60e225f8534b105b30a5b68d301b
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/medium/valueProcess.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    if (vars.get("$this.value") == "MAIL")
+    {
+        result.string($KeywordRegistry.activityCategory$mail());
+    }
+    else
+    {
+        result.string($KeywordRegistry.activityCategory$phone());
+    }     
+    
+}
diff --git a/entity/SupportTicket_entity/entityfields/new_ticket/titleProcess.js b/entity/SupportTicket_entity/entityfields/new_ticket/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d47fce1179857911ff09c78b706142364d6cf35c
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/new_ticket/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Enter new Ticket"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/new_ticketcontact/titleProcess.js b/entity/SupportTicket_entity/entityfields/new_ticketcontact/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a9b33bc3cbee64e1402a8f0565ea94355fb3019a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/new_ticketcontact/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Enter new Ticket & Contact"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js
index eef55adcac837abb1557202539e0fabc2c0ae815..41474bdbfc24b768e5422fa679a2dc316246f44c 100644
--- a/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/SupportTicket_entity/entityfields/newactivity/onActionProcess.js
@@ -1,5 +1,10 @@
+import("system.translate");
+import("KeywordRegistry_basic");
+import("system.neon");
 import("system.vars");
 import("ActivityTask_lib");
 import("Context_lib");
 
-ActivityUtils.createNewActivity(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TICKETID"));
\ No newline at end of file
+var pRowId = vars.get("$field.TICKETID");
+
+ActivityUtils.createNewActivity(pRowId, null, ContextUtils.getCurrentContextId(), pRowId,  null, null, null, null,null, null);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newactivity/stateProcess.js b/entity/SupportTicket_entity/entityfields/newactivity/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..99e6d2d42f14b1ed8bdb9b6547bff69f530fa1c6
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newactivity/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+if (vars.get ("$field.TASK_STATUS") == $KeywordRegistry.taskStatus$ended())
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newletter/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newletter/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4066bead87bcfe4070031d5094d4fac0e23416b5
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newletter/onActionProcess.js
@@ -0,0 +1,11 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+        "ContactId_param" : vars.get("$field.TASK_REQUESTOR_CONTACT_ID"),
+        "ComingFrom_param" : vars.get("$sys.currentcontextname"),
+        "ActionName_param" : "ServiceLetter",
+        "TicketCategory_param" : vars.get("$field.TICKETCATEGORY")
+    };
+    
+neon.openContext("Letter", "LetterEdit_view", null, neon.OPERATINGSTATE_VIEW, params)
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newletter/stateProcess.js b/entity/SupportTicket_entity/entityfields/newletter/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..87bab95a655a0b84ddebe16dd32d7e97c301714a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newletter/stateProcess.js
@@ -0,0 +1,24 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+
+var editor = vars.get("$field.TICKET_EDITOR_CONTACT_ID");
+var status = vars.get("$field.TASK_STATUS");
+
+if (status != $KeywordRegistry.taskStatus$ended())
+{
+    if (editor == null || editor == "")
+    {
+       result.string(neon.COMPONENTSTATE_DISABLED);
+    }
+    else
+    {
+       result.string(neon.COMPONENTSTATE_EDITABLE);
+    }   
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newnote/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newnote/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..17e7ed9b446f272035cb78b269f391350867e42e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newnote/onActionProcess.js
@@ -0,0 +1,19 @@
+import("Context_lib");
+import("system.translate");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Ticket_lib")
+
+var params ={
+    "Entrydate_param" : datetime.date(),
+    "Category_param" : $KeywordRegistry.activityCategory$note(),
+    "Direction_param" : $KeywordRegistry.activityDirection$internal(),
+    "InsertLinks_param": JSON.stringify([["SupportTicket", vars.get( "$field.TICKETID")]]),
+    "Subject_param": translate.text("Note"),
+    "ParentId_param": vars.get("$field.TICKETID"),
+    "ParentContext_param": ContextUtils.getCurrentContextId()
+    } 
+neon.openContext("Activity", "ActivityNoteEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newnote/tooltipProcess.js b/entity/SupportTicket_entity/entityfields/newnote/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..affa8e479043bf03a94727b818ca6b5fb3e55d8f
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newnote/tooltipProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Create new note"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js
deleted file mode 100644
index b4a52cb145e6a84b79dfb72ba4ef97e2f981efce..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/entityfields/newsupportticket/onActionProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-import("Ticket_lib")
-
-TicketUtils.createNewTicket(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TICKETID"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c21413ab83e7106f94aef7aec9c1b7be3cde702
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newticket/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.neon");
+import("Ticket_lib")
+
+neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW, null);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js b/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9de4020cf3efddc0e5b798ba33037a275181fac
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/newticketcontact/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.neon");
+import("Ticket_lib")
+
+neon.openContext("Person", "PersonEditServiceTicket_view", null, neon.OPERATINGSTATE_NEW, null);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/openadminview/onActionProcess.js b/entity/SupportTicket_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a7200fa50671a7ae517fa732726a43a3f6d6570e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("Context_lib");
+
+AdminViewUtils.open("TICKETID", [
+    ["TASK_ID", vars.get("$field.TASK_ID")],
+    ["TASK_REQUESTOR_CONTACT_ID", vars.get("$field.TASK_REQUESTOR_CONTACT_ID")],
+    ["TASK_PARENT_ID", vars.get("$field.TASK_PARENT_ID")],
+    ["TICKET_EDITOR_CONTACT_ID", vars.get("$field.TICKET_EDITOR_CONTACT_ID")],
+    ["MAILSIGNATURE_ID", vars.get("$field.MAILSIGNATURE_ID")],
+    ["INBOX_ID", vars.get("$field.INBOX_ID")],
+    ["DATE_EDIT_STATUS", vars.get("$field.DATE_EDIT_STATUS"), "DATE"],
+    ["TASK_MATURITY_DATE", vars.get("$field.TASK_MATURITY_DATE"), "DATE"],
+    ["TASK_START_DATE", vars.get("$field.TASK_START_DATE"), "DATE"],
+]);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/openadminview/stateProcess.js b/entity/SupportTicket_entity/entityfields/openadminview/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..636de1cf79d85fee13b3e71b937d26850a969e40
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js
@@ -0,0 +1,132 @@
+import("Util_lib");
+import("system.translate");
+import("system.question");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("JditoFilter_lib");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+import("Employee_lib");
+
+// process for pulling Ticket
+var contactID   = EmployeeUtils.getCurrentContactId();
+var ticketID    = "";
+var taskID      = "";
+var date_begin  = "";
+
+// FIRST check if there are any reopen-Tickets or Answer-Tickets available
+var reopenTicket = new SqlBuilder()
+                   .select(["TASK.TASKID", "TICKET.TICKETID", "TICKET.DATE_BEGIN", "(case when PRIORITY = 'TASKPRIOHIGH' then 1 when PRIORITY = 'TASKPRIOLOW' then 3 else 2 end) as PRIO"])
+                   .from ("TICKET")
+                   .join("TASK","TICKET.TASK_ID = TASK.TASKID")
+                   .join("MAILSIGNATURE","MAILSIGNATURE.MAILSIGNATUREID = TICKET.MAILSIGNATURE_ID")
+                   .where("TICKET.EDITOR_CONTACT_ID",contactID)
+                   .and("TASK.STATUS",[$KeywordRegistry.taskStatus$reopen(),$KeywordRegistry.taskStatus$reply()],SqlBuilder.IN())
+                   .orderBy("TASK.START_DATE asc","PRIO asc")
+                   .arrayRow();
+
+if(reopenTicket.length > 0) // reopen-Ticket is available
+{
+    taskID      = reopenTicket[0];
+    ticketID    = reopenTicket[1];
+    date_begin  = reopenTicket[2];
+}
+else
+{
+    var myRules = new SqlBuilder()
+                  .selectDistinct("EMPLOYEEGROUP.COND")
+                  .join("EMPLOYEEGROUP_CONTACT_RELATION","EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID = employeegroup.EMPLOYEEGROUPID")
+                  .join("EMPLOYEEGROUP_RULEGROUP_RELATION","EMPLOYEEGROUP.EMPLOYEEGROUPID = EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_ID")
+                  .join("EMPLOYEEGROUP_RULEGROUP","EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID = EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_RULEGROUP_ID")
+                  .join("EMPLOYEEGROUP_RULE","EMPLOYEEGROUP_RULE.EMPLOYEEGROUP_RULEGROUP_ID = EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID")
+                  .where("EMPLOYEEGROUP_CONTACT_RELATION.CONTACT_ID",contactID)
+                  .and("EMPLOYEEGROUP_RULEGROUP.STATE", $KeywordRegistry.employeeGroupStatus$active())
+                  .column();
+
+    var subFilter           = {}
+    subFilter["type"]       = "group";
+    subFilter["operator"]   = "OR";
+    subFilter["childs"]     = [];
+
+    var myFilter            = {};
+    myFilter["entity"]      = "SupportTicket_entity";
+    myFilter["filter"]      = subFilter;
+
+    // put all subfilter into one
+    for(let i = 0; i < myRules.length; i++)
+    {
+        var tempRule  = JSON.parse(myRules[i]); 
+        myFilter.filter.childs.push(tempRule.filter);
+    }
+    
+    // mapping
+    var mapping =
+    {
+        "TASK_SUBJECT":       ["TASK", "SUBJECT", "TASK"],
+        "TASK_STATUS":       ["TASK", "STATUS", "TASK"],
+        "TICKETCATEGORY":     ["TICKET", "CATEGORY", "TICKET"],
+        "TASK_DESCRIPTION":   ["TASK", "DESCRIPTION", "TASK"],
+        "INBOX_ID":           ["MAILSIGNATURE", "INBOX_ID", "MAILSIGNATURE"],
+        "INBOX_Filter":  ["MAILSIGNATURE", "INBOX_ID", "MAILSIGNATURE"],
+        "#EXTENSION.Mailsignature_Filter.Mailsignature_Filter#TEXT": ["TICKET", "MAILSIGNATURE_ID", "TICKET"],
+        "#EXTENSION.INBOX_Filter.INBOX_Filter#TEXT":  ["TICKET", "INBOX_ID", "TICKET"],
+        "TASK_PROGRESS": ["TASK","PROGRESS"],
+        "TASK_PRIORITY": ["TASK","PRIORITY","TASK"]
+    }
+    // build condition of it
+    var condition = JditoFilterUtils.getSqlCondition(myFilter.filter, "TICKET", "Data_alias", mapping);
+
+    if(Utils.isNullOrEmptyString(condition))
+    {
+        condition = SqlBuilder.NORESULT_CONDITION();
+    }
+
+    // final Statement + additional condition
+    var erg = new SqlBuilder()
+                   .select(["TASK.TASKID","TICKET.TICKETID","TICKET.DATE_BEGIN","(case when PRIORITY = 'TASKPRIOHIGH' then 1 when PRIORITY = 'TASKPRIOLOW' then 3 else 2 end) as PRIO"])
+                   .from("TICKET")
+                   .join("TASK","TICKET.TASK_ID = TASK.TASKID")
+                   .join("MAILSIGNATURE","MAILSIGNATURE.MAILSIGNATUREID = TICKET.MAILSIGNATURE_ID")
+                   .join("INBOX","INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
+                   .join("INBOX_EMPLOYEEGROUP_RELATION", "INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID = INBOX.INBOXID")
+                   .join("EMPLOYEEGROUP", "EMPLOYEEGROUP.EMPLOYEEGROUPID = INBOX_EMPLOYEEGROUP_RELATION.EMPLOYEEGROUP_ID")
+                   .join("EMPLOYEEGROUP_CONTACT_RELATION", "EMPLOYEEGROUP.EMPLOYEEGROUPID = EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID")
+                   .where(condition)
+                   .and("TASK.STATUS", $KeywordRegistry.taskStatus$ended())
+                   .and("EMPLOYEEGROUP_CONTACT_RELATION.CONTACT_ID", contactID)
+                   .orderBy("TASK.START_DATE asc","PRIO asc")
+                   .arrayRow();
+    if(erg.length > 0)
+    {
+        taskID      = erg[0]; 
+        ticketID    = erg[1];
+        date_begin  = erg[2];
+    }
+}
+
+if(ticketID != "")
+{
+    var TicketfieldValues = {};
+    var TaskfieldValues = {};
+    
+    // Update TASK(TICKET)
+    TaskfieldValues["STATUS"] = $KeywordRegistry.taskStatus$inProgress();
+    // Update (TICKET) -> Check whether DATE_BEGIN was set
+    if (date_begin == null || date_begin == "")
+    {
+        TicketfieldValues["DATE_BEGIN"] = vars.get("sys.date");
+    }
+    //Update (TICKET) -> DATE_STATUS_EDIT
+    TicketfieldValues["EDITOR_CONTACT_ID"] = contactID;
+    TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("sys.date");
+    newWhereIfSet("TICKETID", vars.get( "$field.TICKETID")).updateFields(TicketfieldValues);    
+    newWhereIfSet("TASK.TASKID",taskID).updateFields(TaskfieldValues);
+    // open Ticket
+    neon.openContext("SupportTicket", "SupportTicketMain_view", [ticketID], neon.OPERATINGSTATE_VIEW, null);
+}
+// no Ticket available.. nothing found
+else 
+{
+    question.showMessage(translate.text("No new tickets available at this moment."));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..58807b50dc20764ac06abde46ef2c3e32a33518e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/reopenticket/onActionProcess.js
@@ -0,0 +1,45 @@
+import("ActivityTask_lib");
+import("system.translate");
+import("KeywordRegistry_basic");
+import("Contact_lib");
+import("system.tools");
+import("system.neon");
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("system.util");
+
+var TicketfieldValues = {};
+var TaskfieldValues = {};
+
+var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS],
+    str_ticketId = vars.get( "$field.TICKETID"),
+    str_taskId = vars.get( "$field.TASK_ID");
+
+
+// insert ACTIVITY
+var DataPreset =
+    {
+        "directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
+        "subject"            : translate.text("Ticket reopen"), 
+        "content"            : translate.text("Ticket was reopen.") + "/n" 
+                               + translate.text("Reopen by") + ": "+ obj_toolsUser[tools.FIRSTNAME] +" "
+                               + obj_toolsUser[tools.LASTNAME],
+        "categoryKeywordId"  : $KeywordRegistry.activityCategory$sys() 
+    }
+    var ActivityLink =
+    {
+        "SupportTicket"  : ticketID
+    }
+    
+    ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+
+//change Ticketstatus, editor & DATE_EDIT_STATUS
+TaskfieldValues["STATUS"] = $KeywordRegistry.taskStatus$reopen();
+TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
+TicketfieldValues["DATE_END_"] = "";
+
+//Update task & Ticket
+newWhereIfSet("TASK.TASKID", str_taskId).updateFields(TaskfieldValues);
+newWhereIfSet("TICKET.TICKETID", vars.get("field.TICKETID")).updateFields(TicketfieldValues);
+neon.refresh();
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/reopenticket/stateProcess.js b/entity/SupportTicket_entity/entityfields/reopenticket/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd519dff16f56661f215d99ca78674fa893e31c3
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/reopenticket/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+if (vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js b/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..468a96ed35c76eff31308686e71be8ea50cfe9ca
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/replyemail/onActionProcess.js
@@ -0,0 +1,33 @@
+import("KeywordRegistry_basic");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Ticket_lib")
+
+var params =
+    {
+    "SignatureId_param": vars.get("$field.MAILSIGNATURE_ID"), 
+    "SenderEmail_param": vars.get("$field.SENDEREMAIL"),
+    "RequestorContactId_param": vars.get("$field.TASK_REQUESTOR_CONTACT_ID"),
+    "TicketCode_param": vars.get("$field.CODE"),
+    "TicketSubject_param": vars.get("$field.TASK_SUBJECT"),
+    "TicketId_param": vars.get("$field.TICKETID"),
+    "TaskId_param": vars.get("$field.TASK_ID"),
+    "SendType_param": "external",
+    "ActionName_param" : "replayEmailAction",
+    "ContactId_param" : vars.get("$field.TASK_REQUESTOR_CONTACT_ID"),
+    "TicketCategory_param" : vars.get("$field.TICKETCATEGORY"),
+    "Inbox_ID_param" : vars.get("$field.INBOX_ID")
+    };
+
+// if answer mail address is set uses is, else use standard mail address of signature
+if (vars.get("$field.EMAILMAILSIGNATURE_ANSWER"))
+{
+    params["From_param"] = vars.get("$field.EMAILMAILSIGNATURE_ANSWER");
+}
+else
+{
+    params["From_param"] = vars.get("$field.EMAILMAILSIGNATURE");
+}
+    
+neon.openContext("ServiceEmail", "ServiceEmailEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/replyemail/stateProcess.js b/entity/SupportTicket_entity/entityfields/replyemail/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..87bab95a655a0b84ddebe16dd32d7e97c301714a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/replyemail/stateProcess.js
@@ -0,0 +1,24 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+
+var editor = vars.get("$field.TICKET_EDITOR_CONTACT_ID");
+var status = vars.get("$field.TASK_STATUS");
+
+if (status != $KeywordRegistry.taskStatus$ended())
+{
+    if (editor == null || editor == "")
+    {
+       result.string(neon.COMPONENTSTATE_DISABLED);
+    }
+    else
+    {
+       result.string(neon.COMPONENTSTATE_EDITABLE);
+    }   
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/replyemail/tooltipProcess.js b/entity/SupportTicket_entity/entityfields/replyemail/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a3aed2eaefb73df097efe26dc2aeb0ba2d4ddca1
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/replyemail/tooltipProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Reply to") +" "+ vars.get("$field.SENDEREMAIL"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/resubmitticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/resubmitticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..54c8ced3dfe31067daefe243fa00f8935bf548ab
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/resubmitticket/onActionProcess.js
@@ -0,0 +1,19 @@
+import("system.db");
+import("system.util");
+import("system.tools");
+import("system.translate");
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+import("Contact_lib");
+import("Sql_lib");
+
+var params = {
+    "ActionName_param" : "resubmitTicket"
+};
+
+neon.openContext("SupportTicket", "SupportTicketEditResubmission_view", [vars.get("$field.TICKETID")], neon.OPERATINGSTATE_EDIT, params);
+
+
diff --git a/entity/SupportTicket_entity/entityfields/resubmitticket/stateProcess.js b/entity/SupportTicket_entity/entityfields/resubmitticket/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82fc9b573f3fd68fd874b4b7b4c88cedcbaebefd
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/resubmitticket/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.neon");
+import("system.result");
+
+if (vars.get ("$field.TASK_STATUS") == $KeywordRegistry.taskStatus$ended())
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/returnticket/onActionProcess.js b/entity/SupportTicket_entity/entityfields/returnticket/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..98516b9aa72eb282dc3b6dc51c607f074fbabb38
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/returnticket/onActionProcess.js
@@ -0,0 +1,29 @@
+import("KeywordRegistry_basic");
+import("Employee_lib");
+import("Sql_lib");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$field.TICKET_EDITOR_CONTACT_ID"))
+{
+    var params = {
+        "ActionName_param" : "returnTicket"
+    };
+
+    neon.openContext("SupportTicket", "SupportTicketEditReturn_view", [vars.get("$field.TICKETID")], neon.OPERATINGSTATE_EDIT, params);  
+}
+else
+{
+    var str_taskId = vars.get("$field.TASK_ID");
+    var ContactId = EmployeeUtils.getCurrentContactId(); 
+    newWhere("TASK.TASKID",str_taskId).updateFields({
+        "STATUS" : $KeywordRegistry.taskStatus$inProgress()
+    });
+    newWhere("TICKET.TASK_ID",str_taskId).updateFields({
+        "EDITOR_CONTACT_ID" : ContactId
+    });
+    neon.refresh();
+}
+
+
+
diff --git a/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js b/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfde7549fffe1602ce975d6b0cdd6fef262ced37
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/returnticket/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+if(vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+     result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else 
+{
+     result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/returnticket/titleProcess.js b/entity/SupportTicket_entity/entityfields/returnticket/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8bcacf64a2239310f1693f34e32660a80e54eb3f
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/returnticket/titleProcess.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$field.TICKET_EDITOR_CONTACT_ID"))
+{
+    result.string(translate.text("Return Ticket"));
+}
+else
+{
+    result.string(translate.text("Take Ticket"));
+}
+
+
diff --git a/entity/SupportTicket_entity/entityfields/returnticket/tooltipProcess.js b/entity/SupportTicket_entity/entityfields/returnticket/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b647f73273c950d0c9dd4c58ca7234d4d1ea580
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/returnticket/tooltipProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Return ticket"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js b/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..0bfa5683866c31a427b31d11bb6ccee317a0dec7
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/supportticket_template/onValueChange.js
@@ -0,0 +1,54 @@
+import("system.neon");
+import("system.datetime");
+import("system.eMath");
+import("system.vars");
+import("Sql_lib");
+
+var str_ticketTemplateId = vars.get( "$local.value")
+if( str_ticketTemplateId)
+{
+    _setTicketData( str_ticketTemplateId);
+}
+
+function _setTicketData( pStr_ticketTemplateId)
+{
+    var arr_cols = ["INBOX_ID", "CATEGORY", "TITLE", "DESCRIPTION", "PRIORITY", "STATUS", "CONCLUSION", "MATURING_TIME"]
+    var arr_ticketTemplateData = newSelect( "tickettemplate."+ arr_cols.join( ", tickettemplate."))
+        .from( "tickettemplate")
+        .where( "tickettemplate.TICKETTEMPLATEID", pStr_ticketTemplateId)
+        .arrayRow();
+    
+    var str_currentVal, obj_fieldMap = {};
+    arr_cols.forEach( function( str_col, int_index){
+        int_index = parseInt( int_index);
+        str_currentVal = arr_ticketTemplateData[ int_index];
+        
+        switch( str_col){
+            case "MATURING_TIME":
+                if( !str_currentVal){ 
+                    obj_fieldMap["$field.TASK_MATURITY_DATE"] = "";
+                    break;
+                }
+                //Maturity_date = last full minute + (maturing time * seconds per day)
+                let int_nowDay = Math.floor(datetime.date() / datetime.ONE_DAY) * datetime.ONE_DAY;
+                obj_fieldMap["$field.TASK_MATURITY_DATE"] = eMath.addInt( int_nowDay, eMath.mulInt( datetime.ONE_DAY, parseInt( str_currentVal))); 
+                break;
+            case "TITLE":      
+                obj_fieldMap["$field.TASK_SUBJECT"] = str_currentVal;
+                obj_fieldMap["$field.ticket_title"] = str_currentVal;
+                break;
+            case "DESCRIPTION":
+            case "PRIORITY":
+            case "STATUS":
+                obj_fieldMap["$field.TASK_"+ str_col] = str_currentVal;
+                break;
+            case "CATEGORY":
+                obj_fieldMap["$field.TICKET"+ str_col] = str_currentVal;
+                break;
+            default:
+                obj_fieldMap["$field."+ str_col] = str_currentVal;
+                break;
+        }     
+    });
+    neon.setFieldValues(obj_fieldMap);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/supporttickettemplates/children/active_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/supporttickettemplates/children/active_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b242c2ebc37bf2c26b3978583edba0720530bfd
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/supporttickettemplates/children/active_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+var str_recordState = vars.get( "$sys.recordstate");
+
+if( str_recordState == neon.OPERATINGSTATE_NEW || str_recordState == neon.OPERATINGSTATE_EDIT) result.string( "1");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js
deleted file mode 100644
index d5381e94ed349aaf085f56d443df54cf3afea7ec..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import("system.vars");
-import("KeywordRegistry_basic");
-import("system.result");
-import("system.neon");
-
-switch(vars.getString("$field.TASK_PRIORITY"))
-{
-    case $KeywordRegistry.taskPriority$none():
-        result.string(neon.PRIORITY_NONE_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$low():
-        result.string(neon.PRIORITY_LOW_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$medium():
-        result.string(neon.PRIORITY_MEDIUM_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$high():
-        result.string(neon.PRIORITY_HIGH_COLOR);
-        break;
-}
-
diff --git a/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js b/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..170610e2acc0e7394f5a0361decf25bd07d1c220
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_maturity_date/colorProcess.js
@@ -0,0 +1,19 @@
+import("system.neon");
+import("system.result");
+import("system.datetime");
+import("system.vars");
+
+
+
+var overdue =vars.get("$field.isoverdue");
+
+if (!overdue)
+{
+    result.string(neon.PRIORITY_NONE_COLOR);
+}
+else
+{
+    result.string(neon.PRIORITY_HIGH_COLOR);
+}
+   
+
diff --git a/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js
deleted file mode 100644
index aefaa534ffadaee5803fd9278a26a25e2c8adff4..0000000000000000000000000000000000000000
--- a/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.eMath");
-import("system.datetime");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-{
-    var startDate = vars.get("$field.TASK_START_DATE");
-    var presetVal = eMath.addInt(startDate, datetime.ONE_WEEK);
-    result.string(presetVal);
-}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js
index 3d3345b73b8678e2abe360310e37847d7251208a..9a82dff3e17579179a0085a9667113f5558270bc 100644
--- a/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js
@@ -4,4 +4,10 @@ import("system.vars");
 import("Ticket_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
-    result.string(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getDefaultPriority());
\ No newline at end of file
+{
+    result.string(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getDefaultPriority());
+}
+    
+
+
+
diff --git a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
index a769772aeb44b795fb37db6acdcad4ee4aca6a35..8ae23d7885712c2c8f3a094df18fb69b2cfe574b 100644
--- a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
@@ -1,4 +1,24 @@
 import("system.vars");
+import("KeywordRegistry_basic");
 import("system.result");
+import("system.neon");
 
-result.string(vars.get("$field.TASK_ICON_COLOR"))
\ No newline at end of file
+
+switch(vars.getString("$field.TASK_PRIORITY"))
+{
+  case $KeywordRegistry.taskPriority$none():
+      result.string(neon.PRIORITY_NONE_COLOR);
+      break;
+  case $KeywordRegistry.taskPriority$low():
+      result.string(neon.PRIORITY_LOW_COLOR);
+      break;
+  case $KeywordRegistry.taskPriority$medium():
+      result.string(neon.PRIORITY_MEDIUM_COLOR);
+      break;
+  case $KeywordRegistry.taskPriority$high():
+      result.string(neon.PRIORITY_HIGH_COLOR);
+      break;
+  default:
+      result.string(neon.PRIORITY_NONE_COLOR);
+      break;
+}  
diff --git a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/mandatoryProcess.js b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bfb9abaec5d9726e9813aea1a473f2bf859aed2e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/mandatoryProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(true);   
+}
+else
+{
+    result.string(false);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..713a33ff04c0a5c52e29e61875657926aea4a3d5
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
@@ -0,0 +1,35 @@
+import("system.neon");
+import("Sql_lib");
+import("system.vars");
+
+
+var str_requestorContactId = vars.get( "$local.value");
+if( str_requestorContactId)
+{
+    var str_email = newSelect( "communication.ADDR")
+            .from( "communication")
+            .where( "communication.OBJECT_ROWID", str_requestorContactId)
+            .and( "OBJECT_TYPE = 'Contact'")
+            .and( "communication.MEDIUM_ID = 'COMMEMAIL'")
+            .orderBy("communication.ISSTANDARD desc")
+            .cell(),
+        str_phone = newSelect( "communication.ADDR")
+            .from( "communication")
+            .where( "communication.OBJECT_ROWID", str_requestorContactId)
+            .and( "OBJECT_TYPE = 'Contact'")
+            .and( "communication.MEDIUM_ID in ('COMMPHONE', 'COMMMOBIL')")
+            .orderBy("communication.ISSTANDARD desc")
+            .cell();
+    if(str_email)
+    {
+        neon.setFieldValue("$field.CommEmail", 
+            str_email
+        );
+    }
+    if(str_phone)
+    {
+        neon.setFieldValue("$field.CommPhone", 
+            str_phone
+        );
+    }
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js
index 4711a17716cf559c48c73cd7ea780b2ffe5e2e03..a621c85e50db47577808acc4dced12eee261c4bc 100644
--- a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js
@@ -1,7 +1,18 @@
+import("Employee_lib");
 import("system.result");
 import("system.neon");
 import("system.vars");
-import("Employee_lib");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
+
+if ( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW 
+    && vars.get("$this.value") == null)
+{
+    if(vars.get( "$param.TaskRequestorContactId_param"))
+    {
+        result.string( vars.get( "$param.TaskRequestorContactId_param"));
+    }
+    else
+    {
+        result.string(EmployeeUtils.getCurrentContactId());      
+    }
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_status/onValueChange.js b/entity/SupportTicket_entity/entityfields/task_status/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..11e0d8c507174696fea38542dff5f8f113ae874e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_status/onValueChange.js
@@ -0,0 +1,16 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+import("system.result");
+
+// for any change of status, the Editor should be changed with the curent user
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    if(EmployeeUtils.getCurrentContactId())
+    {
+        vars.set("$field.TICKET_EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId());
+    }
+    vars.set("$field.DATE_EDIT_STATUS", vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_status/stateProcess.js b/entity/SupportTicket_entity/entityfields/task_status/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ac1904a553c4718d20f28172e04eacac35cc877
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_status/stateProcess.js
@@ -0,0 +1,18 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+
+
+if (vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
+    {
+        result.string(neon.COMPONENTSTATE_READONLY);
+    }
+}
diff --git a/entity/SupportTicket_entity/entityfields/task_status/titleProcess.js b/entity/SupportTicket_entity/entityfields/task_status/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bcde88cc195a0f7b4bb80ae7bfc970bd3afe4689
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_status/titleProcess.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+// FOR CHANGE STATUS ACTION 
+
+var actionName = vars.get("$param.ActionName_param");
+if( (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)  && actionName )
+{
+    if(actionName == "changeStatusAfterForwardEmail")
+    {
+        result.string(translate.text("Select new status"));
+    }  
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js
index b21b65e67884b19c3247e934aa7c8a00b3ca6b0f..5bfe4225673e540e0473e0ea20efff20e591bf8f 100644
--- a/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js
@@ -1,3 +1,4 @@
+import("KeywordRegistry_basic");
 import("Ticket_lib");
 import("system.result");
 import("system.neon");
@@ -5,5 +6,5 @@ import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
-    result.string(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getDefaultStatus());
-}
\ No newline at end of file
+    result.string($KeywordRegistry.taskStatus$inProgress());    
+}
diff --git a/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js
index 575d44d113e181400c9265d78f93c57799692ffe..a23204e3c409fa7e674aa1ffa9bcc8114f4edd30 100644
--- a/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js
@@ -1,5 +1,5 @@
 import("system.vars");
 import("system.result");
 
-var responsible = vars.get("$field.TASK_EDITOR_CONTACT_ID.displayValue");
+var responsible = vars.get("$field.TICKET_EDITOR_CONTACT_ID.displayValue");
 result.string(vars.get("$field.TASK_SUBJECT") + (responsible ? " (" + responsible + ")" : ""));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/displayValueProcess.js
similarity index 68%
rename from entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js
rename to entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/displayValueProcess.js
index 40f8e064ba6a9d3248e9100abc4f52693effb034..83a3f590e3a407dafc2f0241aa723bc45567d2fd 100644
--- a/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/displayValueProcess.js
@@ -3,5 +3,5 @@ import("system.vars");
 import("Contact_lib");
 
 //show the simpel title since this will be later an employee-entry and therefore no organisation is needed
-var title = ContactUtils.getTitleByContactId(vars.get("$field.TASK_EDITOR_CONTACT_ID"));
+var title = ContactUtils.getTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"));
 result.string(title);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/mandatoryProcess.js b/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a48870cce9e1aa86ed3705e7a21e482a92fe66f4
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/mandatoryProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+import("system.vars");
+
+var ticketStatus = vars.get("$field.TASK_STATUS");
+var actionName = vars.exists("$param.ActionName_param") ? vars.get("$param.ActionName_param"): false;
+
+///
+if ( actionName && (actionName == "changeTicketInbox" || actionName == "sendTicketBackAction" || actionName == "resubmitTicket"))
+     result.string("false");
+else if(ticketStatus && ticketStatus != $KeywordRegistry.taskStatus$entry())
+    result.string("true");
+else
+    result.string("false");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/valueProcess.js b/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2c5378b9745c64f6cd76e101c66afe548c393ab0
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/ticket_editor_contact_id/valueProcess.js
@@ -0,0 +1,22 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib"); 
+import("KeywordRegistry_basic");
+
+var status = vars.get("$field.TASK_STATUS");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    if (status == $KeywordRegistry.taskStatus$entry())
+    {
+        result.string("");
+    }
+    else
+    {
+        if (!vars.get("this.value"))
+        {
+            result.string(EmployeeUtils.getCurrentContactId());
+        }
+    }
+}
diff --git a/entity/SupportTicket_entity/entityfields/ticket_title/valueProcess.js b/entity/SupportTicket_entity/entityfields/ticket_title/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..66cc42a75f478de73e2722ef96053b8708c1c957
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/ticket_title/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+{
+    /// + BUG fix for long subject (slice on max 50 characters)
+    var subject = vars.get("$field.TASK_SUBJECT");
+    if(subject.length > 50)
+    {
+       subject = subject.slice(0,50) + "...";
+    }
+    result.string(vars.get("$field.CODE") +  " | " + subject);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/ticketcategory/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/ticketcategory/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..724f5e0abf5f3c3a8ea9668d122706b1fb710b53
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/ticketcategory/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+
+result.string( KeywordUtils.getViewValue( $KeywordRegistry.ticketCategory(), vars.get( "$field.TICKETCATEGORY")));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc b/entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d131a66a499553b3a630d3e43d5e835fa2468d7e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/ticketsprovider/documentation.adoc
@@ -0,0 +1 @@
+All Tickets
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/tickettasks/children/objectid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/tickettasks/children/objectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/tickettasks/children/objectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/tickettasks/children/rowid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/tickettasks/children/rowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ab951a157ba044be2a4b28176af385742641cea
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/tickettasks/children/rowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TICKETID"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/grantDeleteProcess.js b/entity/SupportTicket_entity/grantDeleteProcess.js
index 1300a4f0d525e6083e9f8dc6df280f802ef813c2..b87669e59b2f7214e8985a9755d0cff07cbb0341 100644
--- a/entity/SupportTicket_entity/grantDeleteProcess.js
+++ b/entity/SupportTicket_entity/grantDeleteProcess.js
@@ -1,10 +1,14 @@
+import("system.result");
 import("system.vars");
 import("system.result");
+import("KeywordRegistry_basic");
 
-var uid = vars.get("$sys.uid");
-
-var canDelete = new HasLinkedObjectTester()
-    .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "TICKET", AssignmentRowId_param : uid}) //Documents
-    .validate();
+if (vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+{
+   result.string(false); 
+}
+else
+{
+   result.string(true); 
+}
 
-result.string(canDelete);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
index 058d0ec06940cfc36ccf27bfc13ed7dc8b315518..d40bba5ac7f7aee98aa22fc21fd6539b36cc2135 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
 import("Employee_lib");
 import("system.vars");
 import("system.db");
@@ -8,19 +9,25 @@ import("KeywordRegistry_basic");
 var cond = newWhere()
             .and("TASK.KIND", $KeywordRegistry.taskType$ticket())
             .andIfSet("TICKET.TICKETTYPE", "$param.TicketType_param")
+            .andIfSet("TICKET.INBOX_ID", "$param.InboxId_param")
+            .andIfSet("TICKET.TICKETID", "$param.TicketId_param")
+var loadNothing = false;
 
-if (vars.getString("$param.FilterOnlyOwnTicket_param") == "true")
+if (Utils.toBoolean(vars.getString("$param.FilterOnlyOwnTicket_param")))
 {
     var ownContactId = EmployeeUtils.getCurrentContactId();
     if (ownContactId)
-        cond.andIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
+    {
+        cond.andIfSet("TICKET.EDITOR_CONTACT_ID", ownContactId);
+    }
     else
+    {
         cond.noResult();
+    }
 }
 
 if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
 {
-    // TODO: more performant way than IN. Maybe a join?
     cond.and("TASK.TASKID", newSelect("TASKLINK.TASK_ID")
                                 .from("TASKLINK")
                                 .where("TASKLINK.OBJECT_ROWID", "$param.RowId_param")
@@ -31,4 +38,9 @@ if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
 cond.andIfSet("TASK.PARENT_ID", "$param.ParentId_param");
 cond.andIfSet("TASK.PARENT_CONTEXT", "$param.ParentContext_param");
 
+
+if (vars.get("$param.ReturnEmpty_param"))
+{
+    cond.and( "TICKET.TICKETID = ''");
+}
 result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..65d6b67c6e0affc794a04043f264fa103f4c2ba0
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("AttributeFilter_lib");
+
+var sqlCond = AttributeFilterExtensionMaker.makeFilterConditionSql();
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..209ddd39ef4a15b1190ef2bd4955ccdc78f5808b
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterFieldsProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("AttributeFilter_lib");
+
+var fields = AttributeFilterExtensionMaker.makeFilterFields();
+result.string(fields);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..942b0a0495a179f9c25d19330bb8cd59c5563ec0
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("AttributeFilter_lib");
+
+var values = AttributeFilterExtensionMaker.makeFilterValues();
+result.object(values);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/groupQueryProcess.js b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5c09eda45982390fdc008bbc9ea10e612904001
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/attribute_filter/groupQueryProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("AttributeFilter_lib");
+
+var sqlCond = AttributeFilterExtensionMaker.makeFilterGroupQuery("TICKET \n\
+    left join TASK on TICKET.TASK_ID = TASKID \n\
+    left join INBOX on (INBOX.INBOXID = TICKET.INBOX_ID) \n\
+    left join MAILSIGNATURE on (TICKET.MAILSIGNATURE_ID = MAILSIGNATURE.MAILSIGNATUREID)");
+result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js b/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js
index 12885dc890edd5411d5e080ca1a7a98af3088223..5c12664f513a1c3fa387e24516a9e8cdab40026a 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,3 +1,7 @@
 import("system.result");
 
-result.string("TICKET left join TASK on TASK_ID = TASKID");
\ No newline at end of file
+result.string("TICKET"
+    +" left join TASK on TICKET.TASK_ID = TASKID"
+    +" left join INBOX on (INBOX.INBOXID = TICKET.INBOX_ID)"
+    +" left join MAILSIGNATURE on (TICKET.MAILSIGNATURE_ID = MAILSIGNATURE.MAILSIGNATUREID)"
+);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js b/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js
index 78bd440b5d0cbcb7c719a180857243d6e01f12d3..f91dca96abd0e14561a6354a30740a9923c30cbf 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js
@@ -3,9 +3,18 @@ import("Context_lib");
 import("system.vars");
 import("Attribute_lib");
 import("Sql_lib");
+import("system.entities");
 
 newWhereIfSet("TASKLINK.TASK_ID", "$field.TASK_TASKID").deleteData();
 
+var documents = entities.getRows(entities.createConfigForLoadingConsumerRows().consumer("Documents").fields(["#UID"]));
+documents.forEach(function(pDocument)
+{
+    entities.deleteRow(entities.createConfigForDeletingRows().entity("Document_entity").uid(pDocument["#UID"]))
+}
+)
+
+
 new AttributeRelationQuery(vars.get("$field.TICKETID"), null, ContextUtils.getCurrentContextId())
     .deleteAllAttributes();
     
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
index c7eaf9c304a1754c867ff7c4f6f41324fa63e2ea..b0e2ba2318e43059a467e4ccc505c9f0d5645a34 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
@@ -1,9 +1,97 @@
+import("Sql_lib");
+import("system.translate");
+import("system.util");
+import("system.tools");
+import("KeywordRegistry_basic");
+import("system.datetime");
 import("Workflow_lib");
 import("Util_lib");
 import("system.vars");
-import("system.db");
 import("ActivityTask_lib")
 
+var TicketfieldValues = {};
+
+//Set DATE_BEGIN if Editor is given.
+if (vars.get("$field.TICKET_EDITOR_CONTACT_ID"))
+{
+   TicketfieldValues["DATE_BEGIN"] = vars.get("$sys.date");
+}
+//Set DATE_END if ticket is closed and DATE_END was not yet set.
+if (vars.get("$field.TASK_STATUS") == $KeywordRegistry.taskStatus$ended() && (vars.get("field.DATE_END") == null || vars.get("field.DATE_END") == ""))
+{
+    TicketfieldValues["DATE_END"] = vars.get("$sys.date");
+}
+
+//Set Mailsignature by Inbox_ID
+if (vars.get("$field.INBOX_ID"))
+{
+    var mailsig = newSelect("MAILSIGNATURE.MAILSIGNATUREID")
+                  .from("MAILSIGNATURE")
+                  .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID"))
+                  .cell();
+    TicketfieldValues["MAILSIGNATURE_ID"] = mailsig;
+}
+//ACTIONS
+var actionName = vars.get("$param.ActionName_param");
+if( actionName == "duplicateTicket")
+{
+    //get variables
+    var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS]
+    var ticketID = vars.get("$field.TICKETID");
+    var ticketIDold = vars.get("$param.TicketId_param");
+
+    //get codes und bring them to correct length
+    var max = newSelect("max(" + "CODE" + ")").from("TICKET").cell();
+    if (!max)
+    {
+        max = -1;
+    }
+    var code = [parseInt(max)+1];
+    code = ('0000000' + code).slice(-7);
+
+    var codeold = vars.get("$param.TicketNo_param");
+    codeold = ('0000000' + codeold).slice(-7);
+
+    ///CREATE ACTIVITY for new Ticket
+    var DataPreset =
+    {
+        "directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
+        "subject"            : translate.text("Ticket duplicated (duplicate)"),
+        "content"            : translate.text("Ticket created through duplication by") + ': '
+                               + obj_toolsUser[tools.FIRSTNAME] +" "+ obj_toolsUser[tools.LASTNAME] + ". "
+                               + translate.text("Ticket number of the original ticket") + ': ' + codeold,  
+        "categoryKeywordId"  : $KeywordRegistry.activityCategory$sys() 
+    }
+    var ActivityLink =
+    {
+        "SupportTicket"  : ticketID
+    }
+    
+    ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+
+    ///CREATE ACTIVITY for old Ticket
+    DataPreset =
+    {
+        "directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
+        "subject"            : translate.text("Ticket duplicated (original)"),
+        "content"            : translate.text("Ticket was duplicated by") + ': '+ obj_toolsUser[tools.FIRSTNAME] +" "
+                               + obj_toolsUser[tools.LASTNAME] + ". "
+                               + translate.text("Ticket number of the created ticket") + ': ' + code,
+        "categoryKeywordId"  : $KeywordRegistry.activityCategory$sys() 
+    }
+    ActivityLink =
+    {
+        "SupportTicket"  : ticketIDold
+    }
+    
+    ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+   // end  ACTIVITY
+        
+}
+
+// Update Ticket
+newWhere("TICKET.TICKETID", "$field.TICKETID").updateFields(TicketfieldValues);
+
 ConsecutiveCodeUtils.setCode(vars.get("$local.uid"), "TICKET", "TICKETID", "CODE");
 
 WorkflowSignalSender.inserted();
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
index 2e53f3cad9a9edf21cc5bbc6fdecc00c5001dfee..619577da197540f995cccb42345dff94ee24f4e9 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,112 @@
+import("ActivityTask_lib");
+import("system.datetime");
+import("system.tools");
 import("Workflow_lib");
+import("Sql_lib");
+import("system.util");
+import("Entity_lib");
+import("system.neon");
+import("system.vars");
+import("system.translate");
+import("KeywordRegistry_basic");
+
+var editor = vars.get("$field.TICKET_EDITOR_CONTACT_ID");
+var date_begin = vars.get("$field.DATE_BEGIN");
+var date_end = vars.get ("$field.DATE_END");
+var status = vars.get("$field.TASK_STATUS");
+const ticketID = vars.get("$field.TICKETID");
+
+var TicketfieldValues = {};
+var TaskfieldValues = {};
+
+if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    //Set DATE_BEGIN if Editor is given and it was not yet set.
+    if (editor != null && editor != "" && (date_begin == null || date_begin == ""))
+    {
+        TicketfieldValues["DATE_BEGIN"] = vars.get("$sys.date");
+    }
+    //Set DATE_END if ticket is closed and DATE_END was not yet set.
+    if (status == $KeywordRegistry.taskStatus$ended() && (date_end == null || date_end == ""))
+    {
+        TicketfieldValues["DATE_END"] = vars.get("$sys.date");
+    }
+    //Set Mailsignature by Inbox_ID
+    if (vars.get("$field.INBOX_ID"))
+    {
+        var mailsig = newSelect("MAILSIGNATURE.MAILSIGNATUREID")
+                      .from("MAILSIGNATURE")
+                      .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID"))
+                      .cell();
+        TicketfieldValues["MAILSIGNATURE_ID"] = mailsig;
+    }
+    
+    //ACTIONS
+    var actionName = vars.get("$param.ActionName_param");
+
+    // After change status redirect to home dashboard
+    if ( (actionName == "sendTicketBackAction") || (actionName == "changeStatusAfterForwardEmail"))
+    {
+        newWhereIfSet("TICKET.TICKETID", vars.get("field.TICKETID")).updateFields(TicketfieldValues);
+        neon.openHome();
+    }
+    ///RESUBMIT TICKETS
+    else if( actionName == "resubmitTicket")
+    {
+        TaskfieldValues["STATUS"] = $KeywordRegistry.taskStatus$resubmitted();
+        TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
+        ///CREATE ACTIVITY
+        var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS]
+        
+        var DataPreset =
+        {
+            "directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
+            "subject"            : translate.text("Ticket resubmitted"),
+            "content"            : translate.text("Ticket resubmitted by") + ': '+ obj_toolsUser[tools.FIRSTNAME] +" "
+                                   + obj_toolsUser[tools.LASTNAME] + ". "
+                                   + translate.text("New date due") + ": " 
+                                   + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy"),
+            "categoryKeywordId"  : $KeywordRegistry.activityCategory$sys() 
+        }
+        var ActivityLink =
+        {
+            "SupportTicket"  : ticketID
+        }
+    
+        ActivityUtils.insertNewActivity(DataPreset, ActivityLink); 
+        // end  ACTIVITY
+    }
+
+    ///RETURN TICKETS
+    else if( actionName == "returnTicket")
+    {
+        var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS];
+        
+        DataPreset =
+        {
+            "directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
+            "subject"            : translate.text("Ticket returned"),
+            "content"            : translate.text("Ticket returned to pool") + ". "
+                                   +"\n"+  translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue") 
+                                   +"\n"+ translate.text("Returned by") + ": "+ obj_toolsUser[tools.FIRSTNAME] +" "+ obj_toolsUser[tools.LASTNAME],
+            "categoryKeywordId"  : $KeywordRegistry.activityCategory$sys() 
+        }
+        ActivityLink =
+        {
+            "SupportTicket"  : ticketID
+        }
+    
+        ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+
+        //change Ticketstatus, editor & DATE_EDIT_STATUS
+        TaskfieldValues["STATUS"] = $KeywordRegistry.taskStatus$unassigned();
+        TicketfieldValues["EDITOR_CONTACT_ID"] = "";
+        TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
+        TicketfieldValues["INBOX_ID"] = vars.get("$field.INBOX_ID");
+        TicketfieldValues["CATEGORY"] = vars.get("$field.INBOX_ID");
+    }    
+    newWhere("TICKET.TICKETID","$field.TICKETID").updateFields(TicketfieldValues);
+    newWhere("TASK.TASKID", "$field.TASK_ID").updateFields(TaskfieldValues);
+}
 
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js b/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js
index e1eed9e6c15fff6062b3ed8161413699d5301f28..0e288520769a327ff42141d7d00eb083ba9c9766 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js
@@ -1,4 +1,4 @@
 import("system.db");
 import("system.result");
 
-result.object({"TASK.MATURITY_DATE": db.DESCENDING});
\ No newline at end of file
+result.object({"TASK.START_DATE": db.DESCENDING});
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commemail.value/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commemail.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..f20d87dda4bdbf124378e76890774d412f959dcc
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commemail.value/expression.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Communication_lib");
+
+var res = CommUtil.getStandardSubSqlMail(vars.get("$field.TASK_REQUESTOR_CONTACT_ID"));
+result.string(res);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commphone.value/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commphone.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..f203897fab08a537c2a62c10d50623dffa76fdff
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/commphone.value/expression.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Communication_lib");
+
+var res = CommUtil.getStandardSubSqlPhone(vars.get("$field.TASK_REQUESTOR_CONTACT_ID"));
+result.string(res);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..6907e38ad6bd3a3081ad1c21895dd92e14a8f0ab
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/conclusion.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("Keyword_lib");
+import("system.result");
+
+
+result.string( KeywordUtils.getResolvedTitleSqlPart("TICKETCONCLUSION", "CONCLUSION"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f6111d7a8e2e464e0bd18e854a3660f2f31b97b
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/inbox_id.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("INBOX.NAME");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/isoverdue.value/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/isoverdue.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..83b3fe27ef59495495165d340770963f7e70f0ff
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/isoverdue.value/expression.js
@@ -0,0 +1,8 @@
+import("system.datetime");
+import("system.vars");
+import("Sql_lib");
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string( SqlBuilder.caseStatement().when("TASK.MATURITY_DATE", datetime.date(), SqlBuilder.GREATER()).then("''").when( "TASK.MATURITY_DATE is null").then("''").when( "TASK.STATUS", $KeywordRegistry.taskPriority()).then("''").elseString("true"));
+
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/mailsignature_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/mailsignature_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..431c251971a7443af814612e32eaba92132f79ea
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/mailsignature_id.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("MAILSIGNATURE.MAIL_ADDRESS");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9eaddb99c640bc07bbb94e8255025b64c77b2000
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.activityCategory(), "TICKET.MEDIUM");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js
index 8e7ea35c7f489e257f771a9f67d1672d35817c4b..b4fcbb2f5e478864527cee2001c5a58ef165ffe8 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js
@@ -1,5 +1,5 @@
 import("system.result");
 import("Person_lib");
 
-var subSql = PersUtils.getResolvingDisplaySubSql("TASK.EDITOR_CONTACT_ID");
+var subSql = PersUtils.getResolvingDisplaySubSql("TICKET.EDITOR_CONTACT_ID");
 result.string(subSql);
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 5ed8cdb6fa66ea4a85f04f5127a74962d49ebcb9..f9e36991afa68d2c70b404fc27ed46bf89db78b2 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -355,6 +355,12 @@
       <name>TYPE</name>
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
     </entityField>
+    <entityActionField>
+      <name>newSupportticket</name>
+      <title>New Service ticket</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CHAT</iconId>
+    </entityActionField>
     <entityField>
       <name>COUNT</name>
       <title>Count</title>
@@ -484,7 +490,7 @@
     </entityField>
     <entityField>
       <name>connections</name>
-      <title>Verknüpfungen</title>
+      <title>Verknuepfungen</title>
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>
@@ -581,12 +587,6 @@
       <state>DISABLED</state>
       <stateProcess>%aditoprj%/entity/Task_entity/entityfields/setcompletepreview/stateProcess.js</stateProcess>
     </entityActionField>
-    <entityActionField>
-      <name>newSupportticket</name>
-      <title>New Support ticket</title>
-      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CHAT</iconId>
-    </entityActionField>
     <entityActionField>
       <name>newOffer</name>
       <title>New offer</title>
diff --git a/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js
index f5cf5b50aec0e1cd4bd55aabc1c5a14e45d54c06..7022315c7ba2eb674f5337f5c29aee15215f4590 100644
--- a/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js
+++ b/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-import("Ticket_lib");
-
-TicketUtils.createNewTicket(undefined, undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TASKID"))
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+import("Ticket_lib");
+
+TicketUtils.createNewTicket(vars.get("$field.TASKID"), undefined, ContextUtils.getCurrentContextId(), vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index eae978b187ac5bf1a41def9a0639c7cc7da41577..22b50792d37bd928bb34fa5ff86e655a26c06516 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -241,6 +241,10 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityProvider>
+      <name>WorkflowsWithKey</name>
+      <lookupIdfield>KEY</lookupIdfield>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 961cafefc6b45b839a923d43efd857fc9b698b1a..cd1488dab68e6dc45f0a3dac32873e2485063d14 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7269,6 +7269,348 @@
     <entry>
       <key>Probability in %</key>
     </entry>
+    <entry>
+      <key>#rememberme</key>
+    </entry>
+    <entry>
+      <key>Valid</key>
+    </entry>
+    <entry>
+      <key>#login</key>
+    </entry>
+    <entry>
+      <key>Inbox</key>
+    </entry>
+    <entry>
+      <key>Inbox filter groups</key>
+    </entry>
+    <entry>
+      <key>Inbox filters</key>
+    </entry>
+    <entry>
+      <key>no inbox</key>
+    </entry>
+    <entry>
+      <key>inboxEmail</key>
+    </entry>
+    <entry>
+      <key>Inbox filter group</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Mail)</key>
+    </entry>
+    <entry>
+      <key>no USER for inboxEmail</key>
+    </entry>
+    <entry>
+      <key>Please select a Inbox</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Medium)</key>
+    </entry>
+    <entry>
+      <key>inboxes</key>
+    </entry>
+    <entry>
+      <key>Change inbox</key>
+    </entry>
+    <entry>
+      <key>Forward ticket to other inbox</key>
+    </entry>
+    <entry>
+      <key>Forward ticket</key>
+    </entry>
+    <entry>
+      <key>Employee Groups</key>
+    </entry>
+    <entry>
+      <key>inbox</key>
+    </entry>
+    <entry>
+      <key>Daily goal</key>
+    </entry>
+    <entry>
+      <key>no Goal</key>
+    </entry>
+    <entry>
+      <key>Employee groups</key>
+    </entry>
+    <entry>
+      <key>Inbox Name</key>
+    </entry>
+    <entry>
+      <key>Averages Tickets Employee</key>
+    </entry>
+    <entry>
+      <key>no inboxEmail for inbox</key>
+    </entry>
+    <entry>
+      <key>Inbox filter</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Status)</key>
+    </entry>
+    <entry>
+      <key>Reply to All</key>
+    </entry>
+    <entry>
+      <key>Search term</key>
+    </entry>
+    <entry>
+      <key>Status change date</key>
+    </entry>
+    <entry>
+      <key>Employee Group</key>
+    </entry>
+    <entry>
+      <key>Assignment</key>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Medium)</key>
+    </entry>
+    <entry>
+      <key>Statistic</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Status)</key>
+    </entry>
+    <entry>
+      <key>Reply Template</key>
+    </entry>
+    <entry>
+      <key>Employee group filter group</key>
+    </entry>
+    <entry>
+      <key>Ticket closure</key>
+    </entry>
+    <entry>
+      <key>Ticket reopen delay</key>
+    </entry>
+    <entry>
+      <key>Ticket closure (days)</key>
+    </entry>
+    <entry>
+      <key>Reply</key>
+    </entry>
+    <entry>
+      <key>Blocking Time</key>
+    </entry>
+    <entry>
+      <key>Employee group filter groups</key>
+    </entry>
+    <entry>
+      <key>Employee group rule groups</key>
+    </entry>
+    <entry>
+      <key>Employee group filters</key>
+    </entry>
+    <entry>
+      <key>Mail Address</key>
+    </entry>
+    <entry>
+      <key>Autoeply settings</key>
+    </entry>
+    <entry>
+      <key>Employee group rules</key>
+    </entry>
+    <entry>
+      <key>Target</key>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Mail)</key>
+    </entry>
+    <entry>
+      <key>Employee group filter</key>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Status)</key>
+    </entry>
+    <entry>
+      <key>Inboxes</key>
+    </entry>
+    <entry>
+      <key>Informations</key>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 2</key>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 3</key>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 1</key>
+    </entry>
+    <entry>
+      <key>Employee group rule group</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Medium)</key>
+    </entry>
+    <entry>
+      <key>Employee group rule</key>
+    </entry>
+    <entry>
+      <key>Ticket reopen delay (days)</key>
+    </entry>
+    <entry>
+      <key>Control editor</key>
+    </entry>
+    <entry>
+      <key>complaint</key>
+    </entry>
+    <entry>
+      <key>undefined</key>
+    </entry>
+    <entry>
+      <key>active</key>
+    </entry>
+    <entry>
+      <key>rule editor</key>
+    </entry>
+    <entry>
+      <key>Pull Tickets</key>
+    </entry>
+    <entry>
+      <key>all</key>
+    </entry>
+    <entry>
+      <key>Blocking Time Agent</key>
+    </entry>
+    <entry>
+      <key>Business E-Mail</key>
+    </entry>
+    <entry>
+      <key>AVAILABLE</key>
+    </entry>
+    <entry>
+      <key>Additional Info</key>
+    </entry>
+    <entry>
+      <key>Change selected</key>
+    </entry>
+    <entry>
+      <key>Blocking Time (days)</key>
+    </entry>
+    <entry>
+      <key>Business Fax</key>
+    </entry>
+    <entry>
+      <key>UNAVAILABLE</key>
+    </entry>
+    <entry>
+      <key>CUSTOMER CARD</key>
+    </entry>
+    <entry>
+      <key>Account balanced</key>
+    </entry>
+    <entry>
+      <key>Client</key>
+    </entry>
+    <entry>
+      <key>Mail activities</key>
+    </entry>
+    <entry>
+      <key>All activities</key>
+    </entry>
+    <entry>
+      <key>Blocking time (Minute)</key>
+    </entry>
+    <entry>
+      <key>Business Mobile</key>
+    </entry>
+    <entry>
+      <key>Current ticket</key>
+    </entry>
+    <entry>
+      <key>change selected</key>
+    </entry>
+    <entry>
+      <key>Blocking Time Agent (hours)</key>
+    </entry>
+    <entry>
+      <key>Body</key>
+    </entry>
+    <entry>
+      <key>Business Phone</key>
+    </entry>
+    <entry>
+      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+    </entry>
+    <entry>
+      <key>done</key>
+    </entry>
+    <entry>
+      <key>request</key>
+    </entry>
+    <entry>
+      <key>Resolved tickets</key>
+    </entry>
+    <entry>
+      <key>processing</key>
+    </entry>
+    <entry>
+      <key>internal reply</key>
+    </entry>
+    <entry>
+      <key>Tickets in process</key>
+    </entry>
+    <entry>
+      <key>re-open</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>entry</key>
+    </entry>
+    <entry>
+      <key>Ticket daily goals</key>
+    </entry>
+    <entry>
+      <key>Team leader dashboard</key>
+    </entry>
+    <entry>
+      <key>Reporting</key>
+    </entry>
+    <entry>
+      <key>reply</key>
+    </entry>
+    <entry>
+      <key>Back to report</key>
+    </entry>
+    <entry>
+      <key>Reset settings</key>
+    </entry>
+    <entry>
+      <key>Report Settings</key>
+    </entry>
+    <entry>
+      <key>Re-Open</key>
+    </entry>
+    <entry>
+      <key>Date/Periode</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 4</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 3</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 2</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 1</key>
+    </entry>
+    <entry>
+      <key>Only show results</key>
+    </entry>
+    <entry>
+      <key>Forward Ticket</key>
+    </entry>
+    <entry>
+      <key>To</key>
+    </entry>
     <entry>
       <key>Standard City</key>
     </entry>
@@ -7287,12 +7629,6 @@
     <entry>
       <key>Email address</key>
     </entry>
-    <entry>
-      <key>#rememberme</key>
-    </entry>
-    <entry>
-      <key>#login</key>
-    </entry>
     <entry>
       <key>Last change</key>
     </entry>
@@ -7320,9 +7656,6 @@
     <entry>
       <key>Text content</key>
     </entry>
-    <entry>
-      <key>Reply</key>
-    </entry>
     <entry>
       <key>All Knowledge Entries</key>
     </entry>
@@ -7467,9 +7800,6 @@
     <entry>
       <key>Knowledge Roles</key>
     </entry>
-    <entry>
-      <key>Valid</key>
-    </entry>
     <entry>
       <key>Audit Logs</key>
     </entry>
@@ -8050,49 +8380,376 @@
       <key>by translated name</key>
     </entry>
     <entry>
-      <key>Sent offers</key>
+      <key>Sent offers</key>
+    </entry>
+    <entry>
+      <key>Calendar week</key>
+    </entry>
+    <entry>
+      <key>by name</key>
+    </entry>
+    <entry>
+      <key>by sorting</key>
+    </entry>
+    <entry>
+      <key>Starts the server process manually, which will recalculate all (potentially) outdated classifications. This process should be executed after changes to the classification configuration.</key>
+    </entry>
+    <entry>
+      <key>Recalculate Classifications</key>
+    </entry>
+    <entry>
+      <key>Are you sure you want to recalculate all classifications using the current classificationgradings? This can take some time, since ALL classifications will get freshly calculated and updated if needed.</key>
+    </entry>
+    <entry>
+      <key>Starts the server process manually, which will recalculate all classifications from scratch. This process should only be executed after importing data from elsewhere, where the outdated flag couldn't be set correctly, since this can take some time.</key>
+    </entry>
+    <entry>
+      <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
+    </entry>
+    <entry>
+      <key>The duplicate row corrosponding to %0 has been rebuild</key>
+    </entry>
+    <entry>
+      <key>Duplicaterow rebuild</key>
+    </entry>
+    <entry>
+      <key>Edit HTML</key>
+    </entry>
+    <entry>
+      <key>HTML Editor</key>
+    </entry>
+    <entry>
+      <key>Add to order</key>
+    </entry>
+    <entry>
+      <key>Add to offer</key>
+    </entry>
+    <entry>
+      <key>BCC</key>
+    </entry>
+    <entry>
+      <key>Days nr.</key>
+    </entry>
+    <entry>
+      <key>billing amount</key>
+    </entry>
+    <entry>
+      <key>starting from D€</key>
+    </entry>
+    <entry>
+      <key>Document Templates</key>
+    </entry>
+    <entry>
+      <key>Shows hom many sales projects are in their corresponding sales phase.</key>
+    </entry>
+    <entry>
+      <key>Email content</key>
+    </entry>
+    <entry>
+      <key>%0 Task(s) sucessfully forwarded to: %1</key>
+    </entry>
+    <entry>
+      <key>Data record</key>
+    </entry>
+    <entry>
+      <key>Page</key>
+    </entry>
+    <entry>
+      <key>Change Ticket Status</key>
+    </entry>
+    <entry>
+      <key>CC</key>
+    </entry>
+    <entry>
+      <key>Daily goals</key>
+    </entry>
+    <entry>
+      <key>Date Field</key>
+    </entry>
+    <entry>
+      <key>starting at 1000</key>
+    </entry>
+    <entry>
+      <key>Send via Mail</key>
+    </entry>
+    <entry>
+      <key>Support tickets</key>
+    </entry>
+    <entry>
+      <key>Content to forward</key>
+    </entry>
+    <entry>
+      <key>Chart Inbox Tickets</key>
+    </entry>
+    <entry>
+      <key>limit</key>
+    </entry>
+    <entry>
+      <key>Participant is already participating</key>
+    </entry>
+    <entry>
+      <key>CONTACTID (UUID)</key>
+    </entry>
+    <entry>
+      <key>Person in Charge</key>
+    </entry>
+    <entry>
+      <key>@Reply</key>
+    </entry>
+    <entry>
+      <key>New support ticket</key>
+    </entry>
+    <entry>
+      <key>Task maturity date</key>
+    </entry>
+    <entry>
+      <key>New note</key>
+    </entry>
+    <entry>
+      <key>Return ticket</key>
+    </entry>
+    <entry>
+      <key>Alternative email address</key>
+    </entry>
+    <entry>
+      <key>Alternative phone number</key>
+    </entry>
+    <entry>
+      <key>Phone of contact</key>
+    </entry>
+    <entry>
+      <key>Email of contact</key>
+    </entry>
+    <entry>
+      <key>Complaint about advertisement</key>
+    </entry>
+    <entry>
+      <key>Alternative phone</key>
+    </entry>
+    <entry>
+      <key>Cancellation of order</key>
+    </entry>
+    <entry>
+      <key>Complaint about product</key>
+    </entry>
+    <entry>
+      <key>Complaint about employee</key>
+    </entry>
+    <entry>
+      <key>Query about product</key>
+    </entry>
+    <entry>
+      <key>Alternative email</key>
+    </entry>
+    <entry>
+      <key>Other complaint</key>
+    </entry>
+    <entry>
+      <key>Cancellation of subscription</key>
+    </entry>
+    <entry>
+      <key>Query other</key>
+    </entry>
+    <entry>
+      <key>Complaint</key>
+    </entry>
+    <entry>
+      <key>Last status change</key>
+    </entry>
+    <entry>
+      <key>New status</key>
+    </entry>
+    <entry>
+      <key>Email subject</key>
+    </entry>
+    <entry>
+      <key>Conclusion</key>
+    </entry>
+    <entry>
+      <key>Review</key>
+    </entry>
+    <entry>
+      <key>Domain</key>
+    </entry>
+    <entry>
+      <key>Template No.</key>
+    </entry>
+    <entry>
+      <key>Mature after days</key>
+    </entry>
+    <entry>
+      <key>Supportticket Templates</key>
+    </entry>
+    <entry>
+      <key>Supportticket Template</key>
+    </entry>
+    <entry>
+      <key>Properties</key>
+    </entry>
+    <entry>
+      <key>Support ticket template</key>
+    </entry>
+    <entry>
+      <key>Supportticket templates</key>
+    </entry>
+    <entry>
+      <key>Reopen delay</key>
+    </entry>
+    <entry>
+      <key>Closure</key>
+    </entry>
+    <entry>
+      <key>days</key>
+    </entry>
+    <entry>
+      <key>day</key>
+    </entry>
+    <entry>
+      <key>Unresolved Tickets</key>
+    </entry>
+    <entry>
+      <key>Show tickets that are not resolved</key>
+    </entry>
+    <entry>
+      <key>Show tickets I am the editor of</key>
+    </entry>
+    <entry>
+      <key>Open tickets</key>
+    </entry>
+    <entry>
+      <key>Show unresolved tickets</key>
+    </entry>
+    <entry>
+      <key>Show open tickets</key>
+    </entry>
+    <entry>
+      <key>Show my tickets that are in process</key>
+    </entry>
+    <entry>
+      <key>Show resolved tickets</key>
+    </entry>
+    <entry>
+      <key>Show the number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Medium)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Status)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Mail)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Status)</key>
+    </entry>
+    <entry>
+      <key>Shows a chart for my target number of daily tickets</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Medium)</key>
+    </entry>
+    <entry>
+      <key>Show inboxes</key>
+    </entry>
+    <entry>
+      <key>Unresolved tickets</key>
+    </entry>
+    <entry>
+      <key>Next ticket</key>
+    </entry>
+    <entry>
+      <key>Pull next ticket</key>
+    </entry>
+    <entry>
+      <key>Pull tickets</key>
+    </entry>
+    <entry>
+      <key>contact formular</key>
+    </entry>
+    <entry>
+      <key>Failure (employee)</key>
+    </entry>
+    <entry>
+      <key>Failure (customer)</key>
+    </entry>
+    <entry>
+      <key>Success</key>
+    </entry>
+    <entry>
+      <key>Supportticket template</key>
+    </entry>
+    <entry>
+      <key>Ticket filters</key>
+    </entry>
+    <entry>
+      <key>Ticket template</key>
+    </entry>
+    <entry>
+      <key>Support ticket templates</key>
+    </entry>
+    <entry>
+      <key>Default ticket template</key>
+    </entry>
+    <entry>
+      <key>Template</key>
+    </entry>
+    <entry>
+      <key>ticket no.</key>
+    </entry>
+    <entry>
+      <key>reopen Ticket</key>
+    </entry>
+    <entry>
+      <key>duplicate Ticket</key>
+    </entry>
+    <entry>
+      <key>dupliacte Ticket</key>
     </entry>
     <entry>
-      <key>Calendar week</key>
+      <key>Resubmission</key>
     </entry>
     <entry>
-      <key>by name</key>
+      <key>Resubmit ticket</key>
     </entry>
     <entry>
-      <key>by sorting</key>
+      <key>resubmitted</key>
     </entry>
     <entry>
-      <key>Starts the server process manually, which will recalculate all (potentially) outdated classifications. This process should be executed after changes to the classification configuration.</key>
+      <key>Attribute filter</key>
     </entry>
     <entry>
-      <key>Recalculate Classifications</key>
+      <key>Comparison method</key>
     </entry>
     <entry>
-      <key>Are you sure you want to recalculate all classifications using the current classificationgradings? This can take some time, since ALL classifications will get freshly calculated and updated if needed.</key>
+      <key>The value in the "Threshold" field must be between 0 and 100.</key>
     </entry>
     <entry>
-      <key>Starts the server process manually, which will recalculate all classifications from scratch. This process should only be executed after importing data from elsewhere, where the outdated flag couldn't be set correctly, since this can take some time.</key>
+      <key>Attribute filters</key>
     </entry>
     <entry>
-      <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
+      <key>Contact Info</key>
     </entry>
     <entry>
-      <key>The duplicate row corrosponding to %0 has been rebuild</key>
+      <key>Forward</key>
     </entry>
     <entry>
-      <key>Duplicaterow rebuild</key>
+      <key>Service ticket template</key>
     </entry>
     <entry>
-      <key>Edit HTML</key>
+      <key>Duplicate Ticket</key>
     </entry>
     <entry>
-      <key>HTML Editor</key>
+      <key>Service ticket</key>
     </entry>
     <entry>
-      <key>Add to order</key>
+      <key>Follow-Up</key>
     </entry>
     <entry>
-      <key>Add to offer</key>
+      <key>Return Ticket</key>
     </entry>
     <entry>
       <key>Event Data</key>
@@ -8118,9 +8775,6 @@
     <entry>
       <key>On site</key>
     </entry>
-    <entry>
-      <key>Participant is already participating</key>
-    </entry>
     <entry>
       <key>incl. Dependencies</key>
     </entry>
@@ -9298,18 +9952,345 @@
     <entry>
       <key>Set workflow for selected e-mail filter</key>
     </entry>
+    <entry>
+      <key>Campaign steps</key>
+    </entry>
+    <entry>
+      <key>Attribute determination</key>
+    </entry>
+    <entry>
+      <key>Valid from (as</key>
+    </entry>
+    <entry>
+      <key>Note</key>
+    </entry>
+    <entry>
+      <key>Classification:</key>
+    </entry>
+    <entry>
+      <key>Please check if the following fields are filled correctly:
+                - Project title
+                - Organisation
+                - Status
+                - Project start(Date)
+                - Project type</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\
+                %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Exchange Rate</key>
+    </entry>
+    <entry>
+      <key>Further informations</key>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind.</key>
+    </entry>
+    <entry>
+      <key>Only</key>
+    </entry>
+    <entry>
+      <key>Category determination</key>
+    </entry>
+    <entry>
+      <key>determined in</key>
+    </entry>
+    <entry>
+      <key>Price in</key>
+    </entry>
+    <entry>
+      <key>We save your data until</key>
+    </entry>
+    <entry>
+      <key>Alt. Phone</key>
+    </entry>
+    <entry>
+      <key>Alt. E-Mail</key>
+    </entry>
+    <entry>
+      <key>Create new note</key>
+    </entry>
+    <entry>
+      <key>Reply to</key>
+    </entry>
+    <entry>
+      <key>Enter new Ticket &amp; Contact</key>
+    </entry>
+    <entry>
+      <key>Enter new Ticket</key>
+    </entry>
+    <entry>
+      <key>employee checks</key>
+    </entry>
+    <entry>
+      <key>Re-open</key>
+    </entry>
+    <entry>
+      <key>Serviceticket category</key>
+    </entry>
+    <entry>
+      <key>Use all serviceticket categories</key>
+    </entry>
+    <entry>
+      <key>Serviceticket categories</key>
+    </entry>
+    <entry>
+      <key>Query</key>
+    </entry>
+    <entry>
+      <key>New Service ticket</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmitted</key>
+    </entry>
+    <entry>
+      <key>New service ticket</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmitted by</key>
+    </entry>
+    <entry>
+      <key>New date due</key>
+    </entry>
+    <entry>
+      <key>Conclusion (Mailbridge)</key>
+    </entry>
+    <entry>
+      <key>Contact &amp; Serviceticket</key>
+    </entry>
+    <entry>
+      <key>Reply Mail</key>
+    </entry>
+    <entry>
+      <key>Send Answer Mail</key>
+    </entry>
+    <entry>
+      <key>inactive</key>
+    </entry>
+    <entry>
+      <key>Rule editor</key>
+    </entry>
+    <entry>
+      <key>Dates</key>
+    </entry>
+    <entry>
+      <key>processing time</key>
+    </entry>
+    <entry>
+      <key>Ticket number of the created ticket</key>
+    </entry>
+    <entry>
+      <key>Take Ticket</key>
+    </entry>
+    <entry>
+      <key>Ticket duplicated (duplicate)</key>
+    </entry>
+    <entry>
+      <key>Ticket was duplicated by</key>
+    </entry>
+    <entry>
+      <key>Ticket duplicated (original)</key>
+    </entry>
+    <entry>
+      <key>Ticket created through duplication by</key>
+    </entry>
+    <entry>
+      <key>Ticket number of the original ticket</key>
+    </entry>
     <entry>
       <key>GDPR-anonymization</key>
     </entry>
+    <entry>
+      <key>Single (Service/External)</key>
+    </entry>
     <entry>
       <key>During processing the e-mail an error has occurred.\nPlease contact an administrator.</key>
     </entry>
+    <entry>
+      <key>Single (Service/Internal)</key>
+    </entry>
     <entry>
       <key>private</key>
     </entry>
+    <entry>
+      <key>Single (Service/All)</key>
+    </entry>
     <entry>
       <key>Organisation: Classification</key>
     </entry>
+    <entry>
+      <key>Ticket categories</key>
+    </entry>
+    <entry>
+      <key>Ticket category</key>
+    </entry>
+    <entry>
+      <key>Set as default signature</key>
+    </entry>
+    <entry>
+      <key>Signature to set default</key>
+    </entry>
+    <entry>
+      <key>Existing default signature</key>
+    </entry>
+    <entry>
+      <key>Service tickets</key>
+    </entry>
+    <entry>
+      <key>Service ticket templates</key>
+    </entry>
+    <entry>
+      <key>Status (Mailbridge)</key>
+    </entry>
+    <entry>
+      <key>Service Administration</key>
+    </entry>
+    <entry>
+      <key>Save changes</key>
+    </entry>
+    <entry>
+      <key>Individual Reply Template</key>
+    </entry>
+    <entry>
+      <key>Ziegel</key>
+    </entry>
+    <entry>
+      <key>Mails</key>
+    </entry>
+    <entry>
+      <key>Threshold (in %)</key>
+    </entry>
+    <entry>
+      <key>Informationen</key>
+    </entry>
+    <entry>
+      <key>Pull next ticket or create new ones</key>
+    </entry>
+    <entry>
+      <key>Abgeschlossen</key>
+    </entry>
+    <entry>
+      <key>insertTicket</key>
+    </entry>
+    <entry>
+      <key>Ticket Control Center</key>
+    </entry>
+    <entry>
+      <key>Open Admin View</key>
+    </entry>
+    <entry>
+      <key>getAllTickets</key>
+    </entry>
+    <entry>
+      <key>Mitarbeiter  für  Mitarbeitergruppe</key>
+    </entry>
+    <entry>
+      <key>Show Tickets in process</key>
+    </entry>
+    <entry>
+      <key>getTicketDetails</key>
+    </entry>
+    <entry>
+      <key>Ticket return</key>
+    </entry>
+    <entry>
+      <key>Ticket filter</key>
+    </entry>
+    <entry>
+      <key>Employess</key>
+    </entry>
+    <entry>
+      <key>Pull Ticket</key>
+    </entry>
+    <entry>
+      <key>Service-Admin</key>
+    </entry>
+    <entry>
+      <key>Answer Mail Address</key>
+    </entry>
+    <entry>
+      <key>Serviceagent</key>
+    </entry>
+    <entry>
+      <key>Serviceticket</key>
+    </entry>
+    <entry>
+      <key>ticket entry mailbridge</key>
+    </entry>
+    <entry>
+      <key>Mitterbeitergruppe Postkorb</key>
+    </entry>
+    <entry>
+      <key>Inmob name</key>
+    </entry>
+    <entry>
+      <key>System</key>
+    </entry>
+    <entry>
+      <key>Service Dashboard</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmission</key>
+    </entry>
+    <entry>
+      <key>Open Tickets</key>
+    </entry>
+    <entry>
+      <key>Groups</key>
+    </entry>
+    <entry>
+      <key>E-Mail Adresse</key>
+    </entry>
+    <entry>
+      <key>Attribut</key>
+    </entry>
+    <entry>
+      <key>Mitarbeiters ( für  Mitarbeitergruppe)</key>
+    </entry>
+    <entry>
+      <key>Steine</key>
+    </entry>
+    <entry>
+      <key>Date type</key>
+    </entry>
+    <entry>
+      <key>Ticket Closure</key>
+    </entry>
+    <entry>
+      <key>Default Signature</key>
+    </entry>
+    <entry>
+      <key>New Ticket</key>
+    </entry>
+    <entry>
+      <key>Auswahl bearbeiten</key>
+    </entry>
+    <entry>
+      <key>getKeyword</key>
+    </entry>
+    <entry>
+      <key>Individual Answer</key>
+    </entry>
+    <entry>
+      <key>Supportticket</key>
+    </entry>
+    <entry>
+      <key>Fix</key>
+    </entry>
+    <entry>
+      <key>Buttons</key>
+    </entry>
+    <entry>
+      <key>InboxRelation</key>
+    </entry>
+    <entry>
+      <key>Mail address</key>
+    </entry>
+    <entry>
+      <key>This priority is already assigned.</key>
+    </entry>
     <entry>
       <key>C Shell Script</key>
     </entry>
@@ -9541,9 +10522,6 @@
     <entry>
       <key>Opener rate (in \%)</key>
     </entry>
-    <entry>
-      <key>Open Admin View</key>
-    </entry>
     <entry>
       <key>Remove recipients with advertising appeal</key>
     </entry>
@@ -9760,6 +10738,34 @@
     <entry>
       <key>Paste as Top Topic</key>
     </entry>
+    <entry>
+      <key>Send Answer</key>
+    </entry>
+    <entry>
+      <key>Fullfilled</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Ticket no.</key>
+    </entry>
+    <entry>
+      <key>Checklists</key>
+    </entry>
+    <entry>
+      <key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
+    </entry>
+    <entry>
+      <key>Volume Weighted(€)</key>
+    </entry>
+    <entry>
+      <key>Entry</key>
+    </entry>
+    <entry>
+      <key>Answer Address</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index aae267e85c1a5bfb199e9bc1739db96752baba79..c4aea6edc31d34ccb7c53c628d4e9d3934332520 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,50 @@
       <key>Create new campaign step</key>
       <value>Neue Kampagnenstufe erstellen</value>
     </entry>
+    <entry>
+      <key>Single (Service/Internal)</key>
+      <value>Einzel (Service/Intern)</value>
+    </entry>
+    <entry>
+      <key>Single (Service/External)</key>
+      <value>Einzel (Service/Extern)</value>
+    </entry>
+    <entry>
+      <key>Single (Service/All)</key>
+      <value>Einzel (Service/Alle)</value>
+    </entry>
+    <entry>
+      <key>Ticket was duplicated by</key>
+      <value>Ticket wurde dupliziert. Anwender</value>
+    </entry>
+    <entry>
+      <key>Ticket duplicated (duplicate)</key>
+      <value>Ticket dupliziert (Duplikat)</value>
+    </entry>
+    <entry>
+      <key>processing time</key>
+      <value>Bearbeitungszeit</value>
+    </entry>
+    <entry>
+      <key>Ticket number of the original ticket</key>
+      <value>Ticketnummer des originalen Tickets</value>
+    </entry>
+    <entry>
+      <key>Ticket duplicated (original)</key>
+      <value>Ticket dupliziert (Original)</value>
+    </entry>
+    <entry>
+      <key>Enter new Ticket &amp; Contact</key>
+      <value>Neues Ticket mit Kontakt erstellen</value>
+    </entry>
+    <entry>
+      <key>Ticket resubmitted</key>
+      <value>Wiedervorlage erstellt</value>
+    </entry>
+    <entry>
+      <key>Ticket number of the created ticket</key>
+      <value>Ticketnummer des erstellten Tickets</value>
+    </entry>
     <entry>
       <key>Unsubscribes</key>
       <value>Abmeldungen</value>
@@ -22,6 +66,61 @@
       <key>This year</key>
       <value>Dieses Jahr</value>
     </entry>
+    <entry>
+      <key>Return Ticket</key>
+      <value>Zurückgeben</value>
+    </entry>
+    <entry>
+      <key>Service ticket template</key>
+      <value>Serviceticket-Vorlagen</value>
+    </entry>
+    <entry>
+      <key>Service ticket</key>
+      <value>Serviceticket</value>
+    </entry>
+    <entry>
+      <key>Contact Info</key>
+      <value>Kontaktinformationen</value>
+    </entry>
+    <entry>
+      <key>Template</key>
+    </entry>
+    <entry>
+      <key>Use all serviceticket categories</key>
+      <value>Alle Serviceticket Kategorien verwenden</value>
+    </entry>
+    <entry>
+      <key>reopen Ticket</key>
+      <value>Ticket wiedereröffnen</value>
+    </entry>
+    <entry>
+      <key>Ticket resubmitted by</key>
+      <value>Wiedervorlage erstellt durch</value>
+    </entry>
+    <entry>
+      <key>Resubmission</key>
+      <value>Zurückgabe</value>
+    </entry>
+    <entry>
+      <key>New date due</key>
+      <value>Neues Prüfdatum</value>
+    </entry>
+    <entry>
+      <key>Resubmit ticket</key>
+      <value>Wiedervorlage</value>
+    </entry>
+    <entry>
+      <key>This priority is already assigned.</key>
+      <value>Diese Priorität ist bereits zugewiesen.</value>
+    </entry>
+    <entry>
+      <key>resubmitted</key>
+      <value>Wiedervorgelegt</value>
+    </entry>
+    <entry>
+      <key>Ticket no.</key>
+      <value>Ticket Nr.</value>
+    </entry>
     <entry>
       <key>Event End</key>
       <value>Veranstaltungs Ende</value>
@@ -34,6 +133,10 @@
       <key>Number of openers</key>
       <value>Anzahl Openers</value>
     </entry>
+    <entry>
+      <key>Ticket categories</key>
+      <value>Ticket Kategorie</value>
+    </entry>
     <entry>
       <key>Openers</key>
       <value>Geöffnet</value>
@@ -152,7 +255,7 @@
     </entry>
     <entry>
       <key>Move down</key>
-      <value>Nach unten verschieben</value>
+      <value>Nach unten  verschieben</value>
     </entry>
     <entry>
       <key>Value is too big, the maximum is %0</key>
@@ -190,6 +293,10 @@
       <key>No advertising</key>
       <value>Keine Werbung</value>
     </entry>
+    <entry>
+      <key>Contact &amp; Serviceticket</key>
+      <value>Kontakt &amp; Serviceticket</value>
+    </entry>
     <entry>
       <key>Interest (subscribed)</key>
       <value>Interesse (abonniert)</value>
@@ -204,8 +311,7 @@
     </entry>
     <entry>
       <key>Object not found</key>
-      <value>Objekt nicht gefunden
-</value>
+      <value>Objekt nicht gefunden</value>
     </entry>
     <entry>
       <key>Attributes of attribute group \"%0\" can't be used more than %1.</key>
@@ -1292,7 +1398,6 @@
     </entry>
     <entry>
       <key>We save your data until </key>
-      <value>Wir speichern Ihre Daten bis </value>
     </entry>
     <entry>
       <key>On time</key>
@@ -1634,6 +1739,10 @@
       <key>New tasks</key>
       <value>Neue Aufgaben</value>
     </entry>
+    <entry>
+      <key>Take Ticket</key>
+      <value>Ãœbernehmen</value>
+    </entry>
     <entry>
       <key>New module</key>
       <value>Neuanlage</value>
@@ -1684,8 +1793,7 @@
     </entry>
     <entry>
       <key>Congratulations on being in the Offer Phase</key>
-      <value>Herzlichen Glückwunsch. Sie sind in der Offer Phase
-</value>
+      <value>Herzlichen Glückwunsch. Sie sind in der Offer Phase</value>
     </entry>
     <entry>
       <key>Direction</key>
@@ -2201,6 +2309,7 @@
     </entry>
     <entry>
       <key>0 %</key>
+      <value>0 %</value>
     </entry>
     <entry>
       <key>Location</key>
@@ -2208,12 +2317,15 @@
     </entry>
     <entry>
       <key>75 %</key>
+      <value>75 %</value>
     </entry>
     <entry>
       <key>100 %</key>
+      <value>100 %</value>
     </entry>
     <entry>
       <key>25 %</key>
+      <value>25 %</value>
     </entry>
     <entry>
       <key>Date</key>
@@ -2221,6 +2333,7 @@
     </entry>
     <entry>
       <key>50 %</key>
+      <value>50 %</value>
     </entry>
     <entry>
       <key>check offer again</key>
@@ -2372,8 +2485,7 @@
     </entry>
     <entry>
       <key>Planned</key>
-      <value>Geplant
-</value>
+      <value>Geplant</value>
     </entry>
     <entry>
       <key>Info</key>
@@ -2381,18 +2493,15 @@
     </entry>
     <entry>
       <key>${VOLUME_MONEY}</key>
-      <value>Wert
-</value>
+      <value>Wert</value>
     </entry>
     <entry>
       <key>Milestones</key>
-      <value>Meilensteine
-</value>
+      <value>Meilensteine</value>
     </entry>
     <entry>
       <key>Excreted</key>
-      <value>Ausgeschieden
-</value>
+      <value>Ausgeschieden</value>
     </entry>
     <entry>
       <key>Reason</key>
@@ -2520,6 +2629,7 @@
     </entry>
     <entry>
       <key>Sent Offers</key>
+      <value>Angebote senden</value>
     </entry>
     <entry>
       <key>responsible</key>
@@ -2627,6 +2737,7 @@
     </entry>
     <entry>
       <key>0.00</key>
+      <value>0.00</value>
     </entry>
     <entry>
       <key>Conditions of payment</key>
@@ -2666,6 +2777,7 @@
     </entry>
     <entry>
       <key>#,##0</key>
+      <value>#,##0</value>
     </entry>
     <entry>
       <key>Unitprice</key>
@@ -2701,6 +2813,7 @@
     </entry>
     <entry>
       <key>#,##0.00</key>
+      <value>#,##0.00</value>
     </entry>
     <entry>
       <key>Latin Name</key>
@@ -2806,6 +2919,10 @@
       <key>The order number already exists!</key>
       <value>Die Bestellnummer existiert bereits!</value>
     </entry>
+    <entry>
+      <key>Enter new Ticket</key>
+      <value>Neues Ticket erstellen</value>
+    </entry>
     <entry>
       <key>New activity</key>
       <value>Neue Aktivität</value>
@@ -3040,6 +3157,10 @@
       <key>Sorting</key>
       <value>Sortierung</value>
     </entry>
+    <entry>
+      <key>Conclusion (Mailbridge)</key>
+      <value>Abschluss (Mailbridge)</value>
+    </entry>
     <entry>
       <key>Context id</key>
       <value>Kontext ID</value>
@@ -3432,6 +3553,10 @@
       <key>Mongolia</key>
       <value>Mongolei</value>
     </entry>
+    <entry>
+      <key>Create new note</key>
+      <value>Neue Notiz erstellen</value>
+    </entry>
     <entry>
       <key>Guatemala</key>
       <value>Guatemala</value>
@@ -3764,6 +3889,10 @@
       <key>Panama</key>
       <value>Panama</value>
     </entry>
+    <entry>
+      <key>Send Answer</key>
+      <value>Antwort senden</value>
+    </entry>
     <entry>
       <key>Bonaire, Sint Eustatius and Saba</key>
       <value>Bonaire, Sint Eustatius und Saba</value>
@@ -4388,6 +4517,10 @@
       <key>Albania</key>
       <value>Albanien</value>
     </entry>
+    <entry>
+      <key>Reply Mail</key>
+      <value>Antwortmail</value>
+    </entry>
     <entry>
       <key>Internal sales manager</key>
       <value>Interner Vertrieb</value>
@@ -4407,12 +4540,6 @@
 - Status
 - Project start(Date)
 - Project type</key>
-      <value>Bitte überprüfen Sie ob folgende Felder richtig befüllt sind:
-- Projekttitel
-- Firma
--Status
-- Projektstart (Datum)
-- Projekttyp</value>
     </entry>
     <entry>
       <key>Senegal</key>
@@ -4534,6 +4661,14 @@
       <key>Checkbox</key>
       <value>Checkbox</value>
     </entry>
+    <entry>
+      <key>Dates</key>
+      <value>Daten</value>
+    </entry>
+    <entry>
+      <key>employee checks</key>
+      <value>Mitarbeiter prüft</value>
+    </entry>
     <entry>
       <key>Numeric value</key>
       <value>Zahlenwert</value>
@@ -4644,6 +4779,7 @@
     </entry>
     <entry>
       <key>100%</key>
+      <value>100%</value>
     </entry>
     <entry>
       <key>Mobil</key>
@@ -4651,6 +4787,7 @@
     </entry>
     <entry>
       <key>25%</key>
+      <value>25%</value>
     </entry>
     <entry>
       <key>Second Approval</key>
@@ -4662,9 +4799,11 @@
     </entry>
     <entry>
       <key>50%</key>
+      <value>50%</value>
     </entry>
     <entry>
       <key>75%</key>
+      <value>75%</value>
     </entry>
     <entry>
       <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
@@ -4676,6 +4815,7 @@
     </entry>
     <entry>
       <key>0%</key>
+      <value>0%</value>
     </entry>
     <entry>
       <key>Mauritius</key>
@@ -5171,6 +5311,7 @@
     </entry>
     <entry>
       <key>yyyy-MM-dd HH:mm:ss</key>
+      <value>yyyy-MM-dd HH:mm:ss</value>
     </entry>
     <entry>
       <key>file '%0' does not exist or you have got no permission on this file</key>
@@ -5338,6 +5479,7 @@
     </entry>
     <entry>
       <key>%0 \"%1\"</key>
+      <value>%0 \"%1\"</value>
     </entry>
     <entry>
       <key>Maximal count</key>
@@ -5629,8 +5771,7 @@
     </entry>
     <entry>
       <key>Char value</key>
-      <value>Char-Wert
-</value>
+      <value>Char-Wert</value>
     </entry>
     <entry>
       <key>Attribute relation Id</key>
@@ -5674,8 +5815,7 @@
     </entry>
     <entry>
       <key>CHAR VALUE</key>
-      <value>Char-Wert
-</value>
+      <value>Char-Wert</value>
     </entry>
     <entry>
       <key>Total costs</key>
@@ -5865,6 +6005,10 @@
       <key>Publishing house</key>
       <value>Verlag</value>
     </entry>
+    <entry>
+      <key>inactive</key>
+      <value>inaktiv</value>
+    </entry>
     <entry>
       <key>100 to 199T</key>
       <value>100 bis 199T</value>
@@ -6019,6 +6163,7 @@
     </entry>
     <entry>
       <key>251 to 1,000</key>
+      <value>251 bis 1,000</value>
     </entry>
     <entry>
       <key>Selection</key>
@@ -6190,14 +6335,15 @@
     </entry>
     <entry>
       <key>#0</key>
+      <value>#0</value>
     </entry>
     <entry>
       <key>Email Template</key>
       <value>E-Mail Vorlage</value>
     </entry>
     <entry>
-      <key>New Support ticket</key>
-      <value>Neues Supportticket</value>
+      <key>New Service ticket</key>
+      <value>Neues Serviceticket</value>
     </entry>
     <entry>
       <key>Search for new Entries</key>
@@ -6653,7 +6799,6 @@
     </entry>
     <entry>
       <key>Global Cases</key>
-      <value>Globale Fälle</value>
     </entry>
     <entry>
       <key>Treat</key>
@@ -7212,8 +7357,7 @@
     </entry>
     <entry>
       <key>Accepted call from %0 (%1) to %2, duration: %3</key>
-      <value>Angenommener Anruf von %0 (%1) nach %2, Dauer: %3
-</value>
+      <value>Angenommener Anruf von %0 (%1) nach %2, Dauer: %3</value>
     </entry>
     <entry>
       <key>one file ignored</key>
@@ -7573,7 +7717,6 @@
     </entry>
     <entry>
       <key>Rech.-Betrag</key>
-      <value></value>
     </entry>
     <entry>
       <key>Order date</key>
@@ -7593,7 +7736,6 @@
     </entry>
     <entry>
       <key>Only </key>
-      <value>nur</value>
     </entry>
     <entry>
       <key>Action '</key>
@@ -7675,12 +7817,6 @@
       <key>Offer Id</key>
       <value>Angebots ID</value>
     </entry>
-    <entry>
-      <key>1</key>
-    </entry>
-    <entry>
-      <key>2</key>
-    </entry>
     <entry>
       <key>Theme</key>
       <value>Thema</value>
@@ -7739,7 +7875,6 @@
     </entry>
     <entry>
       <key>Show tickets where I am the editor</key>
-      <value>Zeigt Tickets an, in denen ich der Bearbeiter bin</value>
     </entry>
     <entry>
       <key>Wrong filetype for the current document template type and classification.</key>
@@ -7789,11 +7924,6 @@
       <key>Counsellor</key>
       <value>Berater</value>
     </entry>
-    <entry>
-      <key> User</key>
-      <value>Benutzer
-</value>
-    </entry>
     <entry>
       <key>Interests</key>
       <value>Interessen</value>
@@ -7984,6 +8114,7 @@
     </entry>
     <entry>
       <key>yyyyMMdd</key>
+      <value>yyyyMMdd</value>
     </entry>
     <entry>
       <key>closed</key>
@@ -7999,16 +8130,11 @@
     </entry>
     <entry>
       <key>My Forecast and Turnover </key>
-      <value>Mein Forecast und Umsatz</value>
     </entry>
     <entry>
       <key>Shows my Forecast and Turnover for the actual year</key>
       <value>Zeigt meinen Forecast und meinen Umsatz für das aktuelle Jahr</value>
     </entry>
-    <entry>
-      <key>My Forecast and Turnover</key>
-      <value>Mein Forecast und Umsatz</value>
-    </entry>
     <entry>
       <key>Ignore Duplicate</key>
       <value>Dublette ignorieren</value>
@@ -8385,10 +8511,6 @@
       <key>Import user</key>
       <value>Import Benutzer</value>
     </entry>
-    <entry>
-      <key> Info</key>
-      <value>Info</value>
-    </entry>
     <entry>
       <key>Import name</key>
       <value>Import Name</value>
@@ -8580,8 +8702,7 @@
     </entry>
     <entry>
       <key>Child Role</key>
-      <value>Kindrolle
-</value>
+      <value>Kindrolle</value>
     </entry>
     <entry>
       <key>SqlBuilder: You have to specify at least one parameter</key>
@@ -8647,7 +8768,7 @@
     </entry>
     <entry>
       <key>HH:mm</key>
-      <value></value>
+      <value>HH:mm</value>
     </entry>
     <entry>
       <key>%0 | %1 - %2 o'clock</key>
@@ -8788,7 +8909,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Tasks of</key>
-      <value>Tasks of</value>
+      <value>Aufgabe von</value>
     </entry>
     <entry>
       <key>delegated</key>
@@ -8828,7 +8949,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Campaign steps </key>
-      <value>Kampagnen Stufen </value>
     </entry>
     <entry>
       <key>No authorization to postpone the task</key>
@@ -9106,7 +9226,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>File from this template could not be found anymore.</key>
-      <value>Datei von diesem Template konnte nicht mehr gefunden werden.</value>
+      <value>Die Datei von dieser Vorlage konnte nicht mehr gefunden werden.</value>
     </entry>
     <entry>
       <key>delete linked permissions and hierarchies</key>
@@ -9226,8 +9346,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>critical</key>
-      <value>kritisch
-</value>
+      <value>kritisch</value>
     </entry>
     <entry>
       <key>Week</key>
@@ -9346,8 +9465,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>From</key>
-      <value>Von
-</value>
+      <value>Von</value>
     </entry>
     <entry>
       <key>Contactperson</key>
@@ -9545,6 +9663,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Script task</key>
       <value>Skript-Aufgabe</value>
     </entry>
+    <entry>
+      <key>Query</key>
+      <value>Anfrage</value>
+    </entry>
     <entry>
       <key>Their Permissions</key>
       <value>Ihre Berechtigungen</value>
@@ -9802,7 +9924,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key> number of connections</key>
-      <value>Anzahl Verknüpfungen</value>
     </entry>
     <entry>
       <key>Create salesproject touchpoint</key>
@@ -9880,6 +10001,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Product Group</key>
       <value>Produktgruppe</value>
     </entry>
+    <entry>
+      <key>re-open</key>
+      <value>Wiedereröffnet</value>
+    </entry>
     <entry>
       <key>Version %0</key>
       <value>Version %0</value>
@@ -9920,6 +10045,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Business development</key>
       <value>Wirtschaftliche Entwicklung</value>
     </entry>
+    <entry>
+      <key>Reply to</key>
+      <value>Antwort an:</value>
+    </entry>
     <entry>
       <key>Headquarters</key>
       <value>Hauptsitz</value>
@@ -9950,9 +10079,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>0-50</key>
+      <value>0-50</value>
     </entry>
     <entry>
       <key>251-1000</key>
+      <value>251-1000</value>
     </entry>
     <entry>
       <key>Gradings</key>
@@ -9964,9 +10095,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>200-349 D€</key>
+      <value>200-349 D€</value>
     </entry>
     <entry>
       <key>100-199 D€</key>
+      <value>100-199 D€</value>
     </entry>
     <entry>
       <key>Full permissions already assigned</key>
@@ -9974,6 +10107,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>51-100</key>
+      <value>51-100</value>
     </entry>
     <entry>
       <key>Import Daten</key>
@@ -9981,6 +10115,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>0-49 D€</key>
+      <value>0-49 D€</value>
     </entry>
     <entry>
       <key>Grading</key>
@@ -9992,13 +10127,14 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>50-99 D€</key>
+      <value>50-99 D€</value>
     </entry>
     <entry>
       <key>101-250</key>
+      <value>101-250</value>
     </entry>
     <entry>
       <key>Valid from (as </key>
-      <value>gültig ab (in </value>
     </entry>
     <entry>
       <key>Sunday</key>
@@ -10026,7 +10162,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Return</key>
-      <value>Return</value>
+      <value>Zurück</value>
     </entry>
     <entry>
       <key>green</key>
@@ -10046,7 +10182,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the serial letter.</key>
-      <value>Keine neuen Empfänger gefunden die zum Serienbrief hinzugefügt werden können.</value>
+      <value>Keine neuen Empfänger gefunden, die zum Serienbrief hinzugefügt werden können.</value>
     </entry>
     <entry>
       <key>New</key>
@@ -10094,7 +10230,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Classification: </key>
-      <value>Klassifizierung: </value>
     </entry>
     <entry>
       <key>Classificationgroup</key>
@@ -10142,8 +10277,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
-      <value>%0 der ausgewählten Datensätze sind entweder schon Empfänger oder haben keine E-Mail Addresse angegeben.
-      </value>
+      <value>%0 der ausgewählten Datensätze sind entweder schon Empfänger oder haben keine E-Mail Addresse angegeben.</value>
     </entry>
     <entry>
       <key>%0 of the chosen records are already in the campaign</key>
@@ -10158,7 +10292,7 @@ Bitte Datumseingabe prüfen</value>
       <value>Kontakte werden exportiert</value>
     </entry>
     <entry>
-      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+      <key>%0 new recipients will be added to the bulk mail. \n\
                             %1 of the chosen records are already recipients or don't have an e-mail set</key>
       <value>%0 neue Empfänger werden der Serienmail hinzugefügt. \n\
                             %1 der ausgewählten Datensätze sind bereits Empfänger oder haben keine E-Mail-Adresse hinterlegt.</value>
@@ -10285,7 +10419,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
-      <value>Keine neuen Empfänger gefunden die zur Serienmail hinzugefügt werden können.</value>
+      <value>Keine neuen Empfänger gefunden, die zur Serienmail hinzugefügt werden können.</value>
     </entry>
     <entry>
       <key>Titel</key>
@@ -10473,7 +10607,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>District Responsible</key>
-      <value>Gebietsverantwortliche</value>
+      <value>Gebietsverantwortliche(r)</value>
     </entry>
     <entry>
       <key>Responsibles</key>
@@ -10543,6 +10677,10 @@ Bitte Datumseingabe prüfen</value>
       <key>{$DISTRICT_RESPONSIBLE}</key>
       <value>Gebietsverantwortlicher</value>
     </entry>
+    <entry>
+      <key>Answer Address</key>
+      <value>Antwortadresse</value>
+    </entry>
     <entry>
       <key>{$DISTRICT_TOTAL_TURNOVER}</key>
       <value>Umsatz gesamt</value>
@@ -10605,8 +10743,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>%0 of the chosen records are already recipients.</key>
-      <value>%0 der ausgewählten Datensätze sind schon Empfänger.
-      </value>
+      <value>%0 der ausgewählten Datensätze sind schon Empfänger.</value>
     </entry>
     <entry>
       <key>Linked in (Person)</key>
@@ -10725,7 +10862,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>erlauben</key>
-      <value></value>
     </entry>
     <entry>
       <key>Intermediate catching event</key>
@@ -10751,9 +10887,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>0-49 €</key>
+      <value>0-49 €</value>
     </entry>
     <entry>
       <key>100-199 €</key>
+      <value>100-199 €</value>
     </entry>
     <entry>
       <key>Feld</key>
@@ -10763,6 +10901,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>50-99 €</key>
+      <value>50-99 €</value>
     </entry>
     <entry>
       <key>Enddate</key>
@@ -10770,6 +10909,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>200-349 €</key>
+      <value>200-349 €</value>
     </entry>
     <entry>
       <key>Datensatz</key>
@@ -10782,10 +10922,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Vacation approval by</key>
       <value>Urlaubsantrag genehmigt von</value>
     </entry>
-    <entry>
-      <key>File from this template could not be found anymore. </key>
-      <value>Die Datei von dieser Vorlage konnte nicht mehr gefudnen werden.</value>
-    </entry>
     <entry>
       <key>allow</key>
       <value>erlauben</value>
@@ -10828,6 +10964,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>FavoriteGroup</key>
+      <value>Favoritengruppe</value>
     </entry>
     <entry>
       <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
@@ -10885,45 +11022,57 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Knowledgebase</key>
+      <value>Wissensdatenbank</value>
     </entry>
     <entry>
       <key>Marketing workflow</key>
+      <value>Marketing-Workflow</value>
     </entry>
     <entry>
       <key>Token</key>
+      <value>Token</value>
     </entry>
     <entry>
       <key>Edited by</key>
+      <value>Bearbeitet durch</value>
     </entry>
     <entry>
       <key>Sales Project Analyses</key>
+      <value>Vertriebsprojektanalysen</value>
     </entry>
     <entry>
       <key>Sales Project Id</key>
+      <value>VertriebsprojektId</value>
     </entry>
     <entry>
       <key>Sales Project Convertion Rates</key>
+      <value>Vertriebsprojekt Umrechnungsraten</value>
     </entry>
     <entry>
       <key>Set Campaign Step</key>
+      <value>Kampagnenschritt setzen</value>
     </entry>
     <entry>
       <key>Member</key>
+      <value>Mitglied</value>
     </entry>
     <entry>
       <key>Tags</key>
+      <value>Tags</value>
     </entry>
     <entry>
       <key>[TEST] Sql_lib - SqlBuilder</key>
     </entry>
     <entry>
       <key>Feed</key>
+      <value>Feed</value>
     </entry>
     <entry>
       <key>[TEST] KeywordAttribute_lib</key>
     </entry>
     <entry>
       <key>Messages</key>
+      <value>Nachrichten</value>
     </entry>
     <entry>
       <key>incl. Vat</key>
@@ -10931,6 +11080,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Channel Name</key>
+      <value>Kanäle</value>
     </entry>
     <entry>
       <key>Planning/Forecast/Turnover</key>
@@ -10938,6 +11088,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Sales Project Phases</key>
+      <value>Vertriebsprojektphasen</value>
     </entry>
     <entry>
       <key>Start workflows</key>
@@ -10945,6 +11096,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>edited</key>
+      <value>bearbeitet</value>
     </entry>
     <entry>
       <key>Channel</key>
@@ -10952,115 +11104,149 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Import from Teams</key>
+      <value>Von Teams importieren</value>
     </entry>
     <entry>
       <key>Invitation</key>
+      <value>Inivation</value>
     </entry>
     <entry>
       <key>send as mail</key>
+      <value>Als E-Mail senden</value>
     </entry>
     <entry>
       <key>User token</key>
+      <value>Benutzertoken</value>
     </entry>
     <entry>
       <key>Team name</key>
+      <value>Teamname</value>
     </entry>
     <entry>
       <key>Knowledge Roles</key>
+      <value>Wissensrollen</value>
     </entry>
     <entry>
       <key>Valid</key>
+      <value>gültig</value>
     </entry>
     <entry>
       <key>Audit Logs</key>
+      <value>Auditlogs</value>
     </entry>
     <entry>
       <key>Editorial</key>
+      <value>Editorial</value>
     </entry>
     <entry>
       <key>KnowledgeRoles</key>
+      <value>Wissensrollen</value>
     </entry>
     <entry>
       <key>Remove from Campaign</key>
+      <value>Aus Kampagne entfernen</value>
     </entry>
     <entry>
       <key>Message</key>
+      <value>Nachricht</value>
     </entry>
     <entry>
       <key>Add members</key>
+      <value>Mitglieder hinzufügen</value>
     </entry>
     <entry>
       <key>[TEST] .All</key>
     </entry>
     <entry>
       <key>Newsfeed (Complete Article)</key>
+      <value>Newsfeed (kompletter Artikel)</value>
     </entry>
     <entry>
       <key>Notification</key>
+      <value>Benachrichtigung</value>
     </entry>
     <entry>
       <key>Load older messages</key>
+      <value>Ältere Nachrichten laden</value>
     </entry>
     <entry>
       <key>Newsletter</key>
+      <value>Newsletter</value>
     </entry>
     <entry>
       <key>Adds an answer to the selected discussion</key>
+      <value>Fügt der selektieren Discussion eine Antwort hinzu</value>
     </entry>
     <entry>
       <key>LinkedIn (Person)</key>
+      <value>LinkedIn (Person)</value>
     </entry>
     <entry>
       <key>Newsfeed Timeline</key>
+      <value>Newsfeed Timeline</value>
     </entry>
     <entry>
       <key>MS Teams</key>
+      <value>MS Teams</value>
     </entry>
     <entry>
       <key>User tokens</key>
+      <value>Benutzertoken</value>
     </entry>
     <entry>
       <key>[TEST] Keyword_lib</key>
     </entry>
     <entry>
       <key>News</key>
+      <value>News</value>
     </entry>
     <entry>
       <key>Sales Projects</key>
+      <value>Vertriebsprojekte</value>
     </entry>
     <entry>
       <key>Team</key>
+      <value>Team</value>
     </entry>
     <entry>
       <key>Created by</key>
+      <value>Erstellt durch</value>
     </entry>
     <entry>
       <key>Employee count</key>
-      <value>Mitarbeiteranzahl</value>
+      <value>Mitarbeiterzahl</value>
     </entry>
     <entry>
       <key>Toggles the status of  selected discussion between open and closed</key>
+      <value>Ändert den Status der selektierten Diskussion zwischen offen und geschlossen</value>
     </entry>
     <entry>
       <key>Synchronize documents</key>
+      <value>Synchronisierte Dokumente</value>
     </entry>
     <entry>
       <key>AuditLogs</key>
+      <value>Auditlogs</value>
     </entry>
     <entry>
       <key>Audit Log</key>
+      <value>Auditlog</value>
     </entry>
     <entry>
       <key>Admin</key>
+      <value>Admin</value>
     </entry>
     <entry>
       <key>Show all audits</key>
+      <value>Alle Audits anzeigen</value>
     </entry>
     <entry>
       <key>Sales Project milestone Id</key>
+      <value>VertriebsprojektsmeilensteinId</value>
     </entry>
     <entry>
       <key>LinkedIn (Organisation)</key>
+      <value>Linked In (Organisation)</value>
     </entry>
     <entry>
       <key>No recipient is marked for test run replacement.</key>
@@ -11071,12 +11257,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Exports the knowledge entry as a html file</key>
+      <value>Exportiert den Wissenseintrag als ein html-File</value>
     </entry>
     <entry>
       <key>My campaigns</key>
+      <value>Meine Kampagne</value>
     </entry>
     <entry>
       <key>Campaign costs</key>
+      <value>Kampagnenkosten</value>
     </entry>
     <entry>
       <key>Verantwortlicher</key>
@@ -11142,6 +11331,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Document template</key>
+      <value>Dokumentvorlage</value>
     </entry>
     <entry>
       <key>Traits</key>
@@ -11149,6 +11339,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Salesproject Phases</key>
+      <value>Vertriebsprojektphasen</value>
     </entry>
     <entry>
       <key>Object Filter</key>
@@ -11248,9 +11439,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Date Edit</key>
+      <value>Datum bearbeiten</value>
     </entry>
     <entry>
       <key>Import</key>
+      <value>Import</value>
     </entry>
     <entry>
       <key>Percent</key>
@@ -11258,15 +11451,19 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Prev</key>
+      <value>vorher</value>
     </entry>
     <entry>
       <key>Focus</key>
+      <value>Focus</value>
     </entry>
     <entry>
       <key>Next</key>
+      <value>Weiter</value>
     </entry>
     <entry>
       <key>Import Documents</key>
+      <value>Import Dokumente</value>
     </entry>
     <entry>
       <key>Error: The Importfile could not be found anymore.</key>
@@ -11378,6 +11575,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Salesproject Phase</key>
+      <value>Vertriebsprojektphase</value>
     </entry>
     <entry>
       <key>Communication strategy designed</key>
@@ -11403,6 +11601,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Workshop for project-realization planned</key>
       <value>Workshop für Projektumsetzung geplannt</value>
     </entry>
+    <entry>
+      <key>Ticket created through duplication by</key>
+      <value>Ticket durch Duplizierung erstellt. Anwender</value>
+    </entry>
     <entry>
       <key>Appointment for offer-agreement occured</key>
       <value>Termin zur Angebotsabstimmung hat stattgefunden</value>
@@ -11417,28 +11619,34 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Responsible Districts</key>
+      <value>zuständiger Distrikt</value>
     </entry>
     <entry>
       <key>auto</key>
+      <value>automatisch</value>
     </entry>
     <entry>
       <key>District assigned</key>
     </entry>
     <entry>
       <key>District Responsibles</key>
+      <value>Gebietsverantwortliche</value>
     </entry>
     <entry>
       <key>Show my district assignments with status review</key>
+      <value>Meine Bezirkszuweisungen mit Statusübersicht</value>
     </entry>
     <entry>
       <key>Payment Address</key>
+      <value>Rechnungsadresse</value>
     </entry>
     <entry>
       <key>manual</key>
+      <value>manuell</value>
     </entry>
     <entry>
       <key>Adviser status</key>
-      <value>Status des Beraters</value>
+      <value>Beraterstatus</value>
     </entry>
     <entry>
       <key>Site visit</key>
@@ -11446,9 +11654,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Marketing Workflow</key>
+      <value>Marketing-Workflow</value>
     </entry>
     <entry>
       <key>INSERT</key>
+      <value>EINFÃœGEN</value>
     </entry>
     <entry>
       <key>Weekplan Info</key>
@@ -11464,6 +11674,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>ChecklistEntryValue</key>
+      <value>Checklisteneintragswert</value>
     </entry>
     <entry>
       <key>6 Months</key>
@@ -11517,10 +11728,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Sync Exchange Contacts</key>
       <value>Exchange-Kontakte synchronisieren</value>
     </entry>
-    <entry>
-      <key>number of connections</key>
-      <value>Anzahl der Verbindungen</value>
-    </entry>
     <entry>
       <key>2 Weeks</key>
       <value>2 Wochen</value>
@@ -11547,6 +11754,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Migrate keyword containers</key>
+      <value>Keyword-Container immigrieren</value>
     </entry>
     <entry>
       <key>Sorting direction</key>
@@ -11562,12 +11770,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Weekplan already exists!</key>
+      <value>Wochenplan existiert bereits!</value>
     </entry>
     <entry>
       <key>Sent offers</key>
+      <value>Angebot senden</value>
     </entry>
     <entry>
       <key>Calendar week</key>
+      <value>Kalenderwoche</value>
     </entry>
     <entry>
       <key>Duplicaterow rebuild</key>
@@ -11579,6 +11790,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>HTML Editor</key>
+      <value>HTML Editor</value>
     </entry>
     <entry>
       <key>Participant is already participating</key>
@@ -11793,9 +12005,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Starts the serverprocess manually, which will recalculate all (potentially) outdated classifications. Use this after changes to the configuration of classifications.</key>
+      <value>Startet den Serverprozess Manuell. Berechnet alle (potenziell) veralteten Klassifizierungen. Benutze dies nach Änderungen an den Klassifizierungseinstellungen.</value>
     </entry>
     <entry>
       <key>Starts the serverprocess manually, which will recalculate all classifications from scratch. Only do this after e.g importing data from elsewhere where the outdated flag couldn't been set correctly. Since this can take some time.</key>
+      <value>Startet den Serverprozess Manuell. Berechnet alle Klassifizierungen neu. Benutze dies nur nach z.B dem Importieren von Daten von ausserhalb des Systems bei denen der outdated flag nciht richtig gesetzt wurde, da dieser Durchlauf länger dauen kann</value>
     </entry>
     <entry>
       <key>Done by</key>
@@ -11923,9 +12137,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Browser</key>
     </entry>
-    <entry>
-      <key>Global Cases </key>
-    </entry>
     <entry>
       <key>District: Name</key>
       <value>Gebiet: Name</value>
@@ -12079,6 +12290,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Remove recipients with advertising ban</key>
+      <value>Empfänger mit Werbesperre entfernen</value>
     </entry>
     <entry>
       <key>wrong configuration for '%0'</key>
@@ -12164,6 +12376,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>new Email</key>
+      <value>Neue E-Mail</value>
     </entry>
     <entry>
       <key>Price in </key>
@@ -12176,7 +12389,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Exchange Rate </key>
-      <value>Wechselkurs</value>
     </entry>
     <entry>
       <key>Digital</key>
@@ -12695,7 +12907,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Open Admin View</key>
-      <value>Admin-Ansicht öffnen</value>
     </entry>
     <entry>
       <key>Attendees</key>
@@ -12761,6 +12972,1117 @@ Bitte Datumseingabe prüfen</value>
       <key>Calling the abbyy webservice failed</key>
       <value>Das Aufrufen des Abbyy Webservices schlug fehl</value>
     </entry>
+    <entry>
+      <key>Properties</key>
+    </entry>
+    <entry>
+      <key>Duplicate Ticket</key>
+      <value>Duplizieren</value>
+    </entry>
+    <entry>
+      <key>Mature after days</key>
+      <value>Fällig nach Tagen</value>
+    </entry>
+    <entry>
+      <key>@Reply</key>
+      <value>@Antworten</value>
+    </entry>
+    <entry>
+      <key>The value in the "Threshold" field must be between 0 and 100.</key>
+      <value>Der Wert im Feld "Threshold" muss zwischen 0 und 100 sein.</value>
+    </entry>
+    <entry>
+      <key>Alternative phone</key>
+      <value>Abweichende Telefonnr.</value>
+    </entry>
+    <entry>
+      <key>Alternative email</key>
+      <value>Abweichende E-Mail</value>
+    </entry>
+    <entry>
+      <key>Attribute filters</key>
+      <value>Eigenschafts-Filter</value>
+    </entry>
+    <entry>
+      <key>all</key>
+      <value>Alle</value>
+    </entry>
+    <entry>
+      <key>Default ticket template</key>
+      <value>Std. Ticketvorlage</value>
+    </entry>
+    <entry>
+      <key>determined in</key>
+      <value>ermittelt in</value>
+    </entry>
+    <entry>
+      <key>duplicate Ticket</key>
+      <value>Duplizieren</value>
+    </entry>
+    <entry>
+      <key>Ticket template</key>
+      <value>Ticket-Vorlage</value>
+    </entry>
+    <entry>
+      <key>active</key>
+      <value>aktiv</value>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Mail)</key>
+      <value>Schaubild Ticketzahl gesamt (E-Mail)</value>
+    </entry>
+    <entry>
+      <key>Show inboxes</key>
+      <value>Postkörbe anzeigen</value>
+    </entry>
+    <entry>
+      <key>Show the number of tickets total (Mail)</key>
+      <value>Ticketzahl gesamt (E-Mail) anzeigen</value>
+    </entry>
+    <entry>
+      <key>Shows a chart for my target number of daily tickets</key>
+      <value>Schaubild mit der Zielanzahl meiner Tickets anzeigen</value>
+    </entry>
+    <entry>
+      <key>Closure</key>
+      <value>Abschluss</value>
+    </entry>
+    <entry>
+      <key>Content to forward</key>
+      <value>Weiterzuleitende Information</value>
+    </entry>
+    <entry>
+      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+    </entry>
+    <entry>
+      <key>CONTACTID (UUID)</key>
+      <value>Kontakt ID</value>
+    </entry>
+    <entry>
+      <key>Cancellation of subscription</key>
+      <value>Storno von Abo</value>
+    </entry>
+    <entry>
+      <key>Cancellation of order</key>
+      <value>Storno von Auftrag</value>
+    </entry>
+    <entry>
+      <key>complaint</key>
+      <value>Beschwerde</value>
+    </entry>
+    <entry>
+      <key>Complaint</key>
+      <value>Beschwerde</value>
+    </entry>
+    <entry>
+      <key>Complaint about product</key>
+      <value>Beschwerde über Produkt</value>
+    </entry>
+    <entry>
+      <key>Complaint about advertisement</key>
+      <value>Beschwerde über Werbung</value>
+    </entry>
+    <entry>
+      <key>contact formular</key>
+      <value>Kontaktformular</value>
+    </entry>
+    <entry>
+      <key>Complaint about employee</key>
+      <value>Beschwerde über Mitarbeiter</value>
+    </entry>
+    <entry>
+      <key>day</key>
+      <value>Tag</value>
+    </entry>
+    <entry>
+      <key>days</key>
+      <value>Tage</value>
+    </entry>
+    <entry>
+      <key>Days nr.</key>
+      <value>Tage Nr.</value>
+    </entry>
+    <entry>
+      <key>Date Field</key>
+      <value>Datenfeld</value>
+    </entry>
+    <entry>
+      <key>%0 Task(s) sucessfully forwarded to: %1</key>
+      <value>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</value>
+    </entry>
+    <entry>
+      <key>AVAILABLE</key>
+      <value>Verfügbar</value>
+    </entry>
+    <entry>
+      <key>UNAVAILABLE</key>
+      <value>Abwesend</value>
+    </entry>
+    <entry>
+      <key>Last status change</key>
+      <value>Letzte Status Änderung</value>
+    </entry>
+    <entry>
+      <key>New status</key>
+      <value>Neuer Status</value>
+    </entry>
+    <entry>
+      <key>Next ticket</key>
+      <value>Nächstes Ticket</value>
+    </entry>
+    <entry>
+      <key>Chart Inbox Tickets</key>
+      <value>Posteingangticketdiagramm</value>
+    </entry>
+    <entry>
+      <key>Email of contact</key>
+      <value>Hinterlegte E-Mail</value>
+    </entry>
+    <entry>
+      <key>Email subject</key>
+      <value>E-Mail Betreff</value>
+    </entry>
+    <entry>
+      <key>Email content</key>
+      <value>E-Mail Inhalt</value>
+    </entry>
+    <entry>
+      <key>Document Templates</key>
+    </entry>
+    <entry>
+      <key>Show my tickets that are in process</key>
+      <value>Meine Tickets in Bearbeitung anzeigen</value>
+    </entry>
+    <entry>
+      <key>Show open tickets</key>
+      <value>Offene Tickets anzeigen</value>
+    </entry>
+    <entry>
+      <key>Show resolved tickets</key>
+      <value>Umgesetzte Tickets anzeigen</value>
+    </entry>
+    <entry>
+      <key>Show unresolved tickets</key>
+      <value>Ungeklärte Tickets anzeigen</value>
+    </entry>
+    <entry>
+      <key>Supportticket Templates</key>
+      <value>Supportticket-Vorlagen</value>
+    </entry>
+    <entry>
+      <key>Support ticket template</key>
+      <value>Supportticket-Vorlage</value>
+    </entry>
+    <entry>
+      <key>Support ticket templates</key>
+      <value>Supportticket-Vorlagen</value>
+    </entry>
+    <entry>
+      <key>Open tickets</key>
+      <value>Offene Tickets</value>
+    </entry>
+    <entry>
+      <key>Return ticket</key>
+      <value>Zurückgeben</value>
+    </entry>
+    <entry>
+      <key>Reopen delay</key>
+      <value>Wiedereröffnung</value>
+    </entry>
+    <entry>
+      <key>Phone of contact</key>
+      <value>Hinterlegte Telefonnr.</value>
+    </entry>
+    <entry>
+      <key>Inbox</key>
+      <value>Postkorb</value>
+    </entry>
+    <entry>
+      <key>inbox</key>
+      <value>Postkorb</value>
+    </entry>
+    <entry>
+      <key>Inbox filter groups</key>
+      <value>Postkorb-Filtergruppen</value>
+    </entry>
+    <entry>
+      <key>Inbox filters</key>
+      <value>Postkorb-Filter</value>
+    </entry>
+    <entry>
+      <key>Inbox filter</key>
+      <value>Postkorb-Filter</value>
+    </entry>
+    <entry>
+      <key>Please select a Inbox</key>
+      <value>Bitte einen Postkorb wählen</value>
+    </entry>
+    <entry>
+      <key>Inbox Name</key>
+      <value>Postkorbname</value>
+    </entry>
+    <entry>
+      <key>Ticket category</key>
+      <value>Ticket Kategorien</value>
+    </entry>
+    <entry>
+      <key>Forward ticket to other inbox</key>
+      <value>Ticket an anderen Postkorb weiterleiten</value>
+    </entry>
+    <entry>
+      <key>Change inbox</key>
+      <value>Postkorb wechseln</value>
+    </entry>
+    <entry>
+      <key>no inbox</key>
+      <value>kein Postkorb hinterlegt</value>
+    </entry>
+    <entry>
+      <key>no inboxEmail for inbox</key>
+      <value>Keine Postkorb-Email für den Postkorb hinterlegt</value>
+    </entry>
+    <entry>
+      <key>no USER for inboxEmail</key>
+      <value>Kein Benutzer für die Postkorb-Email hinterlegt</value>
+    </entry>
+    <entry>
+      <key>inboxEmail</key>
+      <value>Postkorb-Email</value>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Status)</key>
+      <value>Schaubild Ticketzahl pro Postkorb (Status)</value>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Medium)</key>
+      <value>Schaubild Ticketzahl pro Postkorb (Medium)</value>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Mail)</key>
+      <value>Schaubild Ticketzahl pro Postkorb (E-Mail)</value>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Medium)</key>
+      <value>Schaubild Ticketzahl gesamt (Medium)</value>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Status)</key>
+      <value>Schaubild Ticketzahl gesamt (Status)</value>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Medium)</key>
+      <value>Anzahl der Tickets (Medium)</value>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Status)</key>
+      <value>Anzahl der Tickets (Status)</value>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Mail)</key>
+      <value>Anzahl der Tickets (E-Mail)</value>
+    </entry>
+    <entry>
+      <key>Employee groups</key>
+      <value>Mitarbeitergruppen</value>
+    </entry>
+    <entry>
+      <key>Informations</key>
+      <value>Informationen</value>
+    </entry>
+    <entry>
+      <key>Blocking Time</key>
+      <value>Blockzeit</value>
+    </entry>
+    <entry>
+      <key>Employee group rule groups</key>
+      <value>Mitarbeitergruppen-Regelgruppen</value>
+    </entry>
+    <entry>
+      <key>Employee Group</key>
+      <value>Mitarbeitergruppe</value>
+    </entry>
+    <entry>
+      <key>Employee group rule</key>
+      <value>Mitarbeitergruppen-Regel</value>
+    </entry>
+    <entry>
+      <key>Employee group rules</key>
+      <value>Mitarbeitergruppen-Regeln</value>
+    </entry>
+    <entry>
+      <key>Employee group rule group</key>
+      <value>Mitarbeitergruppen-Regelgruppe</value>
+    </entry>
+    <entry>
+      <key>Employee group filter group</key>
+      <value>Mitarbeitergruppe-Filtergruppe</value>
+    </entry>
+    <entry>
+      <key>Employee group filter groups</key>
+      <value>Mitarbeitergruppe-Filtergruppen</value>
+    </entry>
+    <entry>
+      <key>Employee group filters</key>
+      <value>Mitarbeitergruppe-Filter</value>
+    </entry>
+    <entry>
+      <key>Employee group filter</key>
+      <value>Mitarbeitergruppe-Filter</value>
+    </entry>
+    <entry>
+      <key>Daily goal</key>
+      <value>Tagesziel</value>
+    </entry>
+    <entry>
+      <key>no Goal</key>
+      <value>keines Tagesziel</value>
+    </entry>
+    <entry>
+      <key>Inbox filter group</key>
+      <value>Postkorb-Filtergruppe</value>
+    </entry>
+    <entry>
+      <key>Employee Groups</key>
+      <value>Mitarbeitergruppen</value>
+    </entry>
+    <entry>
+      <key>inboxes</key>
+      <value>Postkörbe</value>
+    </entry>
+    <entry>
+      <key>Inboxes</key>
+      <value>Postkörbe</value>
+    </entry>
+    <entry>
+      <key>Search term</key>
+      <value>Suchwert</value>
+    </entry>
+    <entry>
+      <key>Target</key>
+      <value>Ziel</value>
+    </entry>
+    <entry>
+      <key>Ticket closure</key>
+      <value>Ticketabschluss</value>
+    </entry>
+    <entry>
+      <key>Ticket closure (days)</key>
+      <value>Ticketabschluss (Tage)</value>
+    </entry>
+    <entry>
+      <key>Ticket reopen delay</key>
+      <value>Ticket Wiederöffnung</value>
+    </entry>
+    <entry>
+      <key>Unresolved tickets</key>
+      <value>Ungeklärte Tickets</value>
+    </entry>
+    <entry>
+      <key>Ticket reopen delay (days)</key>
+      <value>Ticket Wiederöffnung (Tage)</value>
+    </entry>
+    <entry>
+      <key>Status change date</key>
+      <value>Änderungsdatum Status</value>
+    </entry>
+    <entry>
+      <key>Back to report</key>
+      <value>Zurück zur Übersicht</value>
+    </entry>
+    <entry>
+      <key>Forward ticket</key>
+      <value>Ticket weiterleiten</value>
+    </entry>
+    <entry>
+      <key>Forward Ticket</key>
+      <value>Ticket weiterleiten</value>
+    </entry>
+    <entry>
+      <key>To</key>
+      <value>An:</value>
+    </entry>
+    <entry>
+      <key>Averages Tickets Employee</key>
+      <value>Durschnittswerte Tickets Mitarbeiter</value>
+    </entry>
+    <entry>
+      <key>Mail Address</key>
+      <value>E-Mail Adresse</value>
+    </entry>
+    <entry>
+      <key>Failure (employee)</key>
+      <value>Fehlschlag (Mitarbeiter)</value>
+    </entry>
+    <entry>
+      <key>Failure (customer)</key>
+      <value>Fehlschlag (Kunde)</value>
+    </entry>
+    <entry>
+      <key>Date/Periode</key>
+      <value>Datum/Zeitraum</value>
+    </entry>
+    <entry>
+      <key>Other complaint</key>
+      <value>Sonstiges</value>
+    </entry>
+    <entry>
+      <key>Query about product</key>
+      <value>Anfrage zu Produkt</value>
+    </entry>
+    <entry>
+      <key>Query other</key>
+      <value>Anfrage (allgemein)</value>
+    </entry>
+    <entry>
+      <key>Business E-Mail</key>
+      <value>E-Mail geschäftlich</value>
+    </entry>
+    <entry>
+      <key>Business Fax</key>
+      <value>Fax geschäftlich</value>
+    </entry>
+    <entry>
+      <key>Business Mobile</key>
+      <value>Handy geschäftlich</value>
+    </entry>
+    <entry>
+      <key>CUSTOMER CARD</key>
+      <value>Kundenkarte</value>
+    </entry>
+    <entry>
+      <key>Business Phone</key>
+      <value>Telefon geschäftlich</value>
+    </entry>
+    <entry>
+      <key>New note</key>
+      <value>Neue Notiz</value>
+    </entry>
+    <entry>
+      <key>Body</key>
+      <value>Mailtext</value>
+    </entry>
+    <entry>
+      <key>Category determination</key>
+      <value>Kategorieermittlung</value>
+    </entry>
+    <entry>
+      <key>BCC</key>
+      <value>BCC</value>
+    </entry>
+    <entry>
+      <key>CC</key>
+      <value>CC</value>
+    </entry>
+    <entry>
+      <key>Change Ticket Status</key>
+      <value>Ticketstatus ändern</value>
+    </entry>
+    <entry>
+      <key>Attribute filter</key>
+      <value>Eigenschafts-Filter</value>
+    </entry>
+    <entry>
+      <key>Review</key>
+      <value>Prüfung</value>
+    </entry>
+    <entry>
+      <key>Daily goals</key>
+      <value>Tagesziele</value>
+    </entry>
+    <entry>
+      <key>Further informations</key>
+      <value>Weitere Informationen</value>
+    </entry>
+    <entry>
+      <key>Conclusion</key>
+      <value>Abschluss</value>
+    </entry>
+    <entry>
+      <key>Follow-Up</key>
+      <value>Wiedervorlage</value>
+    </entry>
+    <entry>
+      <key>Success</key>
+      <value>Erfolg</value>
+    </entry>
+    <entry>
+      <key>Task maturity date</key>
+      <value>Prüfdatum</value>
+    </entry>
+    <entry>
+      <key>New service ticket</key>
+      <value>Neues Serviceticket</value>
+    </entry>
+    <entry>
+      <key>Support tickets</key>
+      <value>Supporttickets</value>
+    </entry>
+    <entry>
+      <key>Note</key>
+      <value>Notiz</value>
+    </entry>
+    <entry>
+      <key>billing amount</key>
+      <value>Rech.-Betrag</value>
+    </entry>
+    <entry>
+      <key>Show tickets I am the editor of</key>
+      <value>Zeigt Tickets an, in denen ich der Bearbeiter bin</value>
+    </entry>
+    <entry>
+      <key>Blocking time (Minute)</key>
+      <value>Blockzeit (Minute)</value>
+    </entry>
+    <entry>
+      <key>Blocking Time (days)</key>
+      <value>Blockzeit (Tage)</value>
+    </entry>
+    <entry>
+      <key>Blocking Time Agent</key>
+      <value>Blockzeit Agent</value>
+    </entry>
+    <entry>
+      <key>Blocking Time Agent (hours)</key>
+      <value>Blockzeit Agent (Stunden)</value>
+    </entry>
+    <entry>
+      <key>Additional Info</key>
+      <value>Zusätzliche Information</value>
+    </entry>
+    <entry>
+      <key>Current ticket</key>
+      <value>Aktuelles Ticket</value>
+    </entry>
+    <entry>
+      <key>All activities</key>
+      <value>Alle Aktivitäten</value>
+    </entry>
+    <entry>
+      <key>Mail activities</key>
+      <value>Gesamter  Mailverlauf</value>
+    </entry>
+    <entry>
+      <key>Account balanced</key>
+      <value>Konto ausgeglichen</value>
+    </entry>
+    <entry>
+      <key>Send via Mail</key>
+      <value>Senden per E-Mail</value>
+    </entry>
+    <entry>
+      <key>Re-Open</key>
+      <value>Wieder öffnen</value>
+    </entry>
+    <entry>
+      <key>reply</key>
+      <value>Antwort</value>
+    </entry>
+    <entry>
+      <key>Only show results</key>
+      <value>Nur Ergebnisse anzeigen</value>
+    </entry>
+    <entry>
+      <key>Reset settings</key>
+      <value>Zurücksetzen</value>
+    </entry>
+    <entry>
+      <key>Reporting</key>
+      <value>Ãœbersicht</value>
+    </entry>
+    <entry>
+      <key>Report Settings</key>
+      <value>Einstellungen für die Übersicht</value>
+    </entry>
+    <entry>
+      <key>Settings Filter 1</key>
+      <value>Einstellungen Filter 1</value>
+    </entry>
+    <entry>
+      <key>Settings Filter 2</key>
+      <value>Einstellungen Filter 1</value>
+    </entry>
+    <entry>
+      <key>Settings Filter 3</key>
+      <value>Einstellungen Filter 3</value>
+    </entry>
+    <entry>
+      <key>Settings Filter 4</key>
+      <value>Einstellungen Filter 4</value>
+    </entry>
+    <entry>
+      <key>Attribute determination</key>
+      <value>Eigenschaft-Ermittlung</value>
+    </entry>
+    <entry>
+      <key>Forward</key>
+      <value>Weiterleiten</value>
+    </entry>
+    <entry>
+      <key>Team leader dashboard</key>
+      <value>Teamleiter Dashboard</value>
+    </entry>
+    <entry>
+      <key>Control editor</key>
+      <value>Regeleditor</value>
+    </entry>
+    <entry>
+      <key>Assignment</key>
+      <value>Zuordnung</value>
+    </entry>
+    <entry>
+      <key>Reply Template</key>
+      <value>Antwortvorlage</value>
+    </entry>
+    <entry>
+      <key>Statistic</key>
+      <value>Statistik</value>
+    </entry>
+    <entry>
+      <key>Reply to All</key>
+      <value>Allen Antworten</value>
+    </entry>
+    <entry>
+      <key>Autoeply settings</key>
+      <value>Automatische Antwortmails Einstellungen</value>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 1</key>
+      <value>Automatische Antwortmail 1</value>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 2</key>
+      <value>Automatische Antwortmail 2</value>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 3</key>
+      <value>Automatische Antwortmail 3</value>
+    </entry>
+    <entry>
+      <key>request</key>
+      <value>Rückfrage</value>
+    </entry>
+    <entry>
+      <key>done</key>
+      <value>Erledigt</value>
+    </entry>
+    <entry>
+      <key>Re-open</key>
+      <value>Wiedereröffnen</value>
+    </entry>
+    <entry>
+      <key>internal reply</key>
+      <value>Rückfrage Intern</value>
+    </entry>
+    <entry>
+      <key>processing</key>
+      <value>in Bearbeitung</value>
+    </entry>
+    <entry>
+      <key>Entry</key>
+      <value>Eingang</value>
+    </entry>
+    <entry>
+      <key>Ticket daily goals</key>
+      <value>Tickets Tagesleistung</value>
+    </entry>
+    <entry>
+      <key>Tickets in process</key>
+      <value>Tickets in Bearbeitung</value>
+    </entry>
+    <entry>
+      <key>Resolved tickets</key>
+      <value>Bereits bearbeitete Tickets</value>
+    </entry>
+    <entry>
+      <key>Supportticket Template</key>
+      <value>Supportticket-Vorlage</value>
+    </entry>
+    <entry>
+      <key>Supportticket template</key>
+      <value>Supportticket-Vorlage</value>
+    </entry>
+    <entry>
+      <key>undefined</key>
+      <value>nicht definiert</value>
+    </entry>
+    <entry>
+      <key>Domain</key>
+      <value>Bereich</value>
+    </entry>
+    <entry>
+      <key>Template No.</key>
+      <value>Vorlagen-Nr.</value>
+    </entry>
+    <entry>
+      <key>Comparison method</key>
+      <value>Vergelichsmethode</value>
+    </entry>
+    <entry>
+      <key>Page</key>
+      <value>Seite</value>
+    </entry>
+    <entry>
+      <key>Ticket filters</key>
+      <value>Ticket-Filter</value>
+    </entry>
+    <entry>
+      <key>Data record</key>
+      <value>Datensatz</value>
+    </entry>
+    <entry>
+      <key>Shows hom many sales projects are in their corresponding sales phase.</key>
+      <value>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind.</value>
+    </entry>
+    <entry>
+      <key>limit</key>
+      <value>beschränken</value>
+    </entry>
+    <entry>
+      <key>starting from D€</key>
+      <value>ab 350 D€</value>
+    </entry>
+    <entry>
+      <key>starting at 1000</key>
+      <value>ab 1000</value>
+    </entry>
+    <entry>
+      <key>Rule editor</key>
+      <value>Regel Editor</value>
+    </entry>
+    <entry>
+      <key>Client</key>
+      <value>Kunde</value>
+    </entry>
+    <entry>
+      <key>Pull tickets</key>
+      <value>Nächste Tickets ziehen</value>
+    </entry>
+    <entry>
+      <key>Pull next ticket</key>
+      <value>Nächstes Ticket ziehen</value>
+    </entry>
+    <entry>
+      <key>change selected</key>
+      <value>Ausgewählte ändern</value>
+    </entry>
+    <entry>
+      <key>Change selected</key>
+      <value>Ausgewählte ändern</value>
+    </entry>
+    <entry>
+      <key>Person in Charge</key>
+      <value>Verantwortlicher</value>
+    </entry>
+    <entry>
+      <key>Alternative email address</key>
+      <value>Abweichende E-Mail-Adresse</value>
+    </entry>
+    <entry>
+      <key>Alternative phone number</key>
+      <value>Abweichende Telefonnummer</value>
+    </entry>
+    <entry>
+      <key>Show tickets that are not resolved</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Medium)</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Status)</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Mail)</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Status)</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Medium)</key>
+    </entry>
+    <entry>
+      <key>Unresolved Tickets</key>
+    </entry>
+    <entry>
+      <key>Pull Tickets</key>
+      <value>Nächste Tickets ziehen</value>
+    </entry>
+    <entry>
+      <key>Supportticket templates</key>
+    </entry>
+    <entry>
+      <key>dupliacte Ticket</key>
+    </entry>
+    <entry>
+      <key> Info</key>
+    </entry>
+    <entry>
+      <key>File from this template could not be found anymore. </key>
+    </entry>
+    <entry>
+      <key> User</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Global Cases </key>
+    </entry>
+    <entry>
+      <key>Alt. Phone</key>
+      <value>Alt. Telefon</value>
+    </entry>
+    <entry>
+      <key>Alt. E-Mail</key>
+      <value>Alt. E-Mail</value>
+    </entry>
+    <entry>
+      <key>New support ticket</key>
+    </entry>
+    <entry>
+      <key>New Support ticket</key>
+    </entry>
+    <entry>
+      <key>rule editor</key>
+    </entry>
+    <entry>
+      <key>Set as default signature</key>
+      <value>Default-Signatur setzen</value>
+    </entry>
+    <entry>
+      <key>Existing default signature</key>
+      <value>Existierende Default-Signatur</value>
+    </entry>
+    <entry>
+      <key>Signature to set default</key>
+      <value>Zu setzende Default-Signatur</value>
+    </entry>
+    <entry>
+      <key>1</key>
+    </entry>
+    <entry>
+      <key>2</key>
+    </entry>
+    <entry>
+      <key>Serviceticket category</key>
+      <value>Serviceticket Kategorie</value>
+    </entry>
+    <entry>
+      <key>Serviceticket categories</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>Service tickets</key>
+      <value>Servicetickets</value>
+    </entry>
+    <entry>
+      <key>Service ticket templates</key>
+    </entry>
+    <entry>
+      <key>Status (Mailbridge)</key>
+    </entry>
+    <entry>
+      <key>Service Administration</key>
+    </entry>
+    <entry>
+      <key>Save changes</key>
+    </entry>
+    <entry>
+      <key>Individual Reply Template</key>
+      <value>Individuelle Antwortvorlage</value>
+    </entry>
+    <entry>
+      <key>Ziegel</key>
+    </entry>
+    <entry>
+      <key>Mails</key>
+    </entry>
+    <entry>
+      <key>Threshold (in %)</key>
+    </entry>
+    <entry>
+      <key>Informationen</key>
+    </entry>
+    <entry>
+      <key>Pull next ticket or create new ones</key>
+    </entry>
+    <entry>
+      <key>Abgeschlossen</key>
+    </entry>
+    <entry>
+      <key>insertTicket</key>
+    </entry>
+    <entry>
+      <key>Ticket Control Center</key>
+    </entry>
+    <entry>
+      <key>getAllTickets</key>
+    </entry>
+    <entry>
+      <key>Mitarbeiter  für  Mitarbeitergruppe</key>
+    </entry>
+    <entry>
+      <key>Show Tickets in process</key>
+    </entry>
+    <entry>
+      <key>getTicketDetails</key>
+    </entry>
+    <entry>
+      <key>Ticket return</key>
+    </entry>
+    <entry>
+      <key>Ticket filter</key>
+    </entry>
+    <entry>
+      <key>Employess</key>
+    </entry>
+    <entry>
+      <key>Pull Ticket</key>
+    </entry>
+    <entry>
+      <key>Service-Admin</key>
+    </entry>
+    <entry>
+      <key>Serviceagent</key>
+    </entry>
+    <entry>
+      <key>Serviceticket</key>
+    </entry>
+    <entry>
+      <key>ticket entry mailbridge</key>
+    </entry>
+    <entry>
+      <key>Mitterbeitergruppe Postkorb</key>
+    </entry>
+    <entry>
+      <key>Inmob name</key>
+    </entry>
+    <entry>
+      <key>System</key>
+    </entry>
+    <entry>
+      <key>Service Dashboard</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmission</key>
+    </entry>
+    <entry>
+      <key>Open Tickets</key>
+    </entry>
+    <entry>
+      <key>Groups</key>
+    </entry>
+    <entry>
+      <key>E-Mail Adresse</key>
+    </entry>
+    <entry>
+      <key>Attribut</key>
+    </entry>
+    <entry>
+      <key>Mitarbeiters ( für  Mitarbeitergruppe)</key>
+    </entry>
+    <entry>
+      <key>Steine</key>
+    </entry>
+    <entry>
+      <key>Date type</key>
+    </entry>
+    <entry>
+      <key>Ticket Closure</key>
+    </entry>
+    <entry>
+      <key>Default Signature</key>
+      <value>Standard Signatur</value>
+    </entry>
+    <entry>
+      <key>New Ticket</key>
+    </entry>
+    <entry>
+      <key>Auswahl bearbeiten</key>
+    </entry>
+    <entry>
+      <key>getKeyword</key>
+    </entry>
+    <entry>
+      <key>Individual Answer</key>
+      <value>Individuelle Antwort</value>
+    </entry>
+    <entry>
+      <key>Supportticket</key>
+    </entry>
+    <entry>
+      <key>Fix</key>
+    </entry>
+    <entry>
+      <key>Buttons</key>
+    </entry>
+    <entry>
+      <key>InboxRelation</key>
+    </entry>
+    <entry>
+      <key>Mail address</key>
+    </entry>
+    <entry>
+      <key>Campaign steps</key>
+    </entry>
+    <entry>
+      <key>Valid from (as</key>
+    </entry>
+    <entry>
+      <key>ticket no.</key>
+    </entry>
+    <entry>
+      <key>Classification:</key>
+    </entry>
+    <entry>
+      <key>Weighted(€)</key>
+    </entry>
+    <entry>
+      <key>Please check if the following fields are filled correctly:
+                - Project title
+                - Organisation
+                - Status
+                - Project start(Date)
+                - Project type</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\
+                %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Answer Mail Address</key>
+    </entry>
+    <entry>
+      <key>My Forecast and Turnover</key>
+    </entry>
+    <entry>
+      <key>entry</key>
+      <value>Eingang</value>
+    </entry>
+    <entry>
+      <key>Exchange Rate</key>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind.</key>
+    </entry>
+    <entry>
+      <key>number of connections</key>
+    </entry>
+    <entry>
+      <key>Only</key>
+    </entry>
+    <entry>
+      <key>Price in</key>
+    </entry>
+    <entry>
+      <key>Send Answer Mail</key>
+    </entry>
+    <entry>
+      <key>We save your data until</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 4c0d9611e57a7fa5719ca0583a50d655a7d02a5a..3bf086a1836d24c1166a597f843a09ad5308801d 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -9849,6 +9849,1012 @@
     <entry>
       <key>Paste as Top Topic</key>
     </entry>
+    <entry>
+      <key>Search term</key>
+    </entry>
+    <entry>
+      <key>Create new note</key>
+    </entry>
+    <entry>
+      <key>Show the number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>Show my tickets that are in process</key>
+    </entry>
+    <entry>
+      <key>BCC</key>
+    </entry>
+    <entry>
+      <key>no inbox</key>
+    </entry>
+    <entry>
+      <key>Blocking Time Agent</key>
+    </entry>
+    <entry>
+      <key>Business E-Mail</key>
+    </entry>
+    <entry>
+      <key>Resubmission</key>
+    </entry>
+    <entry>
+      <key>Single (Service/External)</key>
+    </entry>
+    <entry>
+      <key>Show inboxes</key>
+    </entry>
+    <entry>
+      <key>Employee Group</key>
+    </entry>
+    <entry>
+      <key>Shows hom many sales projects are in their corresponding sales phase.</key>
+    </entry>
+    <entry>
+      <key>AVAILABLE</key>
+    </entry>
+    <entry>
+      <key>processing time</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Medium)</key>
+    </entry>
+    <entry>
+      <key>Service ticket template</key>
+    </entry>
+    <entry>
+      <key>Conclusion</key>
+    </entry>
+    <entry>
+      <key>Email content</key>
+    </entry>
+    <entry>
+      <key>Unresolved tickets</key>
+    </entry>
+    <entry>
+      <key>Comparison method</key>
+    </entry>
+    <entry>
+      <key>Show tickets I am the editor of</key>
+    </entry>
+    <entry>
+      <key>Complaint about advertisement</key>
+    </entry>
+    <entry>
+      <key>Statistic</key>
+    </entry>
+    <entry>
+      <key>Default ticket template</key>
+    </entry>
+    <entry>
+      <key>%0 Task(s) sucessfully forwarded to: %1</key>
+    </entry>
+    <entry>
+      <key>Mature after days</key>
+    </entry>
+    <entry>
+      <key>Campaign steps</key>
+    </entry>
+    <entry>
+      <key>Service ticket</key>
+    </entry>
+    <entry>
+      <key>Attribute determination</key>
+    </entry>
+    <entry>
+      <key>Reopen delay</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Status)</key>
+    </entry>
+    <entry>
+      <key>undefined</key>
+    </entry>
+    <entry>
+      <key>Valid from (as</key>
+    </entry>
+    <entry>
+      <key>day</key>
+    </entry>
+    <entry>
+      <key>done</key>
+    </entry>
+    <entry>
+      <key>Success</key>
+    </entry>
+    <entry>
+      <key>Note</key>
+    </entry>
+    <entry>
+      <key>Reporting</key>
+    </entry>
+    <entry>
+      <key>New Service ticket</key>
+    </entry>
+    <entry>
+      <key>Reply Template</key>
+    </entry>
+    <entry>
+      <key>Task maturity date</key>
+    </entry>
+    <entry>
+      <key>Open tickets</key>
+    </entry>
+    <entry>
+      <key>Ticket reopen delay</key>
+    </entry>
+    <entry>
+      <key>Supportticket template</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Medium)</key>
+    </entry>
+    <entry>
+      <key>Alternative email address</key>
+    </entry>
+    <entry>
+      <key>Template</key>
+    </entry>
+    <entry>
+      <key>Alternative phone</key>
+    </entry>
+    <entry>
+      <key>Ticket closure (days)</key>
+    </entry>
+    <entry>
+      <key>Enter new Ticket &amp; Contact</key>
+    </entry>
+    <entry>
+      <key>Serviceticket category</key>
+    </entry>
+    <entry>
+      <key>Back to report</key>
+    </entry>
+    <entry>
+      <key>Account balanced</key>
+    </entry>
+    <entry>
+      <key>Complaint about employee</key>
+    </entry>
+    <entry>
+      <key>Reset settings</key>
+    </entry>
+    <entry>
+      <key>Query about product</key>
+    </entry>
+    <entry>
+      <key>ticket no.</key>
+    </entry>
+    <entry>
+      <key>Employee group filter groups</key>
+    </entry>
+    <entry>
+      <key>Employee group rule groups</key>
+    </entry>
+    <entry>
+      <key>Employee Groups</key>
+    </entry>
+    <entry>
+      <key>Employee group filters</key>
+    </entry>
+    <entry>
+      <key>Attribute filters</key>
+    </entry>
+    <entry>
+      <key>inbox</key>
+    </entry>
+    <entry>
+      <key>Other complaint</key>
+    </entry>
+    <entry>
+      <key>Client</key>
+    </entry>
+    <entry>
+      <key>resubmitted</key>
+    </entry>
+    <entry>
+      <key>Resubmit ticket</key>
+    </entry>
+    <entry>
+      <key>Reply Mail</key>
+    </entry>
+    <entry>
+      <key>Classification:</key>
+    </entry>
+    <entry>
+      <key>Show unresolved tickets</key>
+    </entry>
+    <entry>
+      <key>New status</key>
+    </entry>
+    <entry>
+      <key>Autoeply settings</key>
+    </entry>
+    <entry>
+      <key>internal reply</key>
+    </entry>
+    <entry>
+      <key>CC</key>
+    </entry>
+    <entry>
+      <key>Single (Service/Internal)</key>
+    </entry>
+    <entry>
+      <key>Ticket number of the created ticket</key>
+    </entry>
+    <entry>
+      <key>Report Settings</key>
+    </entry>
+    <entry>
+      <key>Rule editor</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Status)</key>
+    </entry>
+    <entry>
+      <key>Please check if the following fields are filled correctly:
+                - Project title
+                - Organisation
+                - Status
+                - Project start(Date)
+                - Project type</key>
+    </entry>
+    <entry>
+      <key>Target</key>
+    </entry>
+    <entry>
+      <key>All activities</key>
+    </entry>
+    <entry>
+      <key>Inbox filters</key>
+    </entry>
+    <entry>
+      <key>To</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\
+                %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Date Field</key>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Status)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Status)</key>
+    </entry>
+    <entry>
+      <key>Alt. Phone</key>
+    </entry>
+    <entry>
+      <key>Follow-Up</key>
+    </entry>
+    <entry>
+      <key>Shows a chart for my target number of daily tickets</key>
+    </entry>
+    <entry>
+      <key>Inboxes</key>
+    </entry>
+    <entry>
+      <key>Cancellation of subscription</key>
+    </entry>
+    <entry>
+      <key>Show open tickets</key>
+    </entry>
+    <entry>
+      <key>Blocking time (Minute)</key>
+    </entry>
+    <entry>
+      <key>Query</key>
+    </entry>
+    <entry>
+      <key>Employee group rule group</key>
+    </entry>
+    <entry>
+      <key>Forward Ticket</key>
+    </entry>
+    <entry>
+      <key>Use all serviceticket categories</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmitted</key>
+    </entry>
+    <entry>
+      <key>Supportticket templates</key>
+    </entry>
+    <entry>
+      <key>Alternative phone number</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmitted by</key>
+    </entry>
+    <entry>
+      <key>Support tickets</key>
+    </entry>
+    <entry>
+      <key>Content to forward</key>
+    </entry>
+    <entry>
+      <key>New note</key>
+    </entry>
+    <entry>
+      <key>Re-Open</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Medium)</key>
+    </entry>
+    <entry>
+      <key>change selected</key>
+    </entry>
+    <entry>
+      <key>Supportticket Template</key>
+    </entry>
+    <entry>
+      <key>limit</key>
+    </entry>
+    <entry>
+      <key>Take Ticket</key>
+    </entry>
+    <entry>
+      <key>Blocking Time Agent (hours)</key>
+    </entry>
+    <entry>
+      <key>entry</key>
+    </entry>
+    <entry>
+      <key>Body</key>
+    </entry>
+    <entry>
+      <key>Averages Tickets Employee</key>
+    </entry>
+    <entry>
+      <key>Show tickets that are not resolved</key>
+    </entry>
+    <entry>
+      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+    </entry>
+    <entry>
+      <key>Failure (customer)</key>
+    </entry>
+    <entry>
+      <key>Exchange Rate</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 4</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 3</key>
+    </entry>
+    <entry>
+      <key>Support ticket templates</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 2</key>
+    </entry>
+    <entry>
+      <key>Settings Filter 1</key>
+    </entry>
+    <entry>
+      <key>New date due</key>
+    </entry>
+    <entry>
+      <key>Ticket duplicated (duplicate)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Medium)</key>
+    </entry>
+    <entry>
+      <key>Person in Charge</key>
+    </entry>
+    <entry>
+      <key>Reply to All</key>
+    </entry>
+    <entry>
+      <key>Days nr.</key>
+    </entry>
+    <entry>
+      <key>billing amount</key>
+    </entry>
+    <entry>
+      <key>starting from D€</key>
+    </entry>
+    <entry>
+      <key>Status change date</key>
+    </entry>
+    <entry>
+      <key>days</key>
+    </entry>
+    <entry>
+      <key>Forward</key>
+    </entry>
+    <entry>
+      <key>Document Templates</key>
+    </entry>
+    <entry>
+      <key>inboxEmail</key>
+    </entry>
+    <entry>
+      <key>Serviceticket categories</key>
+    </entry>
+    <entry>
+      <key>complaint</key>
+    </entry>
+    <entry>
+      <key>Additional Info</key>
+    </entry>
+    <entry>
+      <key>Ticket was duplicated by</key>
+    </entry>
+    <entry>
+      <key>Inbox filter group</key>
+    </entry>
+    <entry>
+      <key>Assignment</key>
+    </entry>
+    <entry>
+      <key>Further informations</key>
+    </entry>
+    <entry>
+      <key>Single (Service/All)</key>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Medium)</key>
+    </entry>
+    <entry>
+      <key>Duplicate Ticket</key>
+    </entry>
+    <entry>
+      <key>Attribute filter</key>
+    </entry>
+    <entry>
+      <key>Next ticket</key>
+    </entry>
+    <entry>
+      <key>Return ticket</key>
+    </entry>
+    <entry>
+      <key>Change selected</key>
+    </entry>
+    <entry>
+      <key>Last status change</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Mail)</key>
+    </entry>
+    <entry>
+      <key>Blocking Time (days)</key>
+    </entry>
+    <entry>
+      <key>no USER for inboxEmail</key>
+    </entry>
+    <entry>
+      <key>Ticket duplicated (original)</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>Review</key>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind.</key>
+    </entry>
+    <entry>
+      <key>Chart number of tickets per inbox (Mail)</key>
+    </entry>
+    <entry>
+      <key>Business Fax</key>
+    </entry>
+    <entry>
+      <key>request</key>
+    </entry>
+    <entry>
+      <key>Only</key>
+    </entry>
+    <entry>
+      <key>Support ticket template</key>
+    </entry>
+    <entry>
+      <key>active</key>
+    </entry>
+    <entry>
+      <key>Employee group filter group</key>
+    </entry>
+    <entry>
+      <key>UNAVAILABLE</key>
+    </entry>
+    <entry>
+      <key>reply</key>
+    </entry>
+    <entry>
+      <key>Alt. E-Mail</key>
+    </entry>
+    <entry>
+      <key>Closure</key>
+    </entry>
+    <entry>
+      <key>Ticket closure</key>
+    </entry>
+    <entry>
+      <key>New service ticket</key>
+    </entry>
+    <entry>
+      <key>Please select a Inbox</key>
+    </entry>
+    <entry>
+      <key>Dates</key>
+    </entry>
+    <entry>
+      <key>Data record</key>
+    </entry>
+    <entry>
+      <key>The value in the "Threshold" field must be between 0 and 100.</key>
+    </entry>
+    <entry>
+      <key>Resolved tickets</key>
+    </entry>
+    <entry>
+      <key>Cancellation of order</key>
+    </entry>
+    <entry>
+      <key>rule editor</key>
+    </entry>
+    <entry>
+      <key>Ticket filters</key>
+    </entry>
+    <entry>
+      <key>inboxes</key>
+    </entry>
+    <entry>
+      <key>New support ticket</key>
+    </entry>
+    <entry>
+      <key>Complaint about product</key>
+    </entry>
+    <entry>
+      <key>CUSTOMER CARD</key>
+    </entry>
+    <entry>
+      <key>processing</key>
+    </entry>
+    <entry>
+      <key>Category determination</key>
+    </entry>
+    <entry>
+      <key>Inbox</key>
+    </entry>
+    <entry>
+      <key>Page</key>
+    </entry>
+    <entry>
+      <key>Change inbox</key>
+    </entry>
+    <entry>
+      <key>Unresolved Tickets</key>
+    </entry>
+    <entry>
+      <key>Properties</key>
+    </entry>
+    <entry>
+      <key>Forward ticket to other inbox</key>
+    </entry>
+    <entry>
+      <key>Enter new Ticket</key>
+    </entry>
+    <entry>
+      <key>Email subject</key>
+    </entry>
+    <entry>
+      <key>Change Ticket Status</key>
+    </entry>
+    <entry>
+      <key>Blocking Time</key>
+    </entry>
+    <entry>
+      <key>Alternative email</key>
+    </entry>
+    <entry>
+      <key>reopen Ticket</key>
+    </entry>
+    <entry>
+      <key>determined in</key>
+    </entry>
+    <entry>
+      <key>Ticket created through duplication by</key>
+    </entry>
+    <entry>
+      <key>Forward ticket</key>
+    </entry>
+    <entry>
+      <key>Phone of contact</key>
+    </entry>
+    <entry>
+      <key>Team leader dashboard</key>
+    </entry>
+    <entry>
+      <key>Inbox filter groups</key>
+    </entry>
+    <entry>
+      <key>Mail Address</key>
+    </entry>
+    <entry>
+      <key>Ticket categories</key>
+    </entry>
+    <entry>
+      <key>Show resolved tickets</key>
+    </entry>
+    <entry>
+      <key>Failure (employee)</key>
+    </entry>
+    <entry>
+      <key>duplicate Ticket</key>
+    </entry>
+    <entry>
+      <key>Pull Tickets</key>
+    </entry>
+    <entry>
+      <key>Mail activities</key>
+    </entry>
+    <entry>
+      <key>Employee group rules</key>
+    </entry>
+    <entry>
+      <key>Conclusion (Mailbridge)</key>
+    </entry>
+    <entry>
+      <key>Re-open</key>
+    </entry>
+    <entry>
+      <key>Ticket category</key>
+    </entry>
+    <entry>
+      <key>all</key>
+    </entry>
+    <entry>
+      <key>Number of Tickets (Mail)</key>
+    </entry>
+    <entry>
+      <key>Daily goals</key>
+    </entry>
+    <entry>
+      <key>Ticket number of the original ticket</key>
+    </entry>
+    <entry>
+      <key>Employee group filter</key>
+    </entry>
+    <entry>
+      <key>Daily goal</key>
+    </entry>
+    <entry>
+      <key>Domain</key>
+    </entry>
+    <entry>
+      <key>Price in</key>
+    </entry>
+    <entry>
+      <key>Contact &amp; Serviceticket</key>
+    </entry>
+    <entry>
+      <key>dupliacte Ticket</key>
+    </entry>
+    <entry>
+      <key>Email of contact</key>
+    </entry>
+    <entry>
+      <key>Tickets in process</key>
+    </entry>
+    <entry>
+      <key>@Reply</key>
+    </entry>
+    <entry>
+      <key>Supportticket Templates</key>
+    </entry>
+    <entry>
+      <key>Informations</key>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 2</key>
+    </entry>
+    <entry>
+      <key>starting at 1000</key>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 3</key>
+    </entry>
+    <entry>
+      <key>Emails Autoreply 1</key>
+    </entry>
+    <entry>
+      <key>Ticket template</key>
+    </entry>
+    <entry>
+      <key>no Goal</key>
+    </entry>
+    <entry>
+      <key>re-open</key>
+    </entry>
+    <entry>
+      <key>Pull next ticket</key>
+    </entry>
+    <entry>
+      <key>Return Ticket</key>
+    </entry>
+    <entry>
+      <key>Send via Mail</key>
+    </entry>
+    <entry>
+      <key>contact formular</key>
+    </entry>
+    <entry>
+      <key>Employee groups</key>
+    </entry>
+    <entry>
+      <key>Pull tickets</key>
+    </entry>
+    <entry>
+      <key>inactive</key>
+    </entry>
+    <entry>
+      <key>Inbox Name</key>
+    </entry>
+    <entry>
+      <key>Chart Inbox Tickets</key>
+    </entry>
+    <entry>
+      <key>Business Mobile</key>
+    </entry>
+    <entry>
+      <key>Current ticket</key>
+    </entry>
+    <entry>
+      <key>Query other</key>
+    </entry>
+    <entry>
+      <key>employee checks</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets total (Mail)</key>
+    </entry>
+    <entry>
+      <key>Reply to</key>
+    </entry>
+    <entry>
+      <key>Send Answer Mail</key>
+    </entry>
+    <entry>
+      <key>Employee group rule</key>
+    </entry>
+    <entry>
+      <key>Business Phone</key>
+    </entry>
+    <entry>
+      <key>no inboxEmail for inbox</key>
+    </entry>
+    <entry>
+      <key>Date/Periode</key>
+    </entry>
+    <entry>
+      <key>Template No.</key>
+    </entry>
+    <entry>
+      <key>Inbox filter</key>
+    </entry>
+    <entry>
+      <key>Contact Info</key>
+    </entry>
+    <entry>
+      <key>CONTACTID (UUID)</key>
+    </entry>
+    <entry>
+      <key>Ticket daily goals</key>
+    </entry>
+    <entry>
+      <key>Complaint</key>
+    </entry>
+    <entry>
+      <key>Only show results</key>
+    </entry>
+    <entry>
+      <key>Chart Number of tickets per inbox (Status)</key>
+    </entry>
+    <entry>
+      <key>Ticket reopen delay (days)</key>
+    </entry>
+    <entry>
+      <key>Control editor</key>
+    </entry>
+    <entry>
+      <key>We save your data until</key>
+    </entry>
+    <entry>
+      <key>Set as default signature</key>
+    </entry>
+    <entry>
+      <key>Signature to set default</key>
+    </entry>
+    <entry>
+      <key>Existing default signature</key>
+    </entry>
+    <entry>
+      <key>Service tickets</key>
+    </entry>
+    <entry>
+      <key>Service ticket templates</key>
+    </entry>
+    <entry>
+      <key>Status (Mailbridge)</key>
+    </entry>
+    <entry>
+      <key>Service Administration</key>
+    </entry>
+    <entry>
+      <key>Save changes</key>
+    </entry>
+    <entry>
+      <key>Individual Reply Template</key>
+    </entry>
+    <entry>
+      <key>Ziegel</key>
+    </entry>
+    <entry>
+      <key>Mails</key>
+    </entry>
+    <entry>
+      <key>Threshold (in %)</key>
+    </entry>
+    <entry>
+      <key>Informationen</key>
+    </entry>
+    <entry>
+      <key>Pull next ticket or create new ones</key>
+    </entry>
+    <entry>
+      <key>Abgeschlossen</key>
+    </entry>
+    <entry>
+      <key>insertTicket</key>
+    </entry>
+    <entry>
+      <key>Ticket Control Center</key>
+    </entry>
+    <entry>
+      <key>getAllTickets</key>
+    </entry>
+    <entry>
+      <key>Mitarbeiter  für  Mitarbeitergruppe</key>
+    </entry>
+    <entry>
+      <key>Show Tickets in process</key>
+    </entry>
+    <entry>
+      <key>getTicketDetails</key>
+    </entry>
+    <entry>
+      <key>Ticket return</key>
+    </entry>
+    <entry>
+      <key>Ticket filter</key>
+    </entry>
+    <entry>
+      <key>Employess</key>
+    </entry>
+    <entry>
+      <key>Pull Ticket</key>
+    </entry>
+    <entry>
+      <key>Service-Admin</key>
+    </entry>
+    <entry>
+      <key>Answer Mail Address</key>
+    </entry>
+    <entry>
+      <key>Serviceagent</key>
+    </entry>
+    <entry>
+      <key>Serviceticket</key>
+    </entry>
+    <entry>
+      <key>ticket entry mailbridge</key>
+    </entry>
+    <entry>
+      <key>Mitterbeitergruppe Postkorb</key>
+    </entry>
+    <entry>
+      <key>Inmob name</key>
+    </entry>
+    <entry>
+      <key>System</key>
+    </entry>
+    <entry>
+      <key>Service Dashboard</key>
+    </entry>
+    <entry>
+      <key>Ticket resubmission</key>
+    </entry>
+    <entry>
+      <key>Open Tickets</key>
+    </entry>
+    <entry>
+      <key>Groups</key>
+    </entry>
+    <entry>
+      <key>E-Mail Adresse</key>
+    </entry>
+    <entry>
+      <key>Attribut</key>
+    </entry>
+    <entry>
+      <key>Mitarbeiters ( für  Mitarbeitergruppe)</key>
+    </entry>
+    <entry>
+      <key>Steine</key>
+    </entry>
+    <entry>
+      <key>Date type</key>
+    </entry>
+    <entry>
+      <key>Ticket Closure</key>
+    </entry>
+    <entry>
+      <key>Default Signature</key>
+    </entry>
+    <entry>
+      <key>New Ticket</key>
+    </entry>
+    <entry>
+      <key>Auswahl bearbeiten</key>
+    </entry>
+    <entry>
+      <key>getKeyword</key>
+    </entry>
+    <entry>
+      <key>Individual Answer</key>
+    </entry>
+    <entry>
+      <key>Supportticket</key>
+    </entry>
+    <entry>
+      <key>Fix</key>
+    </entry>
+    <entry>
+      <key>Buttons</key>
+    </entry>
+    <entry>
+      <key>InboxRelation</key>
+    </entry>
+    <entry>
+      <key>Mail address</key>
+    </entry>
+    <entry>
+      <key>This priority is already assigned.</key>
+    </entry>
+    <entry>
+      <key>Send Answer</key>
+    </entry>
+    <entry>
+      <key>Fullfilled</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Ticket no.</key>
+    </entry>
+    <entry>
+      <key>Checklists</key>
+    </entry>
+    <entry>
+      <key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
+    </entry>
+    <entry>
+      <key>Volume Weighted(€)</key>
+    </entry>
+    <entry>
+      <key>Entry</key>
+    </entry>
+    <entry>
+      <key>Answer Address</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/Activity/Activity.aod b/neonContext/Activity/Activity.aod
index d37b0fdff120d3f210416d91adcfbe55446eb037..38c510d1fd2b5e39f45474fab35d1399a9400ac8 100644
--- a/neonContext/Activity/Activity.aod
+++ b/neonContext/Activity/Activity.aod
@@ -45,6 +45,10 @@
       <name>f1e3f5e0-1002-4a68-9114-0389c0d7d4d1</name>
       <view>ActivityAnalyses_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>6bd90850-7818-4187-8518-1172c9fb92ad</name>
+      <view>ActivityNoteEdit_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>90a403ad-675e-4451-9469-9737da372f92</name>
     </neonViewReference>
diff --git a/neonContext/AttributeFilter/AttributeFilter.aod b/neonContext/AttributeFilter/AttributeFilter.aod
new file mode 100644
index 0000000000000000000000000000000000000000..81d978ea57e5ee2fd32b4907c97bec28ddfb6443
--- /dev/null
+++ b/neonContext/AttributeFilter/AttributeFilter.aod
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>AttributeFilter</name>
+  <title>Attribute filter</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>AttributeFilterFilter_view</filterView>
+  <editView>AttributeFilterEdit_view</editView>
+  <entity>AttributeFilter_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>7fca9ac4-244e-4933-8601-dbdf24a12583</name>
+      <view>AttributeFilterFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d5105a89-9483-4982-9a12-76af0395ec0f</name>
+      <view>AttributeFilterEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod b/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e998fb5435005c5d3b1d4f6942d1e5f5fa9a9512
--- /dev/null
+++ b/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>DocumentTemplateTicketCategory</name>
+  <title>Serviceticket category</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>DocumentTemplateTicketCategory_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>0d256951-3c6b-42ee-bd09-bc90ab9d18a2</name>
+      <view>DocumentTemplateTicketCategoryMultiEdit_View</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c611d9fe-017f-4317-9118-99b83ddcea7d</name>
+      <view>DocumentTemplateTicketCategoryFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>5255745a-bd19-4920-a0b6-07fd2174a175</name>
+      <view>DocumentTemplateTicketCategoryList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/EmployeeGroup/EmployeeGroup.aod b/neonContext/EmployeeGroup/EmployeeGroup.aod
new file mode 100644
index 0000000000000000000000000000000000000000..317f26df7755ac1bd1e5e83b32e91e3d0fba9232
--- /dev/null
+++ b/neonContext/EmployeeGroup/EmployeeGroup.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>EmployeeGroup</name>
+  <title>Employee Group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainView>EmployeeGroupMain_view</mainView>
+  <filterView>EmployeeGroupFilter_view</filterView>
+  <editView>EmployeeGroupEdit_view</editView>
+  <previewView>EmployeeGroupPreviewExt_view</previewView>
+  <entity>EmployeeGroup_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>c7568a58-6608-479f-abb5-bf08e9a5a2bd</name>
+      <view>EmployeeGroupEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6803eca4-4d68-4368-8fab-aed90451528f</name>
+      <view>EmployeeGroupFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>77d0ae8a-fc84-4a8e-af21-1d16103e2283</name>
+      <view>EmployeeGroupPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>089ebbf8-bc41-43ad-9599-60cdd94b6d3a</name>
+      <view>EmployeeGroupMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d6dab481-f91e-4ee2-a69c-0c330c80061e</name>
+      <view>EmployeeGroupPreviewExt_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/EmployeeGroupContactRelation/EmployeeGroupContactRelation.aod b/neonContext/EmployeeGroupContactRelation/EmployeeGroupContactRelation.aod
new file mode 100644
index 0000000000000000000000000000000000000000..309dad925ab579d8b4f5b299fb60f817468e08bc
--- /dev/null
+++ b/neonContext/EmployeeGroupContactRelation/EmployeeGroupContactRelation.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>EmployeeGroupContactRelation</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>EmployeeGroupConRelationFilter_view</filterView>
+  <editView>EmployeeGroupConRelationEdit_view</editView>
+  <entity>EmployeeGroupContactRelation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>2588d3d5-04f4-4868-a941-48a94b66a97b</name>
+      <view>EmployeeGroupConRelMultiedit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>5a34af3f-48df-4be6-8a7e-ea698f9dabe5</name>
+      <view>EmployeeGroupConRelList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ab35da82-e520-4a08-9607-2470c3b8514d</name>
+      <view>EmployeeGroupConRelationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>9851f0c7-d597-44a9-8806-c072aafac84c</name>
+      <view>EmployeeGroupConRelationEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/EmployeeGroupRule/EmployeeGroupRule.aod b/neonContext/EmployeeGroupRule/EmployeeGroupRule.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ff6230cdb55cedefa35639b3d9d93f7d6d55fd8
--- /dev/null
+++ b/neonContext/EmployeeGroupRule/EmployeeGroupRule.aod
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>EmployeeGroupRule</name>
+  <title>Employee group rule</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>EmployeeGroupRuleFilter_view</filterView>
+  <editView>EmployeeGroupRuleEdit_view</editView>
+  <entity>EmployeeGroupRule_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>4585a178-7668-427a-8b9e-31b29cb456f5</name>
+      <view>EmployeeGroupRuleFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6afea8bd-b094-494f-bff9-2b01c864f430</name>
+      <view>EmployeeGroupRuleEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/EmployeeGroupRuleGroup/EmployeeGroupRuleGroup.aod b/neonContext/EmployeeGroupRuleGroup/EmployeeGroupRuleGroup.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c551b61529d5bc0b8e571afa0ac091e9733698b4
--- /dev/null
+++ b/neonContext/EmployeeGroupRuleGroup/EmployeeGroupRuleGroup.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>EmployeeGroupRuleGroup</name>
+  <title>Employee group rule group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:CLIPBOARD_TEXT</icon>
+  <mainView>EmployeeGroupRuleGroupMain_view</mainView>
+  <filterView>EmployeeGroupRuleGroupFilter_view</filterView>
+  <editView>EmployeeGroupRuleGroupEdit_view</editView>
+  <previewView>EmployeeGroupRuleGroupPreview_view</previewView>
+  <lookupView>EmployeeGroupRuleGroupFilter_view</lookupView>
+  <entity>EmployeeGroupRuleGroup_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>c57f269c-5839-424a-afd5-b2643441ea0d</name>
+      <view>EmployeeGroupRuleGroupFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4e198ee9-e8ea-4adf-a19e-cd6ac9eaa9af</name>
+      <view>EmployeeGroupRuleGroupMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7034fd64-8365-4c8e-9565-f06345bd7b22</name>
+      <view>EmployeeGroupRuleGroupEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>d7dc8e82-4e6c-4504-91c9-3b754eed9c5d</name>
+      <view>EmployeeGroupRuleGroupPreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/EmployeeGroupRuleGroupRelation/EmployeeGroupRuleGroupRelation.aod b/neonContext/EmployeeGroupRuleGroupRelation/EmployeeGroupRuleGroupRelation.aod
new file mode 100644
index 0000000000000000000000000000000000000000..36cc0781ee01172b96ccc2df4be3de6495d24731
--- /dev/null
+++ b/neonContext/EmployeeGroupRuleGroupRelation/EmployeeGroupRuleGroupRelation.aod
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>EmployeeGroupRuleGroupRelation</name>
+  <title>Employee group rule group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>EmployeeGroupRuleGroupRelationFilter_view</filterView>
+  <editView>EmployeeGroupRuleGroupRelationEdit_view</editView>
+  <entity>EmployeeGroupRuleGroupRelation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>31a49eab-47b8-4a1b-a734-cfad6047ad9f</name>
+      <view>EmployeeGroupRuleGroupRelationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>925615e3-dce0-403b-ba86-866a5d7296f8</name>
+      <view>EmployeeGroupRuleGroupRelationEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Inbox/Inbox.aod b/neonContext/Inbox/Inbox.aod
new file mode 100644
index 0000000000000000000000000000000000000000..404080a29851fe59e0f5dc4083f78322ce180b84
--- /dev/null
+++ b/neonContext/Inbox/Inbox.aod
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>Inbox</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainView>InboxMain_view</mainView>
+  <filterView>InboxFilter_view</filterView>
+  <editView>InboxEdit_view</editView>
+  <previewView>InboxPreviewExt_view</previewView>
+  <entity>Inbox_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>fe88b827-edf8-4055-8358-57d5da146c59</name>
+      <view>InboxFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ed382f2a-34dc-4c70-884e-fb89146acbf2</name>
+      <view>InboxEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>24154929-1b2d-43f1-83e3-ece4dd1eeceb</name>
+      <view>InboxPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3f3161a3-7a79-49b8-8fa1-0cb4809fb423</name>
+      <view>InboxMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>55808e9d-d41a-4b38-aebc-7848ff415b2f</name>
+      <view>InboxAssignement_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>a6f93ba1-9e79-440d-987a-e1d3a1e6d27c</name>
+      <view>InboxPreviewExt_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>30b4313e-3a94-4b10-b452-05b924b3b2b1</name>
+      <view>InboxChart_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f5ef61b1-6405-4e75-bb43-8aab069bfb34</name>
+      <view>InboxChartStatusDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e2cc3ca9-7be4-4a59-9f26-d1a7132ce941</name>
+      <view>InboxChartMailDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>277c23e1-0592-4c72-b320-118d3972285e</name>
+      <view>InboxChartMediumDrawer_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxEmployeegroupRelation/InboxEmployeegroupRelation.aod b/neonContext/InboxEmployeegroupRelation/InboxEmployeegroupRelation.aod
new file mode 100644
index 0000000000000000000000000000000000000000..86e5db1fbeb960229bb73ab84622f2cbf60e459d
--- /dev/null
+++ b/neonContext/InboxEmployeegroupRelation/InboxEmployeegroupRelation.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxEmployeegroupRelation</name>
+  <title>Mitterbeitergruppe Postkorb</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <editView>InboxEmployeegroupRelationEdit_view</editView>
+  <entity>InboxEmployeegroupRelation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>150a8560-8785-4668-bb24-f15976448203</name>
+      <view>InboxEmployeegroupRelationMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>221c228d-7711-4876-8b33-20d8b7870121</name>
+      <view>InboxEmployeegroupRelationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bf5847a5-d569-493e-98e1-9ab58ad10247</name>
+      <view>InboxEmployeegroupRelationList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>a06eb6ad-8c11-4a33-bd80-643586bcafe7</name>
+      <view>InboxEmployeegroupRelationEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxFilter/InboxFilter.aod b/neonContext/InboxFilter/InboxFilter.aod
new file mode 100644
index 0000000000000000000000000000000000000000..46d7e9ec3224de973ee3f45462134986b936d75d
--- /dev/null
+++ b/neonContext/InboxFilter/InboxFilter.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxFilter</name>
+  <title>Inbox filter</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:FILTER</icon>
+  <filterView>InboxFilterFilter_view</filterView>
+  <editView>InboxFilterEdit_view</editView>
+  <entity>InboxFilter_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>2c3b7eb6-a1ef-4e0c-b6c2-6e1a4ae59f37</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3253ba3d-0c32-4ad6-adea-fb5b727adc21</name>
+      <view>InboxFilterEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f67b2a45-8fc3-41be-b7ab-a7eb03bf7a0e</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c7db05d0-62b6-4178-92a7-54143514d08e</name>
+      <view>InboxFilterFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxFilterGroup/InboxFilterGroup.aod b/neonContext/InboxFilterGroup/InboxFilterGroup.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c9be920ce6b1d75f3c340abd852b6aeb3b6828c9
--- /dev/null
+++ b/neonContext/InboxFilterGroup/InboxFilterGroup.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxFilterGroup</name>
+  <title>Inbox filter group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:FILTER</icon>
+  <mainView>InboxFilterGroupMain_view</mainView>
+  <filterView>InboxFilterGroupFilter_view</filterView>
+  <editView>InboxFilterGroupEdit_view</editView>
+  <previewView>InboxFilterGroupPreview_view</previewView>
+  <lookupView>InboxFilterGroupFilter_view</lookupView>
+  <entity>InboxFilterGroup_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>7a851796-b640-4ba3-845e-3cd88c10e401</name>
+      <view>InboxFilterGroupFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>6aac46d9-1687-4fd5-8377-b58d70a1a7da</name>
+      <view>InboxFilterGroupEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2d9aba4d-5a71-44e1-b02b-8d7c320b3e28</name>
+      <view>InboxFilterGroupMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>0a8c2342-b6bd-4214-a3a3-5b7f920a3a03</name>
+      <view>InboxFilterGroupPreview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxFilterGroupRelation/InboxFilterGroupRelation.aod b/neonContext/InboxFilterGroupRelation/InboxFilterGroupRelation.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3aa55087c476f61160a2ae8e3616cbc037b1fe01
--- /dev/null
+++ b/neonContext/InboxFilterGroupRelation/InboxFilterGroupRelation.aod
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxFilterGroupRelation</name>
+  <title>Inbox filter group</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:FILTER</icon>
+  <filterView>InboxFilterGroupRelationFilter_view</filterView>
+  <editView>InboxFilterGroupRelationEdit_view</editView>
+  <entity>InboxFilterGroupRelation_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>e55e2b90-4799-49b8-b6ad-40dda68da87a</name>
+      <view>InboxFilterGroupRelationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cb1b1e3f-5933-49d4-8798-4084646da852</name>
+      <view>InboxFilterGroupRelationEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxTicketChart/InboxTicketChart.aod b/neonContext/InboxTicketChart/InboxTicketChart.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b74bc8719eb56b9e2827fc7455bd568cc5b8e384
--- /dev/null
+++ b/neonContext/InboxTicketChart/InboxTicketChart.aod
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxTicketChart</name>
+  <title>Chart Inbox Tickets</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/neonContext/InboxTicketChart/documentation.adoc</documentation>
+  <filterView>InboxTicketChart_view</filterView>
+  <entity>InboxTicketChart_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>80eeb5a9-0fab-4ee1-86fd-0f75d9d4a4a1</name>
+      <view>InboxTicketChart_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxTicketChart/documentation.adoc b/neonContext/InboxTicketChart/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..aefef4429e67a11bdd3571786a3ddef401b8713b
--- /dev/null
+++ b/neonContext/InboxTicketChart/documentation.adoc
@@ -0,0 +1,3 @@
+= InboxTicketChart_entity
+
+Chart Number of tickets per inbox (Status)
\ No newline at end of file
diff --git a/neonContext/InboxTicketChartMail/InboxTicketChartMail.aod b/neonContext/InboxTicketChartMail/InboxTicketChartMail.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b37873b0f032204632895ac0634b549d9601b160
--- /dev/null
+++ b/neonContext/InboxTicketChartMail/InboxTicketChartMail.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxTicketChartMail</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>InboxTicketChartMail_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>46569ab5-6362-490c-857f-acc550eede99</name>
+      <view>InboxTicketChartMail_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/InboxTicketChartMedium/InboxTicketChartMedium.aod b/neonContext/InboxTicketChartMedium/InboxTicketChartMedium.aod
new file mode 100644
index 0000000000000000000000000000000000000000..056d93768a8384a679bac927113dd4a03e7957e3
--- /dev/null
+++ b/neonContext/InboxTicketChartMedium/InboxTicketChartMedium.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>InboxTicketChartMedium</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>InboxTicketChartMedium_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>020fa566-8440-43a8-a7ac-d0ac2aa42235</name>
+      <view>InboxTicketChartMedium_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/MailSignature/MailSignature.aod b/neonContext/MailSignature/MailSignature.aod
new file mode 100644
index 0000000000000000000000000000000000000000..75537ed7663eb74c00c739ec419712ec0efee12d
--- /dev/null
+++ b/neonContext/MailSignature/MailSignature.aod
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>MailSignature</name>
+  <title>Mail</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>MailSignatureFilter_view</filterView>
+  <editView>MailSignatureEdit_view</editView>
+  <previewView>MailSignaturePrieview_view</previewView>
+  <lookupView>MailSignatureLookup_view</lookupView>
+  <entity>MailSignature_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>a1c1785c-7258-4217-8c8c-466e54ca7689</name>
+      <view>MailSignatureFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>0c6688c7-07d1-4a41-9397-a56514767c16</name>
+      <view>MailSignatureEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>a6c4773f-ec46-46ea-930b-8e245f0f75f6</name>
+      <view>MailSignatureLookup_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bb2725cc-815a-4d6f-b73d-d0b5bfb1f13f</name>
+      <view>MailSignaturePrieview_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/MailSignatureDefaultSignature/MailSignatureDefaultSignature.aod b/neonContext/MailSignatureDefaultSignature/MailSignatureDefaultSignature.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8fc1f291753117d8f8bda9f57d6ba9af2c851f1f
--- /dev/null
+++ b/neonContext/MailSignatureDefaultSignature/MailSignatureDefaultSignature.aod
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>MailSignatureDefaultSignature</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <editView>MailSignatureDefaultSignatureEdit_view</editView>
+  <entity>MailSignatureDefaultSignature_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>9b978fed-669c-47d2-96be-5fcfd10cbeb9</name>
+      <view>MailSignatureDefaultSignatureEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 89ed9017e376a5826a9972eef836ac0da2fe8194..89a7339350b87eddf5f0ac0193442da84a5a07b1 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -71,5 +71,9 @@
       <name>dc6b609b-7e28-4f76-b7f3-6fd8696b9b7d</name>
       <view>PersonFilterOverlay_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f69538b6-2565-4dc9-a418-f5a35af4fec8</name>
+      <view>PersonEditServiceTicket_View</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ServiceEmail/ServiceEmail.aod b/neonContext/ServiceEmail/ServiceEmail.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5f13b41f84af857dbc115606071a014df6ddda58
--- /dev/null
+++ b/neonContext/ServiceEmail/ServiceEmail.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ServiceEmail</name>
+  <title>Write Email</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:MAILBOX</icon>
+  <editView>ServiceEmailEdit_view</editView>
+  <devices>
+    <element>MOBILE</element>
+    <element>TABLET</element>
+    <element>DESKTOP</element>
+  </devices>
+  <entity>ServiceEmail_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>d139cb55-0d39-4ffc-91c6-39269c078e5e</name>
+      <view>ServiceEmailEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3264913d-9a5a-4df4-b5ea-c93778626ccd</name>
+      <view>ServiceForwardEmailEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ServiceEmailAllDocuments/ServiceEmailAllDocuments.aod b/neonContext/ServiceEmailAllDocuments/ServiceEmailAllDocuments.aod
new file mode 100644
index 0000000000000000000000000000000000000000..786584a9d22852d9850fe4fd65a4c4ca5542a511
--- /dev/null
+++ b/neonContext/ServiceEmailAllDocuments/ServiceEmailAllDocuments.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ServiceEmailAllDocuments</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ServiceEmailAllDocuments_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>b54b8e72-22d5-4b04-9967-bfd44ec9858b</name>
+      <view>ServiceEmailAllDocumentsMultiEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ServiceEmailFiles/ServiceEmailFiles.aod b/neonContext/ServiceEmailFiles/ServiceEmailFiles.aod
new file mode 100644
index 0000000000000000000000000000000000000000..599a8d98727992778c58f8573e761da3ff93679d
--- /dev/null
+++ b/neonContext/ServiceEmailFiles/ServiceEmailFiles.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ServiceEmailFiles</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ServiceEmailFiles_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>53c9c892-0065-44ac-afd6-ea4061735e37</name>
+      <view>ServiceemailFilesMultiEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ServiceEmailRecipients/ServiceEmailRecipients.aod b/neonContext/ServiceEmailRecipients/ServiceEmailRecipients.aod
new file mode 100644
index 0000000000000000000000000000000000000000..88f903afc702b6c68ee4e1595b65f3b6cace8c6c
--- /dev/null
+++ b/neonContext/ServiceEmailRecipients/ServiceEmailRecipients.aod
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ServiceEmailRecipients</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ServiceEmailRecipients_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>185ab0f9-8610-42cb-967d-6a4568d1acfc</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>fc3145fd-2ae2-4233-a873-cc4ae01106a9</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c4ead7b5-4f8c-43cd-a555-48b6c1e6b75c</name>
+      <view>ServiceEmailRecipientsToMutliEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c757a393-cff9-467f-a03e-d1d4c15b067c</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3dd502b5-1093-4187-831f-adf0ec12aede</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>25d06156-b0f5-4914-b523-78c4b9222655</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>a8c4f117-3768-4313-b0a8-92577672ea43</name>
+      <view>ServiceEmailRecipientsToEmployeesMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4030b85d-3b39-474d-94b4-078e7a8ab527</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>25adfb0e-4a83-4c43-b3f6-a8f6ec850d96</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>99f86768-27a4-436c-975d-9e53d2d1fb86</name>
+      <view>ServiceEmailRecipientsCCMutliEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>9a581f3a-0480-4cc8-994d-30792de92683</name>
+      <view>ServiceEmailRecipientsBCCMutliEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cd321dfb-cedf-4fab-936b-92cd9d9ab906</name>
+      <view>ServiceEmailRecipientsCCEmployeesMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>226a165b-43ce-41b9-a470-95eebf3309e6</name>
+      <view>ServiceEmailRecipientsBCCEmployeesMultiEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ServiceEmail_Documents/ServiceEmail_Documents.aod b/neonContext/ServiceEmail_Documents/ServiceEmail_Documents.aod
new file mode 100644
index 0000000000000000000000000000000000000000..46131162f01d85b9f53c3e7557513e7e3aa095f4
--- /dev/null
+++ b/neonContext/ServiceEmail_Documents/ServiceEmail_Documents.aod
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>ServiceEmail_Documents</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <lookupView>ServiceEmailLookupView</lookupView>
+  <entity>ServiceEmail_Documents_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>d7764d5d-57ae-4921-9bef-57a10c28a260</name>
+      <view>ServiceEmailDocumentsMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cdd53dd0-1ada-453d-8091-916df04421c3</name>
+      <view>ServiceEmailLookupView</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/SupportTicket/SupportTicket.aod b/neonContext/SupportTicket/SupportTicket.aod
index b0233b40612590203cef68266f2313ff595f7974..f3e1f36d9313f8facdabf966730e8fb9b7119233 100644
--- a/neonContext/SupportTicket/SupportTicket.aod
+++ b/neonContext/SupportTicket/SupportTicket.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
   <name>SupportTicket</name>
-  <title>Support Ticket</title>
+  <title>Service ticket</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/SupportTicket/documentation.adoc</documentation>
   <icon>VAADIN:CHAT</icon>
@@ -9,16 +9,13 @@
   <filterView>SupportTicketFilter_view</filterView>
   <editView>SupportTicketEdit_view</editView>
   <previewView>SupportTicketPreview_view</previewView>
+  <lookupView>SupportTicketLookup_view</lookupView>
   <entity>SupportTicket_entity</entity>
   <references>
     <neonViewReference>
       <name>3191f35b-3dde-4912-b728-130fa1fc1b7e</name>
       <view>SupportTicketFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>f5c0ef30-deea-4a8b-a177-2f2052621ca3</name>
-      <view>SupportTicketEdit_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>a1830cdc-a1a1-4110-b666-7a74157f78fc</name>
       <view>SupportTicketMain_view</view>
@@ -27,5 +24,78 @@
       <name>c290c5f1-53d3-4634-bf42-0de2ee89974c</name>
       <view>SupportTicketPreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>7de79407-cb7e-49b9-8e39-453f02cb6193</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>34b9db28-2955-4689-a838-36003cb78e8a</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>adb0f031-034b-428b-9844-d08aa0a60f92</name>
+      <view>SupportTicketPull_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>df405007-d50f-4be9-9faa-ad98afcec136</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f61a4a1d-aa89-4ae9-a340-9b3bf0cde02f</name>
+      <view>SupportTicketDetails_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>96082d94-91cc-4bde-89f5-cee602471790</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>88200e60-bf34-4bab-80ea-118e5e521d66</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e6d4d8d5-2423-47a3-a137-dbcbde45dc55</name>
+      <view>SupportTicketComm_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>931af8fb-bcdb-4201-8cfc-df201b984a3e</name>
+      <view>SupportTicketRequestor_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>85d5c419-5e1c-4fdc-b9ee-f81bc5515ecd</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>fc7b698f-ded0-49f8-b5e3-7f7b0c63ea93</name>
+      <view>SupportTicketEditQuickEntry_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f70692c0-7ea0-423b-9d65-f47ea0e093f5</name>
+      <view>SupportTicketEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>462f9797-f430-401b-a0b1-542cbba0960f</name>
+      <view>SupportTicketEditTemplate_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>a5bbb7f7-f1d2-4dd3-a3d0-aeaee96140ad</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f6911073-5a02-46e2-8b82-19ef2f2d00ef</name>
+      <view>SupportTicketEditResubmission_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>307956df-1598-4ab7-b411-29bf2e7f917d</name>
+      <view>SupportTicketPreviewHeader_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>8d52ccb2-8469-4aa0-8001-b284e8eb88af</name>
+      <view>SupportTicketNewTicket_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3154c64c-2683-45ef-9690-d33e43c31d72</name>
+      <view>SupportTicketEditReturn_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>fbb6a86d-095b-4143-a83d-5612952d6e7f</name>
+      <view>SupportTicketLookup_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>3bcf18a8-1f3c-4841-ad31-01867b17d187</name>
+      <view>SupportTicketMultiEdit_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/SupportTicketMultiSelect/SupportTicketMultiSelect.aod b/neonContext/SupportTicketMultiSelect/SupportTicketMultiSelect.aod
new file mode 100644
index 0000000000000000000000000000000000000000..768f9abf1b5253470e539ec7aea6420c8fa683db
--- /dev/null
+++ b/neonContext/SupportTicketMultiSelect/SupportTicketMultiSelect.aod
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>SupportTicketMultiSelect</name>
+  <title></title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainView>SupportTicketMultiSelectEdit_view</mainView>
+  <previewView>SupportTicketMultiSelectEdit_view</previewView>
+  <entity>SupportTicketMultiSelect_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>5fd5d5da-ccea-4fd2-9a52-5dd1e740138f</name>
+      <view>SupportTicketMultiSelectEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/SupportTicketTemplate/SupportTicketTemplate.aod b/neonContext/SupportTicketTemplate/SupportTicketTemplate.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ea96ec975d7979656a8cb34ff013728f73c04150
--- /dev/null
+++ b/neonContext/SupportTicketTemplate/SupportTicketTemplate.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>SupportTicketTemplate</name>
+  <title>Service ticket template</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TWIN_COL_SELECT</icon>
+  <filterView>SupportTicketTemplateFilter_view</filterView>
+  <editView>SupportTicketTemplateEdit_view</editView>
+  <previewView>SupportTicketTemplatePreview_view</previewView>
+  <lookupView>SupportTicketTemplateLookup_view</lookupView>
+  <entity>SupportTicketTemplate_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>72b9a7d9-4dbf-4f74-a078-96ee339caa46</name>
+      <view>SupportTicketTemplateFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>55dac510-45e4-4b9c-a9eb-687668d74ba7</name>
+      <view>SupportTicketTemplatePreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7c78e7b4-68f7-4d92-ad90-ead21853b63e</name>
+      <view>SupportTicketTemplateEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7be14684-e598-4d77-8585-0166681e68dd</name>
+    </neonViewReference>
+    <neonViewReference>
+      <name>fe1e550c-5bfe-437f-8eef-98119b0779b6</name>
+      <view>SupportTicketTemplateLookup_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/UserDailyGoals/UserDailyGoals.aod b/neonContext/UserDailyGoals/UserDailyGoals.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5e8486f3ebb343b89dfedb0f8eebc3003a70c2dc
--- /dev/null
+++ b/neonContext/UserDailyGoals/UserDailyGoals.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>UserDailyGoals</name>
+  <title>Ticket daily goals</title>
+  <description>&lt;null value&gt;</description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <references>
+    <neonViewReference>
+      <name>c764fed5-979d-488c-b79c-75762df7ddbd</name>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/WorkflowDefinition/WorkflowDefinition.aod b/neonContext/WorkflowDefinition/WorkflowDefinition.aod
index d184ac23ded8ae7052094de0fb17afc19651d882..7e0717a2fd77c103105c832e44b17f21a69d5650 100644
--- a/neonContext/WorkflowDefinition/WorkflowDefinition.aod
+++ b/neonContext/WorkflowDefinition/WorkflowDefinition.aod
@@ -7,6 +7,7 @@
   <filterView>WorkflowDefinitionFilter_view</filterView>
   <editView>WorkflowDefinitionEdit_view</editView>
   <previewView>WorkflowDefinitionPreview_view</previewView>
+  <lookupView>WorkflowDefinitionLookup_view</lookupView>
   <entity>WorkflowDefinition_entity</entity>
   <references>
     <neonViewReference>
@@ -29,5 +30,9 @@
       <name>92c166cc-ccb3-4ce0-8cb8-315925350fb8</name>
       <view>WorkflowDefinitionDiagram_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>26318aa1-f6d5-4a21-9714-3d645b9aac88</name>
+      <view>WorkflowDefinitionLookup_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonDashboard/Service/Service.aod b/neonDashboard/Service/Service.aod
new file mode 100644
index 0000000000000000000000000000000000000000..87d9b5766d6414b9869669fe1cc0d5d521275567
--- /dev/null
+++ b/neonDashboard/Service/Service.aod
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.1.0">
+  <name>Service</name>
+  <title>Service Dashboard</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:AREA_SELECT</icon>
+  <dashboardType>PUBLIC</dashboardType>
+  <editRoles>
+    <element>INTERNAL_DESIGNER</element>
+  </editRoles>
+  <fixedDashlets v="true" />
+  <defaultDashlets>
+    <neonDashlet>
+      <name>Dashlet</name>
+      <viewName>SupportTicketPull_view</viewName>
+      <configName>pullTicket</configName>
+      <title>Buttons</title>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="0" />
+        <yPos v="0" />
+        <colspan v="1" />
+        <rowspan v="4" />
+      </uiConfiguration>
+      <parameters>
+        <neonDashletParameter>
+          <name>BasedOnRoles_param</name>
+          <value>true</value>
+        </neonDashletParameter>
+      </parameters>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet3</name>
+      <viewName>SupportTicketFilter_view</viewName>
+      <configName>mytickets</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="2" />
+        <yPos v="5" />
+        <colspan v="1" />
+        <rowspan v="4" />
+      </uiConfiguration>
+    </neonDashlet>
+  </defaultDashlets>
+</neonDashboard>
diff --git a/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod b/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0254dcd151082f13187a0f2cb2173976f25cad8c
--- /dev/null
+++ b/neonDashboard/TeamLeader_Dashboard/TeamLeader_Dashboard.aod
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.1.0">
+  <name>TeamLeader_Dashboard</name>
+  <title>Team leader dashboard</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:CHART_TIMELINE</icon>
+  <dashboardType>PUBLIC</dashboardType>
+  <editRoles>
+    <element>PROJECT_FieldStaff</element>
+    <element>INTERNAL_ADMINISTRATOR</element>
+    <element>INTERNAL_DESIGNER</element>
+  </editRoles>
+  <fixedDashlets v="true" />
+  <defaultDashlets>
+    <neonDashlet>
+      <name>DashletInboxList</name>
+      <viewName>InboxFilter_view</viewName>
+      <configName>InboxList</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="2" />
+        <yPos v="0" />
+        <colspan v="1" />
+        <rowspan v="6" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>DashletReporting</name>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="0" />
+        <yPos v="0" />
+        <colspan v="2" />
+        <rowspan v="6" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>DashletInboxTicketsChart</name>
+      <viewName>InboxTicketChart_view</viewName>
+      <configName>InboxTicketsChart</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="0" />
+        <yPos v="6" />
+        <colspan v="1" />
+        <rowspan v="6" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>DashletInboxTicketChartMedium</name>
+      <viewName>InboxTicketChartMedium_view</viewName>
+      <configName>DashletConfigurationInboxTicketChartMedium</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="1" />
+        <yPos v="6" />
+        <colspan v="1" />
+        <rowspan v="6" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>DashletinboxTicketChartMail</name>
+      <viewName>InboxTicketChartMail_view</viewName>
+      <configName>DashletConfigurationInboxTicketChartMail</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="2" />
+        <yPos v="6" />
+        <colspan v="1" />
+        <rowspan v="6" />
+      </uiConfiguration>
+    </neonDashlet>
+  </defaultDashlets>
+</neonDashboard>
diff --git a/neonView/ActivityNoteEdit_view/ActivityNoteEdit_view.aod b/neonView/ActivityNoteEdit_view/ActivityNoteEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8c022de59ec04dd8091f358532a9647f9deb9d99
--- /dev/null
+++ b/neonView/ActivityNoteEdit_view/ActivityNoteEdit_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ActivityNoteEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>c4df7dd3-4f92-4785-b701-253d8760f7b5</name>
+          <entityField>SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>96542955-7cdd-4bfe-a5a0-57a2a0fd837c</name>
+          <entityField>infoNote</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeFilterEdit_view/AttributeFilterEdit_view.aod b/neonView/AttributeFilterEdit_view/AttributeFilterEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..279616a6fc8b90ce99f58edd21d089f48ed405d9
--- /dev/null
+++ b/neonView/AttributeFilterEdit_view/AttributeFilterEdit_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>AttributeFilterEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>generic</name>
+      <editMode v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>d4fe436b-210b-4b7f-a121-144db18cf0d2</name>
+          <entityField>COMPONENT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>cbefd34a-e909-4894-a85e-5426ccd27488</name>
+          <entityField>SEARCHTERM</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>aada9a2a-7392-4ddc-a0d4-e55ed0507f4b</name>
+      <entityField>AttributeRelations</entityField>
+      <view>AttributeRelationMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/AttributeFilterFilter_view/AttributeFilterFilter_view.aod b/neonView/AttributeFilterFilter_view/AttributeFilterFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f804ed28ff3277217ff5d6982a705ff2a87a8936
--- /dev/null
+++ b/neonView/AttributeFilterFilter_view/AttributeFilterFilter_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>AttributeFilterFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>table</name>
+      <columns>
+        <neonTableColumn>
+          <name>f736c086-0247-4174-8fd5-388aad2f81d5</name>
+          <entityField>COMPONENT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f9011500-314b-4ef3-925b-1b08244f93d1</name>
+          <entityField>SEARCHTERM</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>62350c40-7cb5-4bed-8a3e-1b0a78761095</name>
+          <entityField>ATTRIBUTE_COUNT</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index ccec41e215d0185381c742f07ef48ff0f9505c69..e8fa1aac44a68bdec6c873b71a6ca6b1e221d568 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -11,28 +11,75 @@
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Details</name>
+      <name>Kind</name>
       <editMode v="true" />
       <showDrawer v="false" />
+      <drawerCaption>Informationen</drawerCaption>
+      <fixedDrawer v="false" />
+      <hideLabels v="false" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>60bb8fe4-9b2f-4497-b954-3548a0c695d0</name>
+          <entityField>KIND</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>binData</name>
+      <editMode v="true" />
       <entityField>#ENTITY</entityField>
-      <title></title>
       <fields>
         <entityFieldLink>
-          <name>63388992-5b40-4f1e-a2be-aa35bedbfd2e</name>
+          <name>42cc557d-6c9f-419b-aae3-dc3c975a21b7</name>
           <entityField>BINDATA</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>name</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <fields>
         <entityFieldLink>
           <name>5e68bfdb-b5c9-4ea0-8f5d-152e36262401</name>
           <entityField>NAME</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>50b5fd96-ef75-41a6-90e8-d928d5cbd6fd</name>
-          <entityField>KIND</entityField>
-        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>Clasification</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <fields>
         <entityFieldLink>
           <name>de86d66c-8281-4050-946b-a6b35bb01db8</name>
           <entityField>CLASSIFICATION</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>ffcd3020-c853-47f5-98b0-9a86c54cd30b</name>
+          <entityField>ALL_TICKET_CATEGORIES</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>10c92adb-ac34-43ef-a977-fc20798aa58d</name>
+      <entityField>DocumentTemplateTicketCategories</entityField>
+      <view>DocumentTemplateTicketCategoryMultiEdit_View</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>Details</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <fields>
         <entityFieldLink>
           <name>49d5c94c-f2ba-42a5-aab7-82fecc649dea</name>
           <entityField>ISOLANGUAGE</entityField>
@@ -62,20 +109,20 @@
       <view>AttributeRelationMultiEdit_view</view>
     </neonViewReference>
     <genericViewTemplate>
-      <name>preview</name>
+      <name>EditorHtml</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
+      <drawerCaption>Content</drawerCaption>
+      <hideLabels v="false" />
+      <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
-      <title></title>
+      <isEditable v="true" />
       <fields>
         <entityFieldLink>
-          <name>2c39e2df-edab-4411-b611-214cfd7d1d92</name>
-          <entityField>Preview</entityField>
+          <name>c81cbd96-666f-48fb-bdaa-fc69d4d125bf</name>
+          <entityField>CONTENTHTML</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <neonViewReference>
-      <name>77b6af60-1694-4967-980c-6830d569b594</name>
-      <entityField>DocumentTemplatePlaceOfUse</entityField>
-      <view>DocumentTemplatePlaceOfUseMultiEdit_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index 42b53625bfe6ae5119a76738fa1a416fd6d7c536..7b91f0cddec22126b9bae20c72414664373831ba 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -18,13 +18,21 @@
       <entityField>#ENTITY</entityField>
       <title>Document Template</title>
     </cardViewTemplate>
-    <favoriteViewTemplate>
-      <name>Favorites</name>
-      <objectType>DOCUMENTTEMPLATE_OBJECTTYPE</objectType>
-      <rowId>#UID</rowId>
+    <genericViewTemplate>
+      <name>Infos</name>
       <entityField>#ENTITY</entityField>
-      <title>favorties</title>
-    </favoriteViewTemplate>
+      <fields>
+        <entityFieldLink>
+          <name>1fc3a8d0-bb7d-4eb5-9e1f-4f03d5e42ac6</name>
+          <entityField>ALL_TICKET_CATEGORIES</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>627a93e4-b4f9-48f4-b604-66407a403e58</name>
+      <entityField>DocumentTemplateTicketCategories</entityField>
+      <view>DocumentTemplateTicketCategoryList_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
       <entityField>Documents</entityField>
@@ -60,7 +68,7 @@
       </fields>
     </genericViewTemplate>
     <neonViewReference>
-      <name>da824384-69a9-4f5e-a48d-057bb2975fdb</name>
+      <name>17f7881f-28fc-4956-aa8a-751d4c859fb6</name>
       <entityField>DocumentTemplatePlaceOfUse</entityField>
       <view>DocumentTemplatePlaceOfUseTitledList_view</view>
     </neonViewReference>
diff --git a/neonView/DocumentTemplateTicketCategoryFilter_view/DocumentTemplateTicketCategoryFilter_view.aod b/neonView/DocumentTemplateTicketCategoryFilter_view/DocumentTemplateTicketCategoryFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..61f6c851a5dbd527aecdba503b65d99acf59ffba
--- /dev/null
+++ b/neonView/DocumentTemplateTicketCategoryFilter_view/DocumentTemplateTicketCategoryFilter_view.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>DocumentTemplateTicketCategoryFilter_view</name>
+  <title></title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>2c4767db-c6f0-4798-bd3a-cefdffe87d34</name>
+          <entityField>CLASSIFICATION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>aa293b2a-c7c2-4a8e-afea-c0165d165593</name>
+          <entityField>DATE_NEW</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ef009a2f-f507-4405-a136-e633ae2dcaef</name>
+          <entityField>DATE_EDIT</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentTemplateTicketCategoryList_view/DocumentTemplateTicketCategoryList_view.aod b/neonView/DocumentTemplateTicketCategoryList_view/DocumentTemplateTicketCategoryList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3c707eb5deeff6fb6236a457865e4381cd61a7b7
--- /dev/null
+++ b/neonView/DocumentTemplateTicketCategoryList_view/DocumentTemplateTicketCategoryList_view.aod
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>DocumentTemplateTicketCategoryList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>TitledList</name>
+      <titleField>CLASSIFICATION</titleField>
+      <titleFieldFullWidth v="false" />
+      <entityField>#ENTITY</entityField>
+      <title></title>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentTemplateTicketCategoryMultiEdit_View/DocumentTemplateTicketCategoryMultiEdit_View.aod b/neonView/DocumentTemplateTicketCategoryMultiEdit_View/DocumentTemplateTicketCategoryMultiEdit_View.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ed546c1ae51685cddefb1cdc88733eae94986446
--- /dev/null
+++ b/neonView/DocumentTemplateTicketCategoryMultiEdit_View/DocumentTemplateTicketCategoryMultiEdit_View.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>DocumentTemplateTicketCategoryMultiEdit_View</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>6e67736a-1f73-49e0-b8cd-04a96c798525</name>
+          <entityField>CLASSIFICATION</entityField>
+          <fullWidth v="true" />
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupConRelList_view/EmployeeGroupConRelList_view.aod b/neonView/EmployeeGroupConRelList_view/EmployeeGroupConRelList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4d15103d633395d621bea6fe69ab598f231dbc8f
--- /dev/null
+++ b/neonView/EmployeeGroupConRelList_view/EmployeeGroupConRelList_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupConRelList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>TitledList</name>
+      <titleField>#TITLE</titleField>
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>3ede438f-d732-4b76-8a43-0225d2698b48</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod b/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d7b9bfbc75b06adc9a4116cc51d7e2916a0c5ed7
--- /dev/null
+++ b/neonView/EmployeeGroupConRelMultiedit_view/EmployeeGroupConRelMultiedit_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupConRelMultiedit_view</name>
+  <title>Employess</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>f7793da0-596e-4495-be6a-91d666254dc8</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupConRelationEdit_view/EmployeeGroupConRelationEdit_view.aod b/neonView/EmployeeGroupConRelationEdit_view/EmployeeGroupConRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bb0e66205c06a2be96f6319b37c2eb801a15908c
--- /dev/null
+++ b/neonView/EmployeeGroupConRelationEdit_view/EmployeeGroupConRelationEdit_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupConRelationEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>3ef1c69c-de52-4827-a634-cd56f756c552</name>
+          <entityField>CONTACT_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupConRelationFilter_view/EmployeeGroupConRelationFilter_view.aod b/neonView/EmployeeGroupConRelationFilter_view/EmployeeGroupConRelationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..019ecd19a43a9b7cd6c2037e7142d3204c7b71ac
--- /dev/null
+++ b/neonView/EmployeeGroupConRelationFilter_view/EmployeeGroupConRelationFilter_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupConRelationFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>employees</name>
+      <entityField>#ENTITY</entityField>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <isEditable v="false" />
+      <columns>
+        <neonTableColumn>
+          <name>dff8536f-f394-4117-8a58-287fa51d26bc</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupEdit_view/EmployeeGroupEdit_view.aod b/neonView/EmployeeGroupEdit_view/EmployeeGroupEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4b538abccaae0fd51ce3b2c694417f25851cd675
--- /dev/null
+++ b/neonView/EmployeeGroupEdit_view/EmployeeGroupEdit_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>56ad2640-917b-4799-8826-4283a91f5d1c</name>
+          <entityField>GROUPNAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5936c07c-4d6c-42bc-948e-f63ef3777d20</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>a0e54545-72b4-4e40-ab1e-3bb5ed82e2da</name>
+      <entityField>EmployeesForGroup</entityField>
+      <view>EmployeeGroupConRelMultiedit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupFilter_view/EmployeeGroupFilter_view.aod b/neonView/EmployeeGroupFilter_view/EmployeeGroupFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ea06526219ed015ad8ef5a6e2ef574e19722d09
--- /dev/null
+++ b/neonView/EmployeeGroupFilter_view/EmployeeGroupFilter_view.aod
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <columns>
+        <neonTableColumn>
+          <name>4080e4d4-efda-4fc6-84b2-4df2757b76f4</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>e03ad477-b490-4a7e-a038-9f15f82262fc</name>
+          <entityField>GROUPNAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ac89fd27-8b91-4026-afbd-9a99beb47b03</name>
+          <entityField>STATUS</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupMain_view/EmployeeGroupMain_view.aod b/neonView/EmployeeGroupMain_view/EmployeeGroupMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..32f50fbd14a01d4a042ce88522138336ae956c92
--- /dev/null
+++ b/neonView/EmployeeGroupMain_view/EmployeeGroupMain_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>9ee2347e-f27d-46e4-875f-d889f51e265f</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>9ee2347e-f27d-46e4-875f-d889f51e265f</name>
+      <entityField>#ENTITY</entityField>
+      <view>EmployeeGroupPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>1483d370-1e14-49e1-a03a-093f07b75282</name>
+      <entityField>EmployeesForGroup</entityField>
+      <view>EmployeeGroupConRelationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>abe5e34b-173e-421f-9181-d9417b3447f6</name>
+      <entityField>EmplGroupRulGroups</entityField>
+      <view>EmployeeGroupRuleGroupRelationFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupPreviewExt_view/EmployeeGroupPreviewExt_view.aod b/neonView/EmployeeGroupPreviewExt_view/EmployeeGroupPreviewExt_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9d1aa0734e607c610ac9c58d248645b34b8c010e
--- /dev/null
+++ b/neonView/EmployeeGroupPreviewExt_view/EmployeeGroupPreviewExt_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupPreviewExt_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>a0d2b13a-b88c-443a-9364-732f467ad150</name>
+      <entityField>#ENTITY</entityField>
+      <view>EmployeeGroupPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>90835105-4364-4b12-8cbf-9ed13cb4a32b</name>
+      <entityField>EmployeesForGroup</entityField>
+      <view>EmployeeGroupConRelList_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupPreview_view/EmployeeGroupPreview_view.aod b/neonView/EmployeeGroupPreview_view/EmployeeGroupPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6c4241298064586902aeb231701a30da69a3cac9
--- /dev/null
+++ b/neonView/EmployeeGroupPreview_view/EmployeeGroupPreview_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Card</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <iconField>#IMAGE</iconField>
+      <titleField>GROUPNAME</titleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <showDrawer v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>c7d01174-f631-416e-af9c-3c3b7f770c29</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleEdit_view/EmployeeGroupRuleEdit_view.aod b/neonView/EmployeeGroupRuleEdit_view/EmployeeGroupRuleEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..eae5bed22314ecbe5b2850030ad8e659ebc0c8e0
--- /dev/null
+++ b/neonView/EmployeeGroupRuleEdit_view/EmployeeGroupRuleEdit_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>8d2851f6-d7ad-4c37-9abf-756c42925aea</name>
+          <entityField>NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c886197c-7dbb-4f0a-98fa-04879a32e19c</name>
+          <entityField>COND</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleFilter_view/EmployeeGroupRuleFilter_view.aod b/neonView/EmployeeGroupRuleFilter_view/EmployeeGroupRuleFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fb16c8c777920e7edbf31982d6507c9c5f0a2b69
--- /dev/null
+++ b/neonView/EmployeeGroupRuleFilter_view/EmployeeGroupRuleFilter_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>d21d965f-1a89-4fa0-87df-16c41738c619</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleGroupEdit_view/EmployeeGroupRuleGroupEdit_view.aod b/neonView/EmployeeGroupRuleGroupEdit_view/EmployeeGroupRuleGroupEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bca8a5db60bf493401a200d47ec6c7e89c715bff
--- /dev/null
+++ b/neonView/EmployeeGroupRuleGroupEdit_view/EmployeeGroupRuleGroupEdit_view.aod
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleGroupEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="false" />
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>8197d087-8056-4d46-975a-53123af679ba</name>
+          <entityField>NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f2201278-4825-49f6-bb48-ea213708ebde</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleGroupFilter_view/EmployeeGroupRuleGroupFilter_view.aod b/neonView/EmployeeGroupRuleGroupFilter_view/EmployeeGroupRuleGroupFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..94e78d3a92c25abe5d007c78b906b0f8560e7150
--- /dev/null
+++ b/neonView/EmployeeGroupRuleGroupFilter_view/EmployeeGroupRuleGroupFilter_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleGroupFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>cb5b3c47-bb1b-437a-8d2f-92bb521fb7ea</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>db790d96-a039-4c45-91d5-2f498c73b0a6</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>6c161321-8566-4dd8-a452-d214c6500677</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleGroupMain_view/EmployeeGroupRuleGroupMain_view.aod b/neonView/EmployeeGroupRuleGroupMain_view/EmployeeGroupRuleGroupMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e6d9fc3456bddd6d0deeb2bb6186191ea3e79a2b
--- /dev/null
+++ b/neonView/EmployeeGroupRuleGroupMain_view/EmployeeGroupRuleGroupMain_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleGroupMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>d9d74d0c-3317-46de-925c-dc07b5b04781</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>d9d74d0c-3317-46de-925c-dc07b5b04781</name>
+      <entityField>#ENTITY</entityField>
+      <view>EmployeeGroupRuleGroupPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>aba99cce-3d9e-4652-a623-74cbcce36b83</name>
+      <entityField>EmpGroupRules</entityField>
+      <view>EmployeeGroupRuleFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleGroupPreview_view/EmployeeGroupRuleGroupPreview_view.aod b/neonView/EmployeeGroupRuleGroupPreview_view/EmployeeGroupRuleGroupPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..97077add791f5540d0678a869700b566e337ca6f
--- /dev/null
+++ b/neonView/EmployeeGroupRuleGroupPreview_view/EmployeeGroupRuleGroupPreview_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleGroupPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <iconField>#IMAGE</iconField>
+      <titleField>NAME</titleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>894d185d-0d5f-4851-b2ea-cd0fc7453ef7</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleGroupRelationEdit_view/EmployeeGroupRuleGroupRelationEdit_view.aod b/neonView/EmployeeGroupRuleGroupRelationEdit_view/EmployeeGroupRuleGroupRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..99268829cc63509cf83fa16a756b1fc2b979bf2f
--- /dev/null
+++ b/neonView/EmployeeGroupRuleGroupRelationEdit_view/EmployeeGroupRuleGroupRelationEdit_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleGroupRelationEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>f07ab898-3b5f-4466-addd-3fbc5961427a</name>
+          <entityField>EMPLOYEEGROUP_RULEGROUP_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeGroupRuleGroupRelationFilter_view/EmployeeGroupRuleGroupRelationFilter_view.aod b/neonView/EmployeeGroupRuleGroupRelationFilter_view/EmployeeGroupRuleGroupRelationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f022660cc390974d729e8671e924ae7791a4607c
--- /dev/null
+++ b/neonView/EmployeeGroupRuleGroupRelationFilter_view/EmployeeGroupRuleGroupRelationFilter_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>EmployeeGroupRuleGroupRelationFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
+      <columns>
+        <neonTableColumn>
+          <name>e03831df-2638-4276-8139-6e42e1a75533</name>
+          <entityField>EMPLOYEEGROUP_RULEGROUP_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/EmployeeTokenEdit_view/EmployeeTokenEdit_view.aod b/neonView/EmployeeTokenEdit_view/EmployeeTokenEdit_view.aod
index 5d9e965c72bf1676c607cc214674161f9a9a13d1..d4cdefc0cd04eba0ac7f7bd192c976b864c00068 100644
--- a/neonView/EmployeeTokenEdit_view/EmployeeTokenEdit_view.aod
+++ b/neonView/EmployeeTokenEdit_view/EmployeeTokenEdit_view.aod
@@ -11,6 +11,7 @@
     <genericViewTemplate>
       <name>EditForm</name>
       <editMode v="true" />
+      <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
           <name>516cda4b-3ea2-4631-ad90-cbaeb778830b</name>
diff --git a/neonView/EmployeeTokenFilter_view/EmployeeTokenFilter_view.aod b/neonView/EmployeeTokenFilter_view/EmployeeTokenFilter_view.aod
index 6b3a70b943841b03d39d554d2253cb527b4d175f..10122c9c202635ed7e6dfb524b5395dde47d4490 100644
--- a/neonView/EmployeeTokenFilter_view/EmployeeTokenFilter_view.aod
+++ b/neonView/EmployeeTokenFilter_view/EmployeeTokenFilter_view.aod
@@ -11,6 +11,7 @@
   <children>
     <tableViewTemplate>
       <name>TokenTable</name>
+      <entityField>#ENTITY</entityField>
       <linkedColumns />
       <fixedFilterFields />
       <title>Token</title>
diff --git a/neonView/InboxAssignement_view/InboxAssignement_view.aod b/neonView/InboxAssignement_view/InboxAssignement_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..831c674d259e8d2d6d26eeed9be2a5e8d484e0cb
--- /dev/null
+++ b/neonView/InboxAssignement_view/InboxAssignement_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxAssignement_view</name>
+  <title>Assignment</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>44f53027-bef4-4b99-b474-f6ee63a80733</name>
+      <entityField>Mails</entityField>
+      <view>MailSignatureFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>94cdc49f-efb1-4c7a-bd00-49b128882ac7</name>
+      <entityField>EmployeeGroupsForInbox</entityField>
+      <view>InboxEmployeegroupRelationFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxChartMailDrawer_view/InboxChartMailDrawer_view.aod b/neonView/InboxChartMailDrawer_view/InboxChartMailDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..57019e2c47ff7aa8defd2d9b6855f9936398d4dc
--- /dev/null
+++ b/neonView/InboxChartMailDrawer_view/InboxChartMailDrawer_view.aod
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxChartMailDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Number of Tickets (Mail)</layoutCaption>
+      <fixedDrawer v="false" />
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>8774d806-023f-43cd-859f-4e88df0ade73</name>
+      <entityField>InboxTicketChartMails</entityField>
+      <view>InboxTicketChartMail_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxChartMediumDrawer_view/InboxChartMediumDrawer_view.aod b/neonView/InboxChartMediumDrawer_view/InboxChartMediumDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..37dc6b7100ac43e6767b9afdcf6ac81b1ad1e5cc
--- /dev/null
+++ b/neonView/InboxChartMediumDrawer_view/InboxChartMediumDrawer_view.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxChartMediumDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Number of Tickets (Medium)</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>44600c6f-4ca3-4b63-9404-ae2d01b53bcf</name>
+      <entityField>InboxTicketChartMediums</entityField>
+      <view>InboxTicketChartMedium_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxChartStatusDrawer_view/InboxChartStatusDrawer_view.aod b/neonView/InboxChartStatusDrawer_view/InboxChartStatusDrawer_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8234e38d208b60d72e9383f2ec6ce28f0cb8170c
--- /dev/null
+++ b/neonView/InboxChartStatusDrawer_view/InboxChartStatusDrawer_view.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxChartStatusDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Number of Tickets (Status)</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>0501e36e-7e16-47fb-ad0a-3e03e9a4a5a1</name>
+      <entityField>InboxTicketChartStatus</entityField>
+      <view>InboxTicketChart_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxChart_view/InboxChart_view.aod b/neonView/InboxChart_view/InboxChart_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7e7f2ba0db39e5065edc68e7f0719a755dfbc2db
--- /dev/null
+++ b/neonView/InboxChart_view/InboxChart_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxChart_view</name>
+  <title>Statistic</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>bca548c1-c04e-4bff-b7f2-0781108851ec</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxChartStatusDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>47eaf3cf-de56-426c-8a69-44bc2c7cf7df</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxChartMailDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>34ac7552-22f9-4246-8336-4ef95aeb0c82</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxChartMediumDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxEdit_view/InboxEdit_view.aod b/neonView/InboxEdit_view/InboxEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3dce41fc57d0757e7ab1ab86fc12bfb77f7a40db
--- /dev/null
+++ b/neonView/InboxEdit_view/InboxEdit_view.aod
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>eb9b8363-561f-4485-a8c3-7f24cb838663</name>
+          <entityField>INBOXNAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4759d126-cfd4-4630-b00a-95db9d9e0ab8</name>
+          <entityField>EMAILADDRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>9bb489bb-af36-4ddd-8709-eb4c3572f476</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>ticket</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Ticket</drawerCaption>
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>c6a43bc9-666b-4395-942b-0e5aeecfed89</name>
+          <entityField>REOPENDELAY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8dea443c-d327-484f-8a2b-0f1e2765105e</name>
+          <entityField>CLOSURE_DAYS</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxEmployeegroupRelationEdit_view/InboxEmployeegroupRelationEdit_view.aod b/neonView/InboxEmployeegroupRelationEdit_view/InboxEmployeegroupRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e54899219f8093045daf43c3fb0aed06b770a566
--- /dev/null
+++ b/neonView/InboxEmployeegroupRelationEdit_view/InboxEmployeegroupRelationEdit_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxEmployeegroupRelationEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>38ce6f30-f2b9-41b1-baa1-d406577f9faa</name>
+          <entityField>EMPLOYEEGROUP_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxEmployeegroupRelationFilter_view/InboxEmployeegroupRelationFilter_view.aod b/neonView/InboxEmployeegroupRelationFilter_view/InboxEmployeegroupRelationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2c055ed39bf023008c1e0b8d9e7129a2a38621e7
--- /dev/null
+++ b/neonView/InboxEmployeegroupRelationFilter_view/InboxEmployeegroupRelationFilter_view.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxEmployeegroupRelationFilter_view</name>
+  <title>Employee Groups</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
+      <isEditable v="true" />
+      <columns>
+        <neonTableColumn>
+          <name>9a11b694-6a2d-4ec9-871a-9f2705bfeeb9</name>
+          <entityField>EMPLOYEEGROUP_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxEmployeegroupRelationList_view/InboxEmployeegroupRelationList_view.aod b/neonView/InboxEmployeegroupRelationList_view/InboxEmployeegroupRelationList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5df33b46dd633d07fa16d818e6374a803414de82
--- /dev/null
+++ b/neonView/InboxEmployeegroupRelationList_view/InboxEmployeegroupRelationList_view.aod
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxEmployeegroupRelationList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>TitledList</name>
+      <entityField>#ENTITY</entityField>
+      <title>Employee Group</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>eff9778d-9ab4-4ccc-9ae0-7ff9e1e8d7e9</name>
+          <entityField>EMPLOYEEGROUP_ID</entityField>
+          <fullWidth v="true" />
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxEmployeegroupRelationMultiEdit_view/InboxEmployeegroupRelationMultiEdit_view.aod b/neonView/InboxEmployeegroupRelationMultiEdit_view/InboxEmployeegroupRelationMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..48be14cbea0a000700f0dc7e2b164e7861f10aa6
--- /dev/null
+++ b/neonView/InboxEmployeegroupRelationMultiEdit_view/InboxEmployeegroupRelationMultiEdit_view.aod
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxEmployeegroupRelationMultiEdit_view</name>
+  <title>Employee Groups</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>009c7378-e4e9-47f8-a20b-2713bf9758d0</name>
+          <entityField>EMPLOYEEGROUP_ID</entityField>
+          <fullWidth v="true" />
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterEdit_view/InboxFilterEdit_view.aod b/neonView/InboxFilterEdit_view/InboxFilterEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9938623d394325d3ee3aebf3c3d3c616b5b2e3f8
--- /dev/null
+++ b/neonView/InboxFilterEdit_view/InboxFilterEdit_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>53601b17-ae03-4f9a-9233-046851f7a037</name>
+          <entityField>COMPONENT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e4674033-9b07-4738-842f-c1f7d40d21bc</name>
+          <entityField>SEARCHTERM</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d103e71b-b6bf-4e32-b481-5d2d0b0971eb</name>
+          <entityField>TICKETTEMPLATE_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterFilter_view/InboxFilterFilter_view.aod b/neonView/InboxFilterFilter_view/InboxFilterFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a686c3d183bec9039e70b7bb6cb62463a9ac24c1
--- /dev/null
+++ b/neonView/InboxFilterFilter_view/InboxFilterFilter_view.aod
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>table</name>
+      <columns>
+        <neonTableColumn>
+          <name>3d61cf8d-f453-4727-993a-ea2461d3a2bb</name>
+          <entityField>COMPONENT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1b846741-f7af-4735-a4f7-4bfc7ba50949</name>
+          <entityField>SEARCHTERM</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>538bd1b4-f2aa-4995-a1a9-5df8dafc9596</name>
+          <entityField>TICKETTEMPLATE_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterGroupEdit_view/InboxFilterGroupEdit_view.aod b/neonView/InboxFilterGroupEdit_view/InboxFilterGroupEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8664bca6e81cb285f8fdb3dcef223787c9b29ef7
--- /dev/null
+++ b/neonView/InboxFilterGroupEdit_view/InboxFilterGroupEdit_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterGroupEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>d987d67d-380d-4bc8-87f0-fe6acbbe4ac0</name>
+          <entityField>NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>47dd420f-bfa7-4e50-84f0-2ab3034ce58d</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>cbbef0ea-dfa3-4de5-bbd1-f9301b8e7100</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterGroupFilter_view/InboxFilterGroupFilter_view.aod b/neonView/InboxFilterGroupFilter_view/InboxFilterGroupFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5c289ae74bb86615a05643d7bda96ba6505c4728
--- /dev/null
+++ b/neonView/InboxFilterGroupFilter_view/InboxFilterGroupFilter_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterGroupFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <columns>
+        <neonTableColumn>
+          <name>dc23e2f1-dae8-48c2-af61-c243d74b6ba2</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>dfb3c65b-46a8-48ee-9507-b0fad16a6b52</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>45cbdede-db5b-435f-ac4d-dff12a854104</name>
+          <entityField>PRIORITY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>49762cc6-56ba-488f-887c-ae451d492b73</name>
+          <entityField>STATE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterGroupMain_view/InboxFilterGroupMain_view.aod b/neonView/InboxFilterGroupMain_view/InboxFilterGroupMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a45a28b95dac182137e295a3a3efd581cdc25f46
--- /dev/null
+++ b/neonView/InboxFilterGroupMain_view/InboxFilterGroupMain_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterGroupMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>6d16b6fe-dbf0-4459-a1b2-10397a6b2a43</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>6d16b6fe-dbf0-4459-a1b2-10397a6b2a43</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxFilterGroupPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7579a3ab-4804-4e12-b581-875d6c31d4a5</name>
+      <entityField>InboxFilters</entityField>
+      <view>InboxFilterFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>54845841-c06c-4fec-8696-c7c090d32a52</name>
+      <entityField>AttributeFilters</entityField>
+      <view>AttributeFilterFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterGroupPreview_view/InboxFilterGroupPreview_view.aod b/neonView/InboxFilterGroupPreview_view/InboxFilterGroupPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3253f62256d85583b5aa77fafa7ad1f57468bff2
--- /dev/null
+++ b/neonView/InboxFilterGroupPreview_view/InboxFilterGroupPreview_view.aod
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterGroupPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <iconField>#IMAGE</iconField>
+      <titleField>NAME</titleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <showDrawer v="true" />
+      <drawerCaption>Informations</drawerCaption>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>5062189e-45d0-4969-853f-627139f47ba4</name>
+          <entityField>STATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3f9916aa-0806-4315-96d9-31ca26ca351d</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterGroupRelationEdit_view/InboxFilterGroupRelationEdit_view.aod b/neonView/InboxFilterGroupRelationEdit_view/InboxFilterGroupRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d8b2d059026771c0934532da568b7c5f384bc997
--- /dev/null
+++ b/neonView/InboxFilterGroupRelationEdit_view/InboxFilterGroupRelationEdit_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterGroupRelationEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>53378e11-ed86-4a5c-a168-413f40066b71</name>
+          <entityField>INBOXFILTERGROUP_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilterGroupRelationFilter_view/InboxFilterGroupRelationFilter_view.aod b/neonView/InboxFilterGroupRelationFilter_view/InboxFilterGroupRelationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..07c8d25d6402b6e71f16604466038e696facb353
--- /dev/null
+++ b/neonView/InboxFilterGroupRelationFilter_view/InboxFilterGroupRelationFilter_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilterGroupRelationFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>b8d37e18-c733-40cf-8887-751bd945b0ea</name>
+          <entityField>INBOXFILTERGROUP_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxFilter_view/InboxFilter_view.aod b/neonView/InboxFilter_view/InboxFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cf8707b5038dc41e20a00f57d5bbb14809810f4a
--- /dev/null
+++ b/neonView/InboxFilter_view/InboxFilter_view.aod
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>InboxList</name>
+      <title>Inboxes</title>
+      <description>Show inboxes</description>
+      <fragment>Inbox/filter</fragment>
+      <singleton v="false" />
+      <storeRoles>
+        <element>PROJECT_ProjectManagement</element>
+      </storeRoles>
+      <icon>VAADIN:ENVELOPES_O</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>bcdbaede-e2df-4351-9df2-fd2cd30cfd8e</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>79bba2bb-1b53-4968-b073-f10137204003</name>
+          <entityField>INBOXNAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c28cad18-17af-44d4-aeb8-f2d93bdbc7ee</name>
+          <entityField>EMAILADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f1378d7e-9187-4a52-8e73-64fa6d3047ca</name>
+          <entityField>REOPENDELAY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>2fc3d43b-84a1-43c4-926b-b8c8951d5349</name>
+          <entityField>CLOSURE_DAYS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f7369cab-4379-4c23-96f0-2ec944896c5e</name>
+          <entityField>STATUS</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxMain_view/InboxMain_view.aod b/neonView/InboxMain_view/InboxMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..533b9f787e5ba6744ed60ab54e2377486d6b9cc6
--- /dev/null
+++ b/neonView/InboxMain_view/InboxMain_view.aod
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>5d249637-e203-4e35-960a-c67924479b5f</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>5d249637-e203-4e35-960a-c67924479b5f</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>664346bb-ed06-4f6e-aa5f-b60542eadb46</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxAssignement_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f4b31d9b-0169-44de-a1fb-856366d4c72a</name>
+      <entityField>InboxFilterGroupsRelation</entityField>
+      <view>InboxFilterGroupRelationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b94112d6-1a55-48f8-b380-705503d1d0b2</name>
+      <entityField>SuportTicketsForInbox</entityField>
+      <view>SupportTicketFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>683b7ddd-5144-415c-8430-d27dbeba1500</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxChart_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxPreviewExt_view/InboxPreviewExt_view.aod b/neonView/InboxPreviewExt_view/InboxPreviewExt_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2024908e96b62b0a513efb13f26b3ccbb6e5d830
--- /dev/null
+++ b/neonView/InboxPreviewExt_view/InboxPreviewExt_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxPreviewExt_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>90a9c24e-92a4-4710-80fa-41f6d8ff30fe</name>
+      <entityField>#ENTITY</entityField>
+      <view>InboxPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>8fd9b336-ff6d-4314-82ff-7499baf0b360</name>
+      <entityField>EmployeeGroupsForInbox</entityField>
+      <view>InboxEmployeegroupRelationList_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/InboxPreview_view/InboxPreview_view.aod b/neonView/InboxPreview_view/InboxPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d52c0e4d31dfbd4424ef1daff54f9dcdfcfb1a67
--- /dev/null
+++ b/neonView/InboxPreview_view/InboxPreview_view.aod
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Card</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <iconField>#IMAGE</iconField>
+      <titleField>INBOXNAME</titleField>
+      <subtitleField>EMAILADDRESS</subtitleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>GeneralInfos</name>
+      <showDrawer v="true" />
+      <drawerCaption>Informations</drawerCaption>
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>314d2796-aa5c-4155-ba01-a1eb37d09fee</name>
+          <entityField>INBOXDATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>a1c1d630-bab6-4d35-8326-9051862dcd8d</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>Ticket</name>
+      <showDrawer v="true" />
+      <drawerCaption>Ticket</drawerCaption>
+      <fixedDrawer v="false" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <fields>
+        <entityFieldLink>
+          <name>afabc1a1-df95-441b-9afa-fe49c61a91f6</name>
+          <entityField>ReopenDelayPreview</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>2d4bad74-461a-4890-9bd8-f47b9fc1d705</name>
+          <entityField>Closure_daysPreview</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxTicketChartMail_view/InboxTicketChartMail_view.aod b/neonView/InboxTicketChartMail_view/InboxTicketChartMail_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fed080e8f8e63500f0a454b85de567e1f21c86e5
--- /dev/null
+++ b/neonView/InboxTicketChartMail_view/InboxTicketChartMail_view.aod
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxTicketChartMail_view</name>
+  <title>Chart Number of tickets per inbox (Mail)</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>DashletConfigurationInboxTicketChartMail</name>
+      <title>Chart number of tickets total (Mail)</title>
+      <description>Chart number of tickets total (Mail)</description>
+      <fragment>InboxTicketChartMail/full</fragment>
+      <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+      </storeRoles>
+      <icon>VAADIN:SPLINE_AREA_CHART</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <multiDataChartViewTemplate>
+      <name>MultiDataChart</name>
+      <chartType>COLUMN</chartType>
+      <xAxis>X</xAxis>
+      <yAxis>Y</yAxis>
+      <parentField>PARENT</parentField>
+      <categoryField>CATEGORY</categoryField>
+      <entityField>#ENTITY</entityField>
+      <title></title>
+    </multiDataChartViewTemplate>
+    <multiDataChartViewTemplate>
+      <name>MultiDataChart2</name>
+      <chartType>LINE</chartType>
+      <xAxis>X</xAxis>
+      <yAxis>Y</yAxis>
+      <parentField>PARENT</parentField>
+      <categoryField>CATEGORY</categoryField>
+      <entityField>#ENTITY</entityField>
+    </multiDataChartViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxTicketChartMedium_view/InboxTicketChartMedium_view.aod b/neonView/InboxTicketChartMedium_view/InboxTicketChartMedium_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9ecd90722870b4e293b3f0276161052c84a4b0bf
--- /dev/null
+++ b/neonView/InboxTicketChartMedium_view/InboxTicketChartMedium_view.aod
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxTicketChartMedium_view</name>
+  <title>Chart Number of tickets per inbox (Medium)</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>DashletConfigurationInboxTicketChartMedium</name>
+      <title>Chart number of tickets total (Medium)</title>
+      <description>Chart number of tickets total (Medium)</description>
+      <fragment>InboxTicketChartMedium/full</fragment>
+      <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+      </storeRoles>
+      <icon>VAADIN:CHART_3D</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <multiDataChartViewTemplate>
+      <name>MultiDataChart</name>
+      <chartType>COLUMN</chartType>
+      <xAxis>X</xAxis>
+      <yAxis>Y</yAxis>
+      <parentField>PARENT</parentField>
+      <categoryField>CATEGORY</categoryField>
+      <entityField>#ENTITY</entityField>
+    </multiDataChartViewTemplate>
+    <multiDataChartViewTemplate>
+      <name>MultiDataChart2</name>
+      <chartType>LINE</chartType>
+      <xAxis>X</xAxis>
+      <yAxis>Y</yAxis>
+      <parentField>PARENT</parentField>
+      <categoryField>CATEGORY</categoryField>
+      <entityField>#ENTITY</entityField>
+    </multiDataChartViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/InboxTicketChart_view/InboxTicketChart_view.aod b/neonView/InboxTicketChart_view/InboxTicketChart_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5cc018b162698a9db789c614fc4f509a24c68099
--- /dev/null
+++ b/neonView/InboxTicketChart_view/InboxTicketChart_view.aod
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>InboxTicketChart_view</name>
+  <title>Chart Number of tickets per inbox (Status)</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>InboxTicketsChart</name>
+      <title>Chart number of tickets total (Status)</title>
+      <description>Chart number of tickets total (Status)</description>
+      <fragment>InboxTicketChart/full</fragment>
+      <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>INTERNAL_EVERYONE</element>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+      </storeRoles>
+      <icon>VAADIN:BAR_CHART_V</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <multiDataChartViewTemplate>
+      <name>ChartColumn</name>
+      <chartType>COLUMN</chartType>
+      <xAxis>X</xAxis>
+      <yAxis>Y</yAxis>
+      <parentField>PARENT</parentField>
+      <categoryField>CATEGORY</categoryField>
+      <entityField>#ENTITY</entityField>
+    </multiDataChartViewTemplate>
+    <multiDataChartViewTemplate>
+      <name>ChartLine</name>
+      <chartType>LINE</chartType>
+      <xAxis>X</xAxis>
+      <yAxis>Y</yAxis>
+      <parentField>PARENT</parentField>
+      <categoryField>CATEGORY</categoryField>
+      <entityField>#ENTITY</entityField>
+    </multiDataChartViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/MailSignatureDefaultSignatureEdit_view/MailSignatureDefaultSignatureEdit_view.aod b/neonView/MailSignatureDefaultSignatureEdit_view/MailSignatureDefaultSignatureEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b1b83b155cd9d9dcb636e41be1bd399275681008
--- /dev/null
+++ b/neonView/MailSignatureDefaultSignatureEdit_view/MailSignatureDefaultSignatureEdit_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>MailSignatureDefaultSignatureEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>d30df5e1-cb83-4737-a78c-f00b66ea8250</name>
+          <entityField>NEWDEFAULTSIGNATURE_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d2987164-3c1f-4b0e-9e6b-3f416c2b6d39</name>
+          <entityField>OLDDEFAULTSIGNATURE_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <actionsViewTemplate>
+      <name>save</name>
+      <actions>
+        <element>save</element>
+      </actions>
+    </actionsViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/MailSignatureEdit_view/MailSignatureEdit_view.aod b/neonView/MailSignatureEdit_view/MailSignatureEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..35208920614c30acbc8d3768de57e50c3f2005df
--- /dev/null
+++ b/neonView/MailSignatureEdit_view/MailSignatureEdit_view.aod
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>MailSignatureEdit_view</name>
+  <title>Mail</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>acbad602-efcc-488c-b1e1-a2354140e9d1</name>
+          <entityField>MAIL_ADDRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bd918436-3222-402f-beb6-117f35df0f57</name>
+          <entityField>SIGNATURE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e8d13984-22f4-4536-abba-36c9dbbbaae3</name>
+          <entityField>DOCUMENTTEMPLATE_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>2f3a5438-a8a8-4ac5-8cd5-3e4dc0c57be8</name>
+          <entityField>SEND_MAIL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c9779ed4-72a0-45f7-8609-c8df276ea8b1</name>
+          <entityField>ANSWER_MAIL_ADDRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c8dbc996-7ca5-4319-8a03-da72385513a5</name>
+          <entityField>DEFAULT_TICKETTEMPLATE_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>87b10a89-039a-498a-b201-9bc54198bbf4</name>
+          <entityField>WORKFLOW</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/MailSignatureFilter_view/MailSignatureFilter_view.aod b/neonView/MailSignatureFilter_view/MailSignatureFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ece85d762252d24eaa6e4eca41d1b947aaf74c06
--- /dev/null
+++ b/neonView/MailSignatureFilter_view/MailSignatureFilter_view.aod
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>MailSignatureFilter_view</name>
+  <title>Mail</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <favoriteActionGroup1>setDefaultSignature</favoriteActionGroup1>
+      <columns>
+        <neonTableColumn>
+          <name>42d5d0d2-9fac-4afe-9f34-a6be3e7e5af2</name>
+          <entityField>#IMAGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0eaff31a-0147-47d9-9e36-e9d51cfad133</name>
+          <entityField>MAIL_ADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>72cd0101-f455-49c5-9d19-25f6556dd8b5</name>
+          <entityField>SIGNATURE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>5f406226-5549-4f80-87e6-41e007b94ad3</name>
+          <entityField>DOCUMENTTEMPLATE_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1f8469b2-e9f7-4919-87c9-6130360bf9e9</name>
+          <entityField>SEND_MAIL</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>03ed38fb-1d15-426d-aaf5-2454b71f26db</name>
+          <entityField>ANSWER_MAIL_ADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0d51eb5a-c73c-492c-8800-64674d73821b</name>
+          <entityField>DEFAULTSIGNATURE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>b9b735ff-190e-406d-a0ca-62623354fd93</name>
+          <entityField>DEFAULT_TICKETTEMPLATE_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>8550c946-ff28-44db-b663-2af4769aee26</name>
+          <entityField>WORKFLOW</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/MailSignatureLookup_view/MailSignatureLookup_view.aod b/neonView/MailSignatureLookup_view/MailSignatureLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ff2663ce8d633a8e7ef6b60e18f8de31f246bcb
--- /dev/null
+++ b/neonView/MailSignatureLookup_view/MailSignatureLookup_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>MailSignatureLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>55608dc6-df9d-4720-8046-6e4606566e91</name>
+          <entityField>MAIL_ADDRESS</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/MailSignaturePrieview_view/MailSignaturePrieview_view.aod b/neonView/MailSignaturePrieview_view/MailSignaturePrieview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5105567daf897595154a689ff31f213148a005c1
--- /dev/null
+++ b/neonView/MailSignaturePrieview_view/MailSignaturePrieview_view.aod
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>MailSignaturePrieview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <iconField>#IMAGE</iconField>
+      <titleField>MAIL_ADDRESS</titleField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="false" />
+      <showDrawer v="true" />
+      <drawerCaption>Informations</drawerCaption>
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>bd918436-3222-402f-beb6-117f35df0f57</name>
+          <entityField>SIGNATURE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e8d13984-22f4-4536-abba-36c9dbbbaae3</name>
+          <entityField>DOCUMENTTEMPLATE_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d28c2a09-2574-4f24-8165-fe6038ab9e74</name>
+          <entityField>SEND_MAIL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d91f839a-ea19-4b64-942b-b73c18b8d930</name>
+          <entityField>ANSWER_MAIL_ADDRESS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c7eda2ab-9b04-447f-bd7d-56e05699223d</name>
+          <entityField>DEFAULT_TICKETTEMPLATE_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>efda58b8-ffa5-4830-a318-96a0d50b2643</name>
+          <entityField>WORKFLOW</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod b/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0ae9e8fad3bae097887df5d2bb364da3d0bccdef
--- /dev/null
+++ b/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>PersonEditServiceTicket_View</name>
+  <title>Contact &amp; Serviceticket</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TICKET</icon>
+  <quickEntry v="9" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>929f4179-21b1-4246-a3f7-9fd8a1994592</name>
+      <entityField>Duplicates</entityField>
+      <view>DuplicateEdit_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>6840caee-2c3b-41d1-ae41-7af5ad69ebfd</name>
+          <entityField>LANGUAGE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>de5463b3-96a3-4308-a4ef-e30769b60fd0</name>
+          <entityField>ORGANISATION_CONTACTID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8ffede76-3c48-4bb6-b9ca-cfeafe4b6367</name>
+          <entityField>SALUTATION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3d2ce75f-bd3d-4a59-aa2f-6568c6c939c0</name>
+          <entityField>TITLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8a220c81-e598-4fd9-9f55-e6473e6330ca</name>
+          <entityField>FIRSTNAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5278489b-f0dd-4f77-bba3-1964553aedc8</name>
+          <entityField>MIDDLENAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>7f4c81d5-85e7-4ef0-9184-db27af81c700</name>
+          <entityField>LASTNAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3be97ef2-4b3c-48c3-a6aa-116005201eaf</name>
+          <entityField>GENDER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8b6970d1-5960-4cdd-9cbb-b77bd766cb77</name>
+          <entityField>DATEOFBIRTH</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>413d6a67-e5c8-4766-9864-daeea5d21861</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ebd212b6-8c43-430f-806c-5cf141d111c9</name>
+          <entityField>DEPARTMENT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f4e16d1a-bacf-43c6-9d51-86334e734315</name>
+          <entityField>CONTACTROLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4e75b44d-0b7d-434f-8111-50386e52820f</name>
+          <entityField>POSITION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>fcdc2c2e-5853-41a7-924b-23b4fa10efa1</name>
+      <entityField>PersAddresses</entityField>
+      <view>AdressMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>dd9b747d-92a1-4de0-9bd6-7c58678ef36d</name>
+      <entityField>Communications</entityField>
+      <view>CommunicationMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>03bcf168-d5ef-4732-8622-00358954cbb1</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>dff4c15b-27f6-4c54-921a-d7bb8498a08f</name>
+      <entityField>Serviceticket</entityField>
+      <view>SupportTicketEditQuickEntry_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
index 3ea17cd91d92f9f7d1aed11001128d24bff4a091..d55bf30c01daa7f81597a40cdfc3b790d1e555c2 100644
--- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
+++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
@@ -75,5 +75,10 @@
       <entityField>Salesprojects</entityField>
       <view>SalesprojectMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>cc81c8a4-fb3a-45ff-8658-eb58836cb7fc</name>
+      <entityField>QuickEntrySupportTickets</entityField>
+      <view>SupportTicketMultiEdit_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index 7a2444f88509fb17c60ebaa2b3edcf59e59ebb7e..60dba732ff7c9b04cc3874369356f486017afe0a 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -4,7 +4,7 @@
   <title>Sales Project</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:FILTER</icon>
-  <quickEntry v="6" />
+  <quickEntry v="7" />
   <layout>
     <boxLayout>
       <name>layout</name>
diff --git a/neonView/ServiceEmailAllDocumentsMultiEdit_view/ServiceEmailAllDocumentsMultiEdit_view.aod b/neonView/ServiceEmailAllDocumentsMultiEdit_view/ServiceEmailAllDocumentsMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..db8ff860d1112b4ae1de60eefb3c41151caa60c5
--- /dev/null
+++ b/neonView/ServiceEmailAllDocumentsMultiEdit_view/ServiceEmailAllDocumentsMultiEdit_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailAllDocumentsMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>6c6a9147-f6cb-4519-9a9f-62686c396264</name>
+          <entityField>DOCUMENTFILE</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailDocumentsMultiEdit_view/ServiceEmailDocumentsMultiEdit_view.aod b/neonView/ServiceEmailDocumentsMultiEdit_view/ServiceEmailDocumentsMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7b2f937f56740b85727bc344f630b52fbec5012d
--- /dev/null
+++ b/neonView/ServiceEmailDocumentsMultiEdit_view/ServiceEmailDocumentsMultiEdit_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailDocumentsMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>f3cf8747-21ed-43d7-bf65-a77b044f3dcc</name>
+          <entityField>NAME</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailEdit_view/ServiceEmailEdit_view.aod b/neonView/ServiceEmailEdit_view/ServiceEmailEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cb9d676c842c0efbdb526acb7acc45e79b6914de
--- /dev/null
+++ b/neonView/ServiceEmailEdit_view/ServiceEmailEdit_view.aod
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Ticket Status After Send</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
+      <drawerCaption></drawerCaption>
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>9e6bcbeb-5bb4-4e1b-b46c-c646828b11cc</name>
+          <entityField>TICKET_STATUS_AFTER_SEND</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c6976b0d-1a2f-4518-b7f6-30ea6f21ec89</name>
+          <entityField>Conclusion</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>From</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>fc01f525-de1c-434d-b8bc-cc09c4358cd1</name>
+          <entityField>from</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>4b3eecfe-2cb0-4c5e-bf36-3f692df2f9a9</name>
+      <entityField>Recipients_TO</entityField>
+      <view>ServiceEmailRecipientsToMutliEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7b4fc1b5-3841-4551-bad6-ceb5d81f6fe6</name>
+      <entityField>Recipients_CC</entityField>
+      <view>ServiceEmailRecipientsCCMutliEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>8663751a-8586-4461-8bad-bd7d98d97d3c</name>
+      <entityField>Recipients_BCC</entityField>
+      <view>ServiceEmailRecipientsBCCMutliEdit_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>996769be-be40-4e94-a013-3d056ab5529c</name>
+          <entityField>subject</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b11c1e77-e179-4276-8feb-e8d655094a06</name>
+          <entityField>DOCUMENT_TEMPLATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>889a816a-d489-42c5-87ca-504c48d5ae3f</name>
+          <entityField>chooseTextToForward</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>ContentEmail</name>
+      <editMode v="true" />
+      <hideEmptyFields v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>78a3d546-f2ed-4798-8aa9-72e56df3b0b3</name>
+          <entityField>EMAIL_BODY_CONTENT</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>1b93df13-b4ca-4809-9a9e-1578219c830a</name>
+      <entityField>AttachamentsConsumer</entityField>
+      <view>ServiceemailFilesMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailLookupView/ServiceEmailLookupView.aod b/neonView/ServiceEmailLookupView/ServiceEmailLookupView.aod
new file mode 100644
index 0000000000000000000000000000000000000000..de30445d96c54990e26b74ad0a23f9bc69eda1d7
--- /dev/null
+++ b/neonView/ServiceEmailLookupView/ServiceEmailLookupView.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailLookupView</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>a74feeb6-3cfc-482d-8c52-e38c9e9ec9e1</name>
+          <entityField>preview</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1e6c40af-b728-4e5c-94e3-74bc2b438c38</name>
+          <entityField>BINARY_FILENAME</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailRecipientsBCCEmployeesMultiEdit_view/ServiceEmailRecipientsBCCEmployeesMultiEdit_view.aod b/neonView/ServiceEmailRecipientsBCCEmployeesMultiEdit_view/ServiceEmailRecipientsBCCEmployeesMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..48bf0827711b5bb2e7354e34a2d05149303821f6
--- /dev/null
+++ b/neonView/ServiceEmailRecipientsBCCEmployeesMultiEdit_view/ServiceEmailRecipientsBCCEmployeesMultiEdit_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailRecipientsBCCEmployeesMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericMultiple</name>
+      <autoNewRow v="true" />
+      <title>BCC</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>0eef6272-39e5-41b2-a497-467782f6500b</name>
+          <entityField>employee_contact_id</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>86b1e439-608b-4f08-a4f9-c341a069db41</name>
+          <entityField>email_address</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailRecipientsBCCMutliEdit_view/ServiceEmailRecipientsBCCMutliEdit_view.aod b/neonView/ServiceEmailRecipientsBCCMutliEdit_view/ServiceEmailRecipientsBCCMutliEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..18dd2fbc967856c8418c0eb4113a327f952f6ed0
--- /dev/null
+++ b/neonView/ServiceEmailRecipientsBCCMutliEdit_view/ServiceEmailRecipientsBCCMutliEdit_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailRecipientsBCCMutliEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericMultiple</name>
+      <autoNewRow v="true" />
+      <title>BCC</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>689a94cf-b90e-4e8a-8aed-f8e4c32af839</name>
+          <entityField>contact_id</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>1f1beda2-f3fd-43e4-ace5-fcd180bbe9ca</name>
+          <entityField>email_address</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailRecipientsCCEmployeesMultiEdit_view/ServiceEmailRecipientsCCEmployeesMultiEdit_view.aod b/neonView/ServiceEmailRecipientsCCEmployeesMultiEdit_view/ServiceEmailRecipientsCCEmployeesMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f89298f3c4889591e947f942618e9601649ae818
--- /dev/null
+++ b/neonView/ServiceEmailRecipientsCCEmployeesMultiEdit_view/ServiceEmailRecipientsCCEmployeesMultiEdit_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailRecipientsCCEmployeesMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericMultiple</name>
+      <autoNewRow v="true" />
+      <title>CC</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>19646ba8-d3b7-4845-9e5a-d0a40fa955fe</name>
+          <entityField>employee_contact_id</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>7a5f639c-d1d7-42e4-9d31-6b253cddf086</name>
+          <entityField>email_address</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailRecipientsCCMutliEdit_view/ServiceEmailRecipientsCCMutliEdit_view.aod b/neonView/ServiceEmailRecipientsCCMutliEdit_view/ServiceEmailRecipientsCCMutliEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..60bc093d1ba8eb41be53aff6478b1cacd4dab5f6
--- /dev/null
+++ b/neonView/ServiceEmailRecipientsCCMutliEdit_view/ServiceEmailRecipientsCCMutliEdit_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailRecipientsCCMutliEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericMultiple</name>
+      <autoNewRow v="true" />
+      <title>CC</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>bc7accdc-c67b-4db9-9ce7-c4d9234ff113</name>
+          <entityField>contact_id</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>d8b274f6-64f7-4eb9-8568-c3ddb3338bac</name>
+          <entityField>email_address</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailRecipientsToEmployeesMultiEdit_view/ServiceEmailRecipientsToEmployeesMultiEdit_view.aod b/neonView/ServiceEmailRecipientsToEmployeesMultiEdit_view/ServiceEmailRecipientsToEmployeesMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c598e614c0fdbea5402e2acdb64acaf8a338536a
--- /dev/null
+++ b/neonView/ServiceEmailRecipientsToEmployeesMultiEdit_view/ServiceEmailRecipientsToEmployeesMultiEdit_view.aod
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailRecipientsToEmployeesMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>Generic</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <title>To</title>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>4e49397a-f9e2-47df-a5af-f6022048f8ae</name>
+          <entityField>employee_contact_id</entityField>
+          <fullWidth v="false" />
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>a55128f4-504a-47b4-8210-addf57704e8c</name>
+          <entityField>email_address</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceEmailRecipientsToMutliEdit_view/ServiceEmailRecipientsToMutliEdit_view.aod b/neonView/ServiceEmailRecipientsToMutliEdit_view/ServiceEmailRecipientsToMutliEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..31dae0b465e623f189d7cfbca8f18185835ca3d2
--- /dev/null
+++ b/neonView/ServiceEmailRecipientsToMutliEdit_view/ServiceEmailRecipientsToMutliEdit_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceEmailRecipientsToMutliEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <title>To</title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>111f3640-ca86-4e8c-b92c-5ebb43ab5b7f</name>
+          <entityField>contact_id</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>3800d6cf-5905-4ca4-910b-c56ed604ea5c</name>
+          <entityField>email_address</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ServiceForwardEmailEdit_view/ServiceForwardEmailEdit_view.aod b/neonView/ServiceForwardEmailEdit_view/ServiceForwardEmailEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2107a0c59fca11c75d1839fd8d304392a6096b5f
--- /dev/null
+++ b/neonView/ServiceForwardEmailEdit_view/ServiceForwardEmailEdit_view.aod
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceForwardEmailEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>TicketStatus</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>64de15ac-1803-4fe8-bce9-172a30005f49</name>
+          <entityField>TICKET_STATUS_AFTER_SEND</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5d038605-541d-4fbd-871f-3e49e09c1e3a</name>
+          <entityField>Conclusion</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>From</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>fc01f525-de1c-434d-b8bc-cc09c4358cd1</name>
+          <entityField>from</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>aeea69bf-37c9-4132-87c6-913e32a7ce19</name>
+      <entityField>Recipients_TO</entityField>
+      <view>ServiceEmailRecipientsToEmployeesMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>48adcb0c-7b4b-43ad-8d52-fe3f3c4b5732</name>
+      <entityField>Recipients_CC</entityField>
+      <view>ServiceEmailRecipientsCCEmployeesMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2899811b-a1f1-404a-9775-984e8748c160</name>
+      <entityField>Recipients_BCC</entityField>
+      <view>ServiceEmailRecipientsBCCEmployeesMultiEdit_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>996769be-be40-4e94-a013-3d056ab5529c</name>
+          <entityField>subject</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>49d91d4d-dac7-40c5-96c0-939a521d3728</name>
+          <entityField>DOCUMENT_TEMPLATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ef975040-59cd-4548-808b-c9636237ea87</name>
+          <entityField>chooseTextToForward</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5a6feff6-22b1-4358-b1f6-0073114d4a3b</name>
+          <entityField>EMAIL_BODY_CONTENT</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>80424a8e-7318-43c7-a055-a06ca136a53f</name>
+      <entityField>TicketDocumentsCons</entityField>
+      <view>ServiceEmailAllDocumentsMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bbfd24ef-c619-4ae3-9794-958a55d706f5</name>
+      <entityField>AttachamentsConsumer</entityField>
+      <view>ServiceemailFilesMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/ServiceemailFilesMultiEdit_view/ServiceemailFilesMultiEdit_view.aod b/neonView/ServiceemailFilesMultiEdit_view/ServiceemailFilesMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..798c3c36253833b5360769608c3719045a6966ed
--- /dev/null
+++ b/neonView/ServiceemailFilesMultiEdit_view/ServiceemailFilesMultiEdit_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>ServiceemailFilesMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <isCreatable v="true" />
+      <isDeletable v="true" />
+      <isEditable v="true" />
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>78f62086-c8d7-4f29-8ef4-6a8429ad0995</name>
+          <entityField>Bindata</entityField>
+          <fullWidth v="true" />
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketComm_view/SupportTicketComm_view.aod b/neonView/SupportTicketComm_view/SupportTicketComm_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..16c09f6c65720a5ff24608917cbc473034e0485e
--- /dev/null
+++ b/neonView/SupportTicketComm_view/SupportTicketComm_view.aod
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketComm_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>HORIZONTAL</direction>
+      <maxDirectionElements v="2" />
+      <autoHeight v="true" />
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Alternatives</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>2b1f645a-13de-4beb-bc13-2a5adec10f67</name>
+          <entityField>ALTERNATIVE_EMAILADDR</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8fad0f9a-cdf2-46a8-884a-03161f902b05</name>
+          <entityField>ALTERNATIVE_PHONEADDR</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="false" />
+      <showDrawer v="false" />
+      <hideEmptyFields v="false" />
+      <isEditable v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>88f23ed8-bfc5-47b2-ac50-c23e1f175a62</name>
+          <entityField>CommEmail</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bae1649f-a678-4b27-95c4-061eeb6ee2fa</name>
+          <entityField>CommPhone</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketDetails_view/SupportTicketDetails_view.aod b/neonView/SupportTicketDetails_view/SupportTicketDetails_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2c5c1707d5b27a0c573c03d1a5f70c3f2c183f41
--- /dev/null
+++ b/neonView/SupportTicketDetails_view/SupportTicketDetails_view.aod
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketDetails_view</name>
+  <title>Details</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>d1f1801e-3590-4980-bf77-85c4b5656ff9</name>
+          <entityField>TASK_SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>22870d35-c22c-4cee-9367-8a9dba88d085</name>
+          <entityField>CC_RECIPIENTS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>1fb97040-1454-4432-a38b-dc6aa0a48da4</name>
+          <entityField>SENDEREMAIL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0a21caf7-d00a-4d3a-a04a-e29754a7d8db</name>
+          <entityField>TASK_START_DATE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>task_description</name>
+      <showDrawer v="true" />
+      <drawerCaption>description</drawerCaption>
+      <hideLabels v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>79dc1abc-6d7f-4865-b1b9-1788cacb9cbe</name>
+          <entityField>TASK_DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>mail_description</name>
+      <showDrawer v="true" />
+      <drawerCaption>E-Mail</drawerCaption>
+      <hideLabels v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>7b00111d-d776-4cce-90db-9849feb11057</name>
+          <entityField>EMAIL_SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>419e169d-6117-4a23-b0dc-a9f3c47b8473</name>
+          <entityField>EMAIL_DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketEditQuickEntry_view/SupportTicketEditQuickEntry_view.aod b/neonView/SupportTicketEditQuickEntry_view/SupportTicketEditQuickEntry_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2d2ee694f0f8f3d9a9d82592102c2ae518c834a6
--- /dev/null
+++ b/neonView/SupportTicketEditQuickEntry_view/SupportTicketEditQuickEntry_view.aod
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketEditQuickEntry_view</name>
+  <title>Service ticket</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TICKET</icon>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <autoHeight v="true" />
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>SupportTicketGeneric</name>
+      <editMode v="true" />
+      <showDrawer v="true" />
+      <drawerCaption>Service ticket</drawerCaption>
+      <fixedDrawer v="true" />
+      <hideEmptyFields v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>50583440-b40f-4d6e-a775-5541c94be5d5</name>
+          <entityField>ALTERNATIVE_EMAILADDR</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d51b05bd-5f2e-4959-b9f3-5d9706585a51</name>
+          <entityField>ALTERNATIVE_PHONEADDR</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d10b9c94-d222-417c-91a5-3f3e50dfe80e</name>
+          <entityField>SupportTicket_template</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>33027237-1177-4f8b-abe6-ea3d9d036077</name>
+          <entityField>INBOX_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ebce5913-6628-4a08-afb0-caea5d7c274f</name>
+          <entityField>TICKETCATEGORY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>19d6d30f-4d11-490a-94f6-b930b3b0d6e9</name>
+          <entityField>TASK_SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>1a7438bf-7690-470b-a69b-ca119ac64b59</name>
+          <entityField>TASK_DESCRIPTION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>db509854-3041-4d77-9ec2-651842d1a9f1</name>
+          <entityField>TASK_MATURITY_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3784edd5-03b8-47aa-a31f-ee95ef55d033</name>
+          <entityField>TASK_STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c52866d5-f6e6-42b9-9cdd-4eeb970fab18</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>15311428-d390-436c-8c44-92102ffa0431</name>
+          <entityField>TASK_PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>9debbeab-8a99-46fe-a736-b7074acc9e3a</name>
+          <entityField>MEDIUM</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketEditResubmission_view/SupportTicketEditResubmission_view.aod b/neonView/SupportTicketEditResubmission_view/SupportTicketEditResubmission_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..229f0beb7ab53e85cbcc63b5a5d690becc87282d
--- /dev/null
+++ b/neonView/SupportTicketEditResubmission_view/SupportTicketEditResubmission_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketEditResubmission_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <title>Ticket resubmission</title>
+      <fields>
+        <entityFieldLink>
+          <name>86665c15-2e49-445c-ad3e-40147fd7c773</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d29caa99-6cd7-4c7e-b74c-440057d9e629</name>
+          <entityField>TASK_MATURITY_DATE</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketEditReturn_view/SupportTicketEditReturn_view.aod b/neonView/SupportTicketEditReturn_view/SupportTicketEditReturn_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..dc8b975b8df977532f3ef4df88ff574947d0e071
--- /dev/null
+++ b/neonView/SupportTicketEditReturn_view/SupportTicketEditReturn_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketEditReturn_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <title>Ticket return</title>
+      <fields>
+        <entityFieldLink>
+          <name>8523107a-480e-403d-8398-b4e90727f719</name>
+          <entityField>INBOX_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0813effc-cae2-4c2c-a45b-bdd4fb86a786</name>
+          <entityField>TICKETCATEGORY</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketEditTemplate_view/SupportTicketEditTemplate_view.aod b/neonView/SupportTicketEditTemplate_view/SupportTicketEditTemplate_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..41a86311f8cac0476573dae8a62af147d8e9680c
--- /dev/null
+++ b/neonView/SupportTicketEditTemplate_view/SupportTicketEditTemplate_view.aod
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketEditTemplate_view</name>
+  <title>Supportticket</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TICKET</icon>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>a326df5e-acd9-4e53-8232-b9edcd890d25</name>
+          <entityField>SupportTicket_template</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e7f23b42-fb12-41c5-9fec-5a7fae466b15</name>
+          <entityField>TICKETTYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>6016cb20-a32e-4fe9-a5e5-015fad81faf0</name>
+          <entityField>INBOX_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4d711d87-2a13-4c85-a4dd-f78e6142db43</name>
+          <entityField>TICKETCATEGORY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>7b745c90-7337-40ed-82e7-62f6503d4883</name>
+          <entityField>TASK_SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>60dc6a4c-78a0-4105-b679-e9ae280e9e9a</name>
+          <entityField>TASK_DESCRIPTION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e8fdd5ff-4edf-46c4-96fb-9900695f6ca0</name>
+          <entityField>TASK_MATURITY_DATE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>a2eee9f8-a0fd-484f-b1ae-bc0f989a0e54</name>
+          <entityField>TASK_STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>400954b3-045b-40bf-8467-21f5d84dc64e</name>
+          <entityField>CONCLUSION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c023e4ba-8779-4ca3-9bba-50bbc26b54f2</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>677a46e7-a846-4b84-8c31-2a888e7dd7f3</name>
+          <entityField>TASK_PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>822bd535-3d9c-4569-a7da-a9698d0d8878</name>
+          <entityField>MEDIUM</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod b/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
index a8908a9932f906f4b5e1e2232cc8412f193f0adb..01cf28df8d0e76657bd5632eee348e8214fe9fd7 100644
--- a/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
+++ b/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
@@ -1,67 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
   <name>SupportTicketEdit_view</name>
+  <title>Service ticket</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:TICKET</icon>
+  <quickEntry v="8" />
   <layout>
-    <boxLayout>
+    <noneLayout>
       <name>layout</name>
-    </boxLayout>
+    </noneLayout>
   </layout>
   <children>
-    <genericViewTemplate>
-      <name>Edit</name>
-      <editMode v="true" />
+    <neonViewReference>
+      <name>ba09cd29-7995-4b87-afe0-80025a3e9703</name>
       <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>e7f23b42-fb12-41c5-9fec-5a7fae466b15</name>
-          <entityField>TICKETTYPE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>46ef8d86-47fc-495d-bd33-9cb43ea29b25</name>
-          <entityField>TASK_SUBJECT</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>60dc6a4c-78a0-4105-b679-e9ae280e9e9a</name>
-          <entityField>TASK_DESCRIPTION</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>7bc8570c-4bb2-4e37-9dd3-5661adf88fcb</name>
-          <entityField>TASK_START_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>e8fdd5ff-4edf-46c4-96fb-9900695f6ca0</name>
-          <entityField>TASK_MATURITY_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>a2eee9f8-a0fd-484f-b1ae-bc0f989a0e54</name>
-          <entityField>TASK_STATUS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>05462ebf-04cb-407f-bc9e-56f016766ee1</name>
-          <entityField>TASK_PROGRESS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>677a46e7-a846-4b84-8c31-2a888e7dd7f3</name>
-          <entityField>TASK_PRIORITY</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>58eb48d2-1ee1-4f55-a5e0-28b05cf8b8bf</name>
-          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>c023e4ba-8779-4ca3-9bba-50bbc26b54f2</name>
-          <entityField>TASK_EDITOR_CONTACT_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
+      <view>SupportTicketRequestor_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>af3421fc-415e-44be-8a7b-7088926dbd96</name>
+      <entityField>#ENTITY</entityField>
+      <view>SupportTicketEditTemplate_view</view>
+    </neonViewReference>
     <neonViewReference>
-      <name>135e702d-aa52-4787-9f05-6e9fa1569567</name>
+      <name>7b460f13-a273-47e9-9b5c-9f509b8e3145</name>
       <entityField>Links</entityField>
       <view>TaskLinkMultiEdit_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>5a61eda9-d71b-4b15-83f6-f4580a214876</name>
+      <name>d19f0b3e-8bb4-4276-9cc4-5761d4f93ff4</name>
       <entityField>Attributes</entityField>
       <view>AttributeRelationMultiEdit_view</view>
     </neonViewReference>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index 1d9687601da8ca2f0584ad1474b992f2a685cb7a..b37bfa90c06298d9f9b23811471aeb239f891195 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -4,15 +4,113 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>myTicketsInWork</name>
+      <title>Tickets in process</title>
+      <description>Show my tickets that are in process</description>
+      <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJhYmdlc2NobG9zc2VuIiwia2V5IjoiRU5ERUQiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiVEFTS19FRElUT1JfQ09OVEFDVF9JRCIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6IkljaCIsImtleSI6IiQkJGdsb2JhbC51c2VyLmNvbnRhY3RJZCQkJCIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%3D</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+        <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+        <element>INTERNAL_DESIGNER</element>
+        <element>INTERNAL_GROUPWARE</element>
+        <element>INTERNAL_SNMP</element>
+        <element>INTERNAL_TECHNICAL</element>
+        <element>INTERNAL_WEBSERVICE</element>
+      </storeRoles>
+      <icon>VAADIN:EDIT</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+    <neonDashletConfiguration>
+      <name>myWorkedTickets</name>
+      <title>Resolved tickets</title>
+      <description>Show resolved tickets</description>
+      <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6ImFiZ2VzY2hsb3NzZW4iLCJrZXkiOiJFTkRFRCIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX0VESVRPUl9DT05UQUNUX0lEIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiSWNoIiwia2V5IjoiJCQkZ2xvYmFsLnVzZXIuY29udGFjdElkJCQkIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
+      <singleton v="true" />
+      <requiresConfiguration v="false" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+        <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+        <element>INTERNAL_DESIGNER</element>
+        <element>INTERNAL_GROUPWARE</element>
+        <element>INTERNAL_SNMP</element>
+        <element>INTERNAL_TECHNICAL</element>
+        <element>INTERNAL_WEBSERVICE</element>
+      </storeRoles>
+      <icon>NEON:MQC</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+    <neonDashletConfiguration>
+      <name>notFinishedTickets</name>
+      <title>Unresolved tickets</title>
+      <description>Show unresolved tickets</description>
+      <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJFcmxlZGlndCIsImtleSI6IkRPTkUgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJSw7xja2ZyYWdlIEludGVybiIsImtleSI6IklOVEVOQUxSRVBMWSAgICAgICAgICAgICAgICAgICAgICAgICIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9LHsidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJSw7xja2ZyYWdlIiwia2V5IjoiUkVRVUVTVCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiwiY29udGVudHR5cGUiOiJURVhUIn1dfQ%3D%3D</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+        <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+        <element>INTERNAL_DESIGNER</element>
+        <element>INTERNAL_GROUPWARE</element>
+        <element>INTERNAL_SNMP</element>
+        <element>INTERNAL_TECHNICAL</element>
+        <element>INTERNAL_WEBSERVICE</element>
+      </storeRoles>
+      <icon>VAADIN:EDIT</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+      <parameters>
+        <neonDashletParameter>
+          <name>BasedOnRoles_param</name>
+          <value>true</value>
+        </neonDashletParameter>
+        <neonDashletParameter>
+          <name>InboxId_param</name>
+          <value></value>
+        </neonDashletParameter>
+      </parameters>
+    </neonDashletConfiguration>
     <neonDashletConfiguration>
       <name>mytickets</name>
       <title>My Tickets</title>
-      <description>Show tickets where I am the editor</description>
+      <description>Show tickets I am the editor of</description>
       <fragment>SupportTicket/filter</fragment>
       <singleton v="true" />
       <requiresConfiguration v="false" />
       <storeRoles>
-        <element>PROJECT_Support</element>
+        <element>PROJECT_ServiceAgent</element>
       </storeRoles>
       <icon>VAADIN:TASKS</icon>
       <categories>
@@ -28,6 +126,38 @@
         </neonDashletParameter>
       </parameters>
     </neonDashletConfiguration>
+    <neonDashletConfiguration>
+      <name>myOpenTickets</name>
+      <title>Open Tickets</title>
+      <description>Show Tickets in process</description>
+      <fragment>SupportTicket/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJUQVNLX1NUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZSI6IkVpbmdhbmciLCJrZXkiOiJFTlRSWSIsImNvbnRlbnR0eXBlIjoiVEVYVCJ9XX0%3D</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>PROJECT_Workflow</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+        <element>INTERNAL_CANARY</element>
+        <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+        <element>INTERNAL_DESIGNER</element>
+        <element>INTERNAL_GROUPWARE</element>
+        <element>INTERNAL_SNMP</element>
+        <element>INTERNAL_TECHNICAL</element>
+        <element>INTERNAL_WEBSERVICE</element>
+      </storeRoles>
+      <provider></provider>
+      <icon>VAADIN:ENVELOPE_OPEN</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
   </dashletConfigurations>
   <layout>
     <groupLayout>
@@ -35,15 +165,6 @@
     </groupLayout>
   </layout>
   <children>
-    <timelineViewTemplate>
-      <name>TicketsTimeline</name>
-      <dateField>TASK_MATURITY_DATE</dateField>
-      <titleField>TASK_SUBJECT_DETAILS</titleField>
-      <descriptionField>TASK_DESCRIPTION</descriptionField>
-      <iconIdField>TASK_PRIORITY_ICON</iconIdField>
-      <entityField>#ENTITY</entityField>
-      <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
-    </timelineViewTemplate>
     <tableViewTemplate>
       <name>TicketsTable</name>
       <iconField>TASK_PRIORITY_ICON</iconField>
@@ -51,7 +172,7 @@
       <subtitleField>TASK_STATUS</subtitleField>
       <descriptionField>TASK_REQUESTOR_CONTACT_ID</descriptionField>
       <entityField>#ENTITY</entityField>
-      <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+      <favoriteActionGroup1>FilterActionsGroup</favoriteActionGroup1>
       <linkedColumns>
         <element>TASK_SUBJECT</element>
       </linkedColumns>
@@ -63,39 +184,67 @@
           <entityField>TASK_PRIORITY_ICON</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>37366161-eeb1-4f2e-9e25-843e85f2c4b6</name>
-          <entityField>TASK_STATUS</entityField>
+          <name>21dddebe-7a96-4185-9a2e-689394e0d118</name>
+          <entityField>CODE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>077df121-a59b-48ab-9772-aa29fa0d7c1d</name>
           <entityField>TASK_SUBJECT</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>89c73a28-7bdf-4d07-b6db-4eb2663c0781</name>
+          <entityField>TASK_START_DATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>37366161-eeb1-4f2e-9e25-843e85f2c4b6</name>
+          <entityField>TASK_STATUS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>8085463f-0f85-4bd0-adb1-c098bfd8faea</name>
+          <entityField>IS_OVERDUE_SYMBOL</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>38ac59d8-ad7e-4e0f-85b8-6cba129ffabf</name>
+          <entityField>TASK_MATURITY_DATE</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>7e2dca2a-6a53-41cc-8dd7-a8ee370ff4de</name>
           <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>fb4ad106-1d84-445b-ab4a-ac36b6e3b0c2</name>
-          <entityField>TASK_EDITOR_CONTACT_ID</entityField>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>cf98ce13-f3c4-4c6b-8964-a7a5d17b05c2</name>
           <entityField>TASK_PRIORITY</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>38ac59d8-ad7e-4e0f-85b8-6cba129ffabf</name>
-          <entityField>TASK_MATURITY_DATE</entityField>
+          <name>e7b41a69-2099-4dea-8d2a-c2e9c818757c</name>
+          <entityField>INBOXNAME</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>7eb5fb76-7e83-4151-9364-28749712c58a</name>
-          <entityField>TASK_PROGRESS</entityField>
+          <name>db8f53b6-13c5-4136-ab65-36d954d82d7b</name>
+          <entityField>TICKETCATEGORY</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>2a20110d-0b42-4f47-9361-2256c5c5aad5</name>
-          <entityField>TASK_DESCRIPTION</entityField>
+          <name>b2b7e6ec-356d-4406-8450-9e5b1fa7021a</name>
+          <entityField>DATE_EDIT_STATUS</entityField>
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <timelineViewTemplate>
+      <name>TicketsTimeline</name>
+      <dateField>TASK_START_DATE</dateField>
+      <titleField>TASK_SUBJECT_DETAILS</titleField>
+      <descriptionField>TASK_DESCRIPTION</descriptionField>
+      <subdescriptionField>TASK_STATUS</subdescriptionField>
+      <iconIdField>TASK_PRIORITY_ICON</iconIdField>
+      <additionalInfoField>CODE</additionalInfoField>
+      <orderByDate v="true" />
+      <entityField>#ENTITY</entityField>
+      <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
+    </timelineViewTemplate>
     <treeTableViewTemplate>
       <name>Treetable</name>
       <entityField>#ENTITY</entityField>
@@ -112,7 +261,7 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>25e8c98f-1cd9-49a8-9925-f0e9e8557b74</name>
-          <entityField>TASK_STATUS</entityField>
+          <entityField>CODE</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>771e21d6-52c8-41a5-8076-dbb4968a6b75</name>
@@ -120,27 +269,44 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>69f1d750-e60d-449c-a106-d5a5fc2dab3a</name>
-          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+          <entityField>TASK_START_DATE</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>76ee953d-6dc8-491e-8fab-9cc51a3c331e</name>
-          <entityField>TASK_EDITOR_CONTACT_ID</entityField>
+          <entityField>TASK_STATUS</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>366e79da-a889-4394-b2e1-34907001dd77</name>
-          <entityField>TASK_PRIORITY</entityField>
+          <entityField>IS_OVERDUE_SYMBOL</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>6ff5f84a-295c-484b-8178-5110a907db05</name>
           <entityField>TASK_MATURITY_DATE</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
-          <name>7ec4261e-b1de-4a99-bc5b-424171cd1fc7</name>
-          <entityField>TASK_PROGRESS</entityField>
+          <name>87f10c70-f1cd-4733-ad35-fba053450b0f</name>
+          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
-          <name>87f10c70-f1cd-4733-ad35-fba053450b0f</name>
-          <entityField>TASK_DESCRIPTION</entityField>
+          <name>8eb141ce-4d9c-4121-98ff-a7275e726512</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+          <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>8fd16be2-cebe-4bdc-acfc-ba19a6a7659e</name>
+          <entityField>TASK_PRIORITY</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>7857383e-24b3-48a8-a213-e7968f3e3d3e</name>
+          <entityField>INBOXNAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>0521e36e-b288-44a0-accf-51ed1426e775</name>
+          <entityField>TICKETCATEGORY</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>483da354-d833-4975-b210-9d748ae8b199</name>
+          <entityField>DATE_EDIT_STATUS</entityField>
         </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
diff --git a/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod b/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0c12dfb690b83c60e22f5489e9977bfb5ba6ddfc
--- /dev/null
+++ b/neonView/SupportTicketLookup_view/SupportTicketLookup_view.aod
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Servicetickets</name>
+      <columns>
+        <neonTableColumn>
+          <name>8da3838a-a80a-4eca-9d34-01934ee31305</name>
+          <entityField>CODE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1a14bdef-25a0-40b0-a604-1e6f4a7ea252</name>
+          <entityField>TASK_SUBJECT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c9d1aa76-c19b-40cd-9f6b-eb13eb0e047e</name>
+          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>df7f1d56-dcdc-46fd-99c0-2ea3487fbeef</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>991d6b1d-dbb7-459b-8b3e-0b4abae4bfe3</name>
+          <entityField>SENDEREMAIL</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>d299d24d-30ee-4ba8-b438-6337d2d6e792</name>
+          <entityField>TASK_STATUS</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
index e611840d07710413c603481a510031af220028b2..0d0d8cfbf17cc84d46e6f64d7aa87c40d98c270a 100644
--- a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
+++ b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
@@ -9,25 +9,20 @@
     </masterSlaveLayout>
   </layout>
   <children>
-    <genericViewTemplate>
-      <name>details</name>
-      <showDrawer v="true" />
-      <drawerCaption></drawerCaption>
-      <fixedDrawer v="true" />
-      <hideLabels v="false" />
+    <neonViewReference>
+      <name>73001abc-a65b-437d-afcc-87bf14515b82</name>
       <entityField>#ENTITY</entityField>
-      <title>Details</title>
-      <fields>
-        <entityFieldLink>
-          <name>3f746e73-b8cd-4d08-b352-a2307e080410</name>
-          <entityField>TASK_DESCRIPTION</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <neonViewReference>
-      <name>e3dbf148-8d3d-4a62-ac20-17c878c0a669</name>
-      <entityField>ModuleTrees</entityField>
-      <view>ModuleTree_view</view>
+      <view>SupportTicketDetails_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>60bdc6d3-e223-450d-b7d6-1d08254dce9e</name>
+      <entityField>Activities</entityField>
+      <view>ActivityDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>449c4f51-356b-4b50-bf28-f33038980109</name>
+      <entityField>TicketTasks</entityField>
+      <view>TaskFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>af00a5c6-f79b-4673-b1cf-945734702ebd</name>
diff --git a/neonView/SupportTicketMultiEdit_view/SupportTicketMultiEdit_view.aod b/neonView/SupportTicketMultiEdit_view/SupportTicketMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b479302852aa0c4e7d3f6d6fa33563e12cc5dcf0
--- /dev/null
+++ b/neonView/SupportTicketMultiEdit_view/SupportTicketMultiEdit_view.aod
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>GenericMultiple</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>0c922545-2305-49c6-8f75-71e3080e45b3</name>
+          <entityField>ALTERNATIVE_EMAILADDR</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>2fce9f5a-e792-4240-8cd6-bd7e8eb5b7c3</name>
+          <entityField>ALTERNATIVE_PHONEADDR</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>55ae684d-ad25-46fb-8c41-4cb1fa288beb</name>
+          <entityField>SupportTicket_template</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>728729ec-c302-4ebb-9ff7-0526d0298b34</name>
+          <entityField>INBOX_ID</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>77471b18-adcb-4f48-9ef7-5483759d5bcf</name>
+          <entityField>TICKETCATEGORY</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>af514d15-db63-4ff0-99f0-12bdf8ee8da2</name>
+          <entityField>TASK_SUBJECT</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>71ea3963-c700-4a21-a2ad-57f806457a73</name>
+          <entityField>TASK_DESCRIPTION</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>2eb181c7-fb1c-4a6a-b52e-6132dc8585b9</name>
+          <entityField>TASK_MATURITY_DATE</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>9387a7eb-7d96-493a-a394-310feaeec45d</name>
+          <entityField>TASK_STATUS</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>61fc9146-22f9-4f28-a9ad-d9b30aad8dae</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>7ae99b9f-4ab5-4824-88a4-56a3f8d080f7</name>
+          <entityField>TASK_PRIORITY</entityField>
+        </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>d80dea4c-c8eb-4cca-a932-cd31f8912326</name>
+          <entityField>MEDIUM</entityField>
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod b/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..adc58ed6e5d95ad62cb45fc90842441aff4a356d
--- /dev/null
+++ b/neonView/SupportTicketMultiSelectEdit_view/SupportTicketMultiSelectEdit_view.aod
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketMultiSelectEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>361b2337-0c41-4b0b-b156-c1f7ffeaaa79</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>df94341d-8c4d-4de6-9681-cc5983eacf35</name>
+          <entityField>CATEGORY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>7c3f6511-8b0e-42d6-a3c7-3ca2d1d076d7</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e790711e-df61-4428-8be3-9e58c125ed54</name>
+          <entityField>EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <actionsViewTemplate>
+      <name>Actions</name>
+      <actions>
+        <element>ChangeData</element>
+      </actions>
+      <entityField>#ENTITY</entityField>
+    </actionsViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketNewTicket_view/SupportTicketNewTicket_view.aod b/neonView/SupportTicketNewTicket_view/SupportTicketNewTicket_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1ee29bcad4910ab6b709d4adb9751b52bfc4f2f0
--- /dev/null
+++ b/neonView/SupportTicketNewTicket_view/SupportTicketNewTicket_view.aod
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketNewTicket_view</name>
+  <title>New Ticket</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>SMALL</size>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>HORIZONTAL</direction>
+    </boxLayout>
+  </layout>
+  <children>
+    <scoreCardViewTemplate>
+      <name>NewTicket</name>
+      <fieldActions>
+        <element>newTicket</element>
+      </fieldActions>
+      <fields>
+        <entityFieldLink>
+          <name>4f54bf8c-4097-4794-83b7-9d60a7676409</name>
+          <entityField>NEW_TICKET</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+    <scoreCardViewTemplate>
+      <name>NewTicketContact</name>
+      <fieldActions>
+        <element>newTicketContact</element>
+      </fieldActions>
+      <fields>
+        <entityFieldLink>
+          <name>c848dc2a-c826-4c20-a802-ccf680196d36</name>
+          <entityField>NEW_TICKETCONTACT</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketPreviewHeader_view/SupportTicketPreviewHeader_view.aod b/neonView/SupportTicketPreviewHeader_view/SupportTicketPreviewHeader_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b32ddfc225b6f07071cfa6b53107c4d69635a91c
--- /dev/null
+++ b/neonView/SupportTicketPreviewHeader_view/SupportTicketPreviewHeader_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketPreviewHeader_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <autoHeight v="true" />
+    </boxLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Header</name>
+      <iconField>TASK_PRIORITY_ICON</iconField>
+      <titleField>CODE</titleField>
+      <subtitleField>INBOX_ID</subtitleField>
+      <descriptionField>EMAILMAILSIGNATURE</descriptionField>
+      <favoriteAction1>newActivity</favoriteAction1>
+    </cardViewTemplate>
+    <actionsViewTemplate>
+      <name>Actions</name>
+      <actions>
+        <element>replyEmail</element>
+        <element>forwardTicket</element>
+        <element>newNote</element>
+        <element>returnTicket</element>
+      </actions>
+    </actionsViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
index d36961f5c1b46484112c9d1b6d3202d459f3dfbb..949e05567ac2da9711595b059205d239c0c1c77f 100644
--- a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
+++ b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
@@ -5,84 +5,162 @@
   <layout>
     <headerFooterLayout>
       <name>layout</name>
-      <header>Header</header>
+      <header>a71bc1a8-dd42-4bac-b3c1-6783285baf7e</header>
+      <footer>Counters</footer>
     </headerFooterLayout>
   </layout>
   <children>
-    <cardViewTemplate>
-      <name>Header</name>
-      <iconField>TASK_PRIORITY_ICON</iconField>
-      <titleField>TASK_SUBJECT</titleField>
-      <subtitleField>CODE</subtitleField>
-      <favoriteAction1>newActivity</favoriteAction1>
-      <entityField>#ENTITY</entityField>
-    </cardViewTemplate>
-    <favoriteViewTemplate>
-      <name>Favorites</name>
-      <objectType>SUPPORTTICKET_OBJECTTYPE</objectType>
-      <rowId>#UID</rowId>
+    <neonViewReference>
+      <name>a71bc1a8-dd42-4bac-b3c1-6783285baf7e</name>
       <entityField>#ENTITY</entityField>
-      <title>favorites</title>
-    </favoriteViewTemplate>
+      <view>SupportTicketPreviewHeader_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>ContactInfo</name>
+      <showDrawer v="true" />
+      <drawerCaption>Contact Info</drawerCaption>
+      <fixedDrawer v="true" />
+      <hideLabels v="false" />
+      <hideEmptyFields v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>6b437d27-eb20-41d7-9deb-b8851c32fb8f</name>
+          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>633cc9a9-7d6f-4fbf-8f7e-8fe51a0be00b</name>
+          <entityField>SENDEREMAIL</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>9d43dc0f-bfba-4b45-a5b6-8435537cdfab</name>
+          <entityField>ALTERNATIVE_EMAILADDR</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>36cfd4d0-2b9c-44fc-8ab5-d31e212568fa</name>
+          <entityField>ALTERNATIVE_PHONEADDR</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
     <genericViewTemplate>
       <name>Info</name>
       <showDrawer v="true" />
       <drawerCaption>Details</drawerCaption>
-      <fixedDrawer v="false" />
+      <fixedDrawer v="true" />
+      <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>9e2ef777-209c-4ad7-91e7-8422896ebc08</name>
+          <entityField>TICKET_EDITOR_CONTACT_ID</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>afbb79a4-418f-44ba-892d-c41843e57416</name>
           <entityField>TASK_STATUS</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>ffdd1606-4d33-4580-84bd-42b411d15168</name>
-          <entityField>TASK_START_DATE</entityField>
+          <name>a76d53a0-1496-40d3-9833-d308b5b730a8</name>
+          <entityField>CONCLUSION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f3d555e1-94f0-46d1-8d2e-0863c32f236c</name>
+          <entityField>TASK_PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c5a16b13-6a91-4d47-8f2f-88df290ad6ef</name>
+          <entityField>INBOX_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>d419374d-e56b-40ce-9ded-e6214c8572f0</name>
+          <name>e3d7e5cf-9926-44e3-9d8f-95567b46a38c</name>
+          <entityField>TICKETCATEGORY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>97ed79be-4979-4cfc-a344-063cd837f0d3</name>
+          <entityField>MEDIUM</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>Dates</name>
+      <showDrawer v="true" />
+      <drawerCaption>Dates</drawerCaption>
+      <fixedDrawer v="false" />
+      <hideEmptyFields v="false" />
+      <isEditable v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>21d3a5fd-3555-478a-9f84-33e332b44a4a</name>
           <entityField>TASK_MATURITY_DATE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>f3d37da9-9104-4dff-9796-24ca81e26976</name>
-          <entityField>TASK_PROGRESS</entityField>
+          <name>ddb94610-52dd-4cb0-8981-6a738a902335</name>
+          <entityField>TASK_START_DATE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>f3d555e1-94f0-46d1-8d2e-0863c32f236c</name>
-          <entityField>TASK_PRIORITY</entityField>
+          <name>18d8e233-802e-44fe-b6c2-d46f25e1a87a</name>
+          <entityField>DATE_BEGIN</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>1f8a7860-d0f7-4f86-af23-382d82c062c2</name>
-          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+          <name>9801adbd-49ba-4431-9cf7-e945496bf7b9</name>
+          <entityField>DATE_EDIT_STATUS</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>9e2ef777-209c-4ad7-91e7-8422896ebc08</name>
-          <entityField>TASK_EDITOR_CONTACT_ID</entityField>
+          <name>065ceeab-9228-4b93-a94b-2810f684df54</name>
+          <entityField>DATE_END</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <neonViewReference>
-      <name>0ad1cd97-a128-4b10-87f8-434fc72723bd</name>
-      <entityField>Links</entityField>
-      <view>TaskLinkPreviewList_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>b3f080e0-a1fb-42bd-ac4a-3788fb077b9c</name>
-      <entityField>MainDocuments</entityField>
-      <view>DocumentList_view</view>
-    </neonViewReference>
     <genericViewTemplate>
       <name>Description</name>
       <showDrawer v="true" />
       <drawerCaption>Description</drawerCaption>
       <hideLabels v="true" />
       <entityField>#ENTITY</entityField>
+      <isEditable v="true" />
       <fields>
+        <entityFieldLink>
+          <name>40c87484-1289-4038-a5f8-f4098c6e1cc0</name>
+          <entityField>TASK_SUBJECT</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>4b4997bf-fb16-4669-9b47-7cbd279159c6</name>
           <entityField>TASK_DESCRIPTION</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <neonViewReference>
+      <name>0ad1cd97-a128-4b10-87f8-434fc72723bd</name>
+      <entityField>Links</entityField>
+      <view>TaskLinkPreviewList_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>Mail_Description</name>
+      <showDrawer v="true" />
+      <drawerCaption>E-Mail</drawerCaption>
+      <hideLabels v="true" />
+      <isEditable v="false" />
+      <fields>
+        <entityFieldLink>
+          <name>f8f5d9e0-c0a7-405f-957f-c618dc25595f</name>
+          <entityField>EMAIL_SUBJECT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>6631dcd8-a1e0-4b5a-90f3-aac4ab8288f6</name>
+          <entityField>EMAIL_DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <scoreCardViewTemplate>
+      <name>Counters</name>
+      <fields>
+        <entityFieldLink>
+          <name>03783a77-4f5c-4b47-8ae3-aa26c0b17954</name>
+          <entityField>counterActivities</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ac306433-c6ac-476c-9d9d-4f3d25728890</name>
+          <entityField>counterTicketTime</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/SupportTicketPull_view/SupportTicketPull_view.aod b/neonView/SupportTicketPull_view/SupportTicketPull_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..743dc78c9288882f3fe82246fbbdc330c7f5601e
--- /dev/null
+++ b/neonView/SupportTicketPull_view/SupportTicketPull_view.aod
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketPull_view</name>
+  <title>Pull Ticket</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="false" />
+  <size>SMALL</size>
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>pullTicket</name>
+      <title>Ticket Control Center</title>
+      <description>Pull next ticket or create new ones</description>
+      <fragment>SupportTicket/full</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_HumanResources</element>
+        <element>PROJECT_Marketing</element>
+        <element>PROJECT_OfficeStaff</element>
+        <element>PROJECT_ProjectManagement</element>
+        <element>PROJECT_ServiceAgent</element>
+        <element>INTERNAL_ADMINISTRATOR</element>
+        <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+        <element>INTERNAL_DESIGNER</element>
+        <element>INTERNAL_GROUPWARE</element>
+        <element>INTERNAL_SNMP</element>
+        <element>INTERNAL_TECHNICAL</element>
+        <element>INTERNAL_WEBSERVICE</element>
+      </storeRoles>
+      <icon>VAADIN:ENTER</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>service</name>
+          <title>Service</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+      <direction>VERTICAL</direction>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>e1f68581-6dab-4be2-a4f3-40e98069d9b2</name>
+      <entityField>#ENTITY</entityField>
+      <view>SupportTicketNewTicket_view</view>
+    </neonViewReference>
+    <scoreCardViewTemplate>
+      <name>Pull Ticket</name>
+      <fieldActions>
+        <element>pullNextTicket</element>
+      </fieldActions>
+      <entityField>#ENTITY</entityField>
+      <title></title>
+      <devices>
+        <element>MOBILE</element>
+        <element>TABLET</element>
+        <element>DESKTOP</element>
+      </devices>
+      <fields>
+        <entityFieldLink>
+          <name>1ca745bc-ded2-42ff-8f5c-330b95993e5c</name>
+          <entityField>PULL_TICKET</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketRequestor_view/SupportTicketRequestor_view.aod b/neonView/SupportTicketRequestor_view/SupportTicketRequestor_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..512a072aaf6c056e70db7bd279832e4c8dc50fd4
--- /dev/null
+++ b/neonView/SupportTicketRequestor_view/SupportTicketRequestor_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketRequestor_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Requestor</name>
+      <editMode v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>208700bf-e4b6-486d-9a11-1a0e5fb4ae7d</name>
+          <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>ff608c8f-bd31-4b80-b874-30f021ddfd46</name>
+      <entityField>#ENTITY</entityField>
+      <view>SupportTicketComm_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketTemplateEdit_view/SupportTicketTemplateEdit_view.aod b/neonView/SupportTicketTemplateEdit_view/SupportTicketTemplateEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cbf558764db0f8eb25689038bbb8af5b570027a6
--- /dev/null
+++ b/neonView/SupportTicketTemplateEdit_view/SupportTicketTemplateEdit_view.aod
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketTemplateEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <size>NORMAL</size>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>GenericMain</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
+      <drawerCaption></drawerCaption>
+      <isEditable v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>ced5c626-a56c-4043-a47b-050642ebb941</name>
+          <entityField>NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e6f7252c-371d-46df-87eb-2254ea6aa6aa</name>
+          <entityField>TEMPLATENO</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>02fcad7c-eeb7-40fd-977c-2d3158b2926e</name>
+          <entityField>ACTIVE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d0164fda-63eb-4267-9f8f-7f287affdd5e</name>
+          <entityField>INBOX_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>810ac752-011b-43fd-98df-85cd2afa1074</name>
+          <entityField>CATEGORY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bd560c7b-4b85-4c79-b34a-0640d58dabde</name>
+          <entityField>TITLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e0d1806e-c403-42ae-b05f-e2af3a6fe6ef</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b1c9e013-f8cc-48e1-88f1-fd0ac89605ff</name>
+          <entityField>MATURINGTIME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>cf284045-be85-4ef5-bc83-16a3b5efe179</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e7422d22-20e8-45b0-a26a-fe3cc4e8748d</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>1c3f93c2-93d8-4702-8b50-d143d2df8c06</name>
+          <entityField>CONCLUSION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>316de5a7-4099-40c7-887d-36f8f6456f8c</name>
+          <entityField>STATUSMAILBRIDGE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fdca9911-f202-4d66-b283-6d6ceff555e1</name>
+          <entityField>CONCLUSIONMAILBRIDGE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3a9a4ef6-365d-4daf-ac25-40fc47342382</name>
+          <entityField>INDIVIDUAL_ANSWER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0ca92531-6163-4385-9fec-3d3ac01f555c</name>
+          <entityField>DOCUMENTTEMPLATE_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketTemplateFilter_view/SupportTicketTemplateFilter_view.aod b/neonView/SupportTicketTemplateFilter_view/SupportTicketTemplateFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e57c0166b4e41bafdcf690571e38f656367aabb3
--- /dev/null
+++ b/neonView/SupportTicketTemplateFilter_view/SupportTicketTemplateFilter_view.aod
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketTemplateFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <isOverlay v="false" />
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <columns>
+        <neonTableColumn>
+          <name>7678e66f-8473-46e4-a437-5c2fe2c11e44</name>
+          <entityField>active_icon</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c5edcf3b-9475-40c1-86a3-76b1cbe5a3a2</name>
+          <entityField>TEMPLATENO</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>e7fac391-2174-4353-8021-3c2da0ba6221</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>33cac57d-33c6-4493-bd7b-7cba9ec948db</name>
+          <entityField>INBOX_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>94c3d992-c2a6-4a25-b60c-fc4385ddc9ce</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>6537b889-b6fc-4b92-b2be-6f449dce62c5</name>
+          <entityField>TITLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>7aca2cd7-945b-4c78-8d5e-214ef6ccecc2</name>
+          <entityField>DESCRIPTION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>416a81b0-9501-4665-9c10-7c8b5f0b80dc</name>
+          <entityField>MATURINGTIME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>418a39ee-7457-4004-9f05-b2500fe2d126</name>
+          <entityField>PRIORITY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ed6f34d7-8a15-40c8-a49b-60aed3995935</name>
+          <entityField>STATUS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>8cf7367d-05eb-4074-9e7f-3fc583950545</name>
+          <entityField>CONCLUSION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>7bfe693e-00e6-430a-9113-bf92a8a66a81</name>
+          <entityField>STATUSMAILBRIDGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>91aa92eb-1dc5-4b0f-a9d7-56d587ac538b</name>
+          <entityField>CONCLUSIONMAILBRIDGE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>6852b2ee-9c0b-4302-9796-4b8cf5b16336</name>
+          <entityField>INDIVIDUAL_ANSWER</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>004b5d16-a51e-4917-8876-99f8fc1cc572</name>
+          <entityField>DOCUMENTTEMPLATE_ID</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketTemplateLookup_view/SupportTicketTemplateLookup_view.aod b/neonView/SupportTicketTemplateLookup_view/SupportTicketTemplateLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fa36a6833255747311736365e1dc4631cb257616
--- /dev/null
+++ b/neonView/SupportTicketTemplateLookup_view/SupportTicketTemplateLookup_view.aod
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketTemplateLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <columns>
+        <neonTableColumn>
+          <name>fdb85d44-975d-4090-a1ab-482e52b8e226</name>
+          <entityField>TEMPLATENO</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>1dee97dc-cec8-4171-a3cb-8856141cf36c</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketTemplatePreview_view/SupportTicketTemplatePreview_view.aod b/neonView/SupportTicketTemplatePreview_view/SupportTicketTemplatePreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b5f84dc3325b6464289c38f6173948906ee7b8ba
--- /dev/null
+++ b/neonView/SupportTicketTemplatePreview_view/SupportTicketTemplatePreview_view.aod
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>SupportTicketTemplatePreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isOverlay v="false" />
+  <overlayOrientation>PORTRAIT</overlayOrientation>
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>Card</header>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>Card</name>
+      <iconField>#IMAGE</iconField>
+      <titleField>NAME</titleField>
+      <subtitleField>TEMPLATENO</subtitleField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>GenericMain</name>
+      <editMode v="false" />
+      <showDrawer v="true" />
+      <drawerCaption>Properties</drawerCaption>
+      <hideEmptyFields v="true" />
+      <isEditable v="true" />
+      <title></title>
+      <fields>
+        <entityFieldLink>
+          <name>b16ea9c2-b788-4216-9861-0ada7eca5f84</name>
+          <entityField>ACTIVE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>50f3777c-c563-432b-b4c1-2d3631a5043d</name>
+          <entityField>INBOX_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ef3bfaa4-5498-437a-ab40-8383fb2ab10f</name>
+          <entityField>CATEGORY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>29b1e716-0f11-42b9-ae23-1dc9f83cde6b</name>
+          <entityField>TITLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>21ea4891-fe45-49ea-85de-c80ad7d11eba</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>21f3797d-e686-42c8-b65d-09c5ce674091</name>
+          <entityField>MATURINGTIME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>350c38eb-6da6-46e5-ae29-321e7e2c9ff6</name>
+          <entityField>PRIORITY</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d5a4895b-445a-4d4e-b738-b06e6d7454ac</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>84a46875-e186-49f0-8a19-dd21b2f466f2</name>
+          <entityField>CONCLUSION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>6c28fba9-788d-4d5c-af45-4aa2e2f9bd0d</name>
+          <entityField>STATUSMAILBRIDGE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>6cf17236-bc12-4a3f-a02a-f030eb7c3ea6</name>
+          <entityField>CONCLUSIONMAILBRIDGE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b771fe08-1e12-4a1c-86b2-83bff83f841a</name>
+          <entityField>INDIVIDUAL_ANSWER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>01f47dd1-ae13-4421-bc1e-5fba2d9465fd</name>
+          <entityField>DOCUMENTTEMPLATE_ID</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/WorkflowDefinitionLookup_view/WorkflowDefinitionLookup_view.aod b/neonView/WorkflowDefinitionLookup_view/WorkflowDefinitionLookup_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c99b743c19fa0afbf2741da7ddb9a5f9933c98c0
--- /dev/null
+++ b/neonView/WorkflowDefinitionLookup_view/WorkflowDefinitionLookup_view.aod
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>WorkflowDefinitionLookup_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <columns>
+        <neonTableColumn>
+          <name>f1104c6a-bab4-4975-8299-89ab3efed334</name>
+          <entityField>KEY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>2fe64ef8-4958-435e-89fd-4f278533e90e</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9d7439c8-7b14-4daa-9103-b20981d0261f</name>
+          <entityField>VERSION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>6e1520f8-a0d2-41ea-ba11-f4a076a5911b</name>
+          <entityField>ISACTIVE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>12fdc1fe-0ceb-4e4a-81d5-5e017f9e0319</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index f7c6b1592f86da4783eb309560bfb9293bf3b332..dbd28f4ae059590fd14d6a385513e9649592ead5 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -46,14 +46,26 @@
   <userdirectoryAlias>_____SYSTEMALIAS</userdirectoryAlias>
   <mailBridgeMailserver>
     <mailbridgeMailserver>
-      <name>abfa63d1-a47e-41f6-a87d-138bf04adc1e</name>
+      <name>a9af9881-a6e8-4aed-a895-ef4b87e37055</name>
       <enabled v="true" />
-      <bridgeName>Dev-Exchange</bridgeName>
+      <bridgeName>mailServerIMAP-null-a9af9881</bridgeName>
       <serverName>mailServerIMAP</serverName>
-      <timeout v="20000" />
-      <user>mailbridge</user>
-      <intervall v="5000" />
-      <bridgeMode v="3" />
+      <user>mailbridgeDev</user>
+      <intervall v="30000" />
+      <bridgeMode v="1" />
+      <flagMode v="2" />
+      <process>mailbridge</process>
+      <errorProcess></errorProcess>
+      <attachmentHandling>ALL</attachmentHandling>
+    </mailbridgeMailserver>
+    <mailbridgeMailserver>
+      <name>37b3d4f3-ef30-4b7a-9980-7f79711b62ce</name>
+      <enabled v="true" />
+      <bridgeName>mailServerIMAP-null-37b3d4f3</bridgeName>
+      <serverName>mailServerIMAP</serverName>
+      <user>mailbridgeQS</user>
+      <intervall v="30000" />
+      <bridgeMode v="1" />
       <flagMode v="2" />
       <process>mailbridge</process>
       <errorProcess></errorProcess>
@@ -169,6 +181,11 @@
       <name>AD.Config</name>
       <description>Start point of the search in tree, separate more values with semicolon </description>
     </customStringProperty>
+    <customStringProperty>
+      <name>supportticket.coderegex</name>
+      <description>Regex for the Supportticketcode</description>
+      <property>\[[0-9]{1,10}\]</property>
+    </customStringProperty>
     <customStringProperty>
       <name>myCompany.addr</name>
       <description>Addressline of my company</description>
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 0c931e6f6b4477cbb0490512d9f1fa287c764264..ef75d00d32dd94fd8827b744714cd84fa65e7ba7 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -768,7 +768,7 @@ ContactUtils.getContactIdByEmail = function(pEmail)
     var email = EmailUtils.extractAddress(pEmail).toUpperCase();
     var contactId = newSelect("CONTACT.CONTACTID")
                             .from("COMMUNICATION")
-                            .join("CONTACT", newWhere("COMMUNICATION.OBEJCT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Contact"))
+                            .join("CONTACT", newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Contact"))
                             .where("COMMUNICATION.ADDR", email, "upper(#) = ?")
                             .cell();
     return contactId;
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 74f19214f10db8259cc8e314878a63ba5b2b6fec..daf83b6b1573ceee181d1cb7218ffca1b6b7b36e 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -484,7 +484,7 @@ DocumentTemplate.prototype.getReplacedContent = function (pReplacements)
  */
 DocumentTemplate.prototype.getReplacedContentByContactId = function (pContactId, pAdditionalPlaceholders) 
 {
-    var replacements = this.getReplacementsByContactIds([pContactId], pAdditionalPlaceholders)[pContactId]; 
+    var replacements = this.getReplacementsByContactIds([pContactId], pAdditionalPlaceholders)[pContactId];
     var content = this.getReplacedContent(replacements);
     
     return content;
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 3b1ab6f2cee2376b211c844c76a74311ea88cd5d..cad4add23feaf327961ba46ac1196bc0b169dd14 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -75,13 +75,31 @@ $KeywordRegistry.taskStatus$ended = function(){return "ENDED";};
 $KeywordRegistry.taskStatus$endedDone = function(){return "ENDED-DONE";};
 $KeywordRegistry.taskStatus$endedAbandoned = function(){return "ENDED-ABANDONED";};
 $KeywordRegistry.taskStatus$customerChecks = function(){return "CUSTOMER-CHECKS";};
+$KeywordRegistry.taskStatus$employeeChecks = function(){return "EMPLOYEE-CHECKS"};
+$KeywordRegistry.taskStatus$entry = function(){return "ENTRY";};
+$KeywordRegistry.taskStatus$resubmitted = function(){return "RESUBMITTED"};
+$KeywordRegistry.taskStatus$reopen = function(){return "REOPEN";};
+$KeywordRegistry.taskStatus$request = function(){return "REQUEST";}; //
+$KeywordRegistry.taskStatus$reply = function(){return "REPLY";}; //
+$KeywordRegistry.taskStatus$processing = function(){return"PROCESSING";};
+$KeywordRegistry.taskStatus$internalreply = function(){return "INTERNALREPLY";};
+$KeywordRegistry.taskStatus$done = function(){return "DONE";}; //
+$KeywordRegistry.taskStatus$resubmission = function(){return "RESUBMISSION"};
 
 $KeywordRegistry.taskType = function(){return "TaskType";};
 $KeywordRegistry.taskType$task = function(){return "TASK";};
 $KeywordRegistry.taskType$ticket = function(){return "TICKET";};
 
+$KeywordRegistry.ticketConclusion = function(){return "TICKETCONCLUSION";};
+$KeywordRegistry.ticketConclusion$failur_custom = function(){return "FAILURE_CUSTOMER";};
+$KeywordRegistry.ticketConclusion$failur_employ = function(){return "FAILURE_EMPLOYEE";};
+$KeywordRegistry.ticketConclusion$success = function(){return "SUCCESS";};
+
 $KeywordRegistry.ticketType = function(){return "TicketType";};
 $KeywordRegistry.ticketType$supportTicket = function(){return "SUPPORTTICKET";};
+$KeywordRegistry.ticketSubjectComplaint = function(){return "COMPLAINT";};
+$KeywordRegistry.ticketSubjectCancellation = function(){return "CANCELLATION";};
+$KeywordRegistry.ticketSubjectQuery = function(){return "QUERY";};
 
 $KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
 $KeywordRegistry.productPricelist$standardList = function(){return "PRICELISTDEFAULT";};
@@ -118,11 +136,15 @@ $KeywordRegistry.stockWarehouse = function(){return "StockWarehouse";};
 
 $KeywordRegistry.activityCategory = function(){return "ActivityCategory";};
 $KeywordRegistry.activityCategory$mail = function(){return "MAIL";};
+$KeywordRegistry.activityCategory$note = function(){return "NOTE"};
 $KeywordRegistry.activityCategory$letter = function(){return "LETTER";};
 $KeywordRegistry.activityCategory$visit = function(){return "VISIT";};
 $KeywordRegistry.activityCategory$phone = function(){return "PHONE";};
+$KeywordRegistry.activityCategory$contactFormular = function(){return "CONTACT_FORMULAR";};
 $KeywordRegistry.activityCategory$onlineMeeting = function(){return "ONLINE-MEETING";};
-$KeywordRegistry.activityCategory$approval = function(){return "APPROVAL";};
+$KeywordRegistry.activityCategory$approval = function(){return "APPROVAL";}
+$KeywordRegistry.activityCategory$sys = function(){return "SYS";};
+
 
 $KeywordRegistry.addressType = function(){return "AddressType";};
 $KeywordRegistry.addressType$private = function(){return "HOMEADDR";};
@@ -194,6 +216,8 @@ $KeywordRegistry.documentTemplateType$letter = function(){return "LET";};
 $KeywordRegistry.documentTemplateType$textModular = function(){return "TEX";};
 $KeywordRegistry.documentTemplateType$mail = function(){return "MAI";};
 $KeywordRegistry.documentTemplateType$attachment = function(){return "ATT";};
+$KeywordRegistry.documentTemplateType$signature = function(){return "SIGNATURE";};
+$KeywordRegistry.documentTemplateType$replymail = function(){return "REPLY_MAIL";};
 
 $KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
 $KeywordRegistry.documentTemplateTypeCategory$single = function(){return "1";};
@@ -204,6 +228,9 @@ $KeywordRegistry.documentTemplateTypeCategory$receiptHeader = function(){return
 $KeywordRegistry.documentTemplateTypeCategory$receiptFooter = function(){return "6";};
 $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate = function(){return "7";};
 $KeywordRegistry.documentTemplateTypeCategory$workflow = function(){return "8";};
+$KeywordRegistry.documentTemplateTypeCategory$singleall = function(){return "10";};
+$KeywordRegistry.documentTemplateTypeCategory$singleinternal = function(){return "11";};
+$KeywordRegistry.documentTemplateTypeCategory$singleexternal = function(){return "12";};
 
 $KeywordRegistry.classificationType = function(){return "ClassificationType";};
 $KeywordRegistry.classificationType$salesproject = function(){return "Salesproject";};
@@ -372,6 +399,33 @@ $KeywordRegistry.knowledgePublishLevel$internal = function(){return "INTERNAL";}
 $KeywordRegistry.knowledgePublishLevel$partner = function(){return "PARTNER";}
 $KeywordRegistry.knowledgePublishLevel$public = function(){return "PUBLIC";}
 
+$KeywordRegistry.inboxStatus = function(){return "InboxStatus";};
+$KeywordRegistry.inboxStatus$active = function(){return "ACTIVE";};
+$KeywordRegistry.inboxStatus$inactive = function(){return "INACTIVE";};
+
+$KeywordRegistry.employeeGroupStatus = function(){return "EmployeeGroupStatus";};
+$KeywordRegistry.employeeGroupStatus$active = function(){return "ACTIVE";};
+$KeywordRegistry.employeeGroupStatus$inactive = function(){return "INACTIVE";};
+
+$KeywordRegistry.ticketCategory = function(){return "TicketCategory";}
+$KeywordRegistry.ticketCategory$undefined = function(){return "UNDEFINED";}
+$KeywordRegistry.ticketCategory$all = function(){return "ALL";}
+$KeywordRegistry.ticketCategory$cancellation = function(){return "CANCELLATION";}
+$KeywordRegistry.ticketCategory$query = function(){return "QUERY";}
+
+$KeywordRegistry.inboxFilterComponent = function(){return "InboxFilterComponent";};
+$KeywordRegistry.inboxFilterComponent$body = function(){return "BODY";};
+$KeywordRegistry.inboxFilterComponent$subject = function(){return "SUBJECT";};
+$KeywordRegistry.inboxFilterComponent$sender = function(){return "SENDER";};
+
+$KeywordRegistry.inboxFilterTarget = function(){return "InboxFilterTarget";};
+$KeywordRegistry.inboxFilterTarget$category = function(){return "CATEGORY";};
+$KeywordRegistry.inboxFilterTarget$attribut = function(){return "ATTRIBUT";};
+
+$KeywordRegistry.employeeStatus = function(){return "EmployeeStatus";};
+$KeywordRegistry.employeeStatus$aviable = function(){return "AVAILABLE";};
+$KeywordRegistry.employeeStatus$unaviable = function(){return "UNAVAILABLE";};
+
 $KeywordRegistry.visitPlanEntryStatusAppointment = function(){return "VisitPlanEntryStatusAppointment";};
 $KeywordRegistry.visitPlanEntryStatusAppointment$requested = function(){return "VISITSTATUSAPPOINTMENTREQUESTED";};
 $KeywordRegistry.visitPlanEntryStatusAppointment$confirmed = function(){return "VISITSTATUSAPPOINTMENTCONFIRMED";};
@@ -454,6 +508,9 @@ $KeywordRegistry.visitFrequency$quarterly = function(){return "VISITFREQUENCYQUA
 $KeywordRegistry.visitFrequency$monthly = function(){return "VISITFREQUENCYMONTHLY";};
 $KeywordRegistry.visitFrequency$weekly = function(){return "VISITFREQUENCYWEEKLY";};
 
+$KeywordRegistry.attributeFilterComparisonMethod = function(){return "AttributeFilterComparisonMethod";}
+$KeywordRegistry.attributeFilterComparisonMethod$probability = function(){return "PROBABILITY";}
+$KeywordRegistry.attributeFilterComparisonMethod$fix = function(){return "FIX";}
 $KeywordRegistry.linkEvaluationType = function(){return "LinkEvaluationType";};
 $KeywordRegistry.linkEvaluationType$default = function(){return "LINKEVALUATION_DEFAULT";};
 $KeywordRegistry.linkEvaluationType$ignore = function(){return "LINKEVALUATION_IGNORE";};
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index b64219121749443da46813d190acb0ee3a755e25..4d822f2253c79ae65e1a26ac581b9d81159510fd 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -52,9 +52,9 @@ KeywordUtils.getViewValue = function(keywordContainer, key, locale)
 {
     if (!key)
         return "";
-
+    
     var data = KeywordUtils.getEntryMap(keywordContainer, locale, false);
-
+    
     return data.has(key) ? data.get(key) : "";
 };
 
diff --git a/process/MimeType_lib/process.js b/process/MimeType_lib/process.js
index 2e4e1010fd42930a8daeeec7a5a407e0ecf33aa0..11a024657aa808078f2cf58a5beea35f697c9693 100644
--- a/process/MimeType_lib/process.js
+++ b/process/MimeType_lib/process.js
@@ -37,13 +37,14 @@ MimeTypes.XML = function () {return "text/xml";};
 MimeTypes.EML = function () {return "message/rfc822";};
 
 /* images */
-MimeTypes.BMP = function () {return "image/bmp";};
-MimeTypes.GIF = function () {return "image/gif";};
-MimeTypes.JPEG = function() {return "image/jpeg";};
-MimeTypes.TIFF = function() {return "image/tiff";};
-MimeTypes.PNG = function () {return "image/png";};
-MimeTypes.SVG = function () {return "image/svg+xml";};
-MimeTypes.WEBP = function() {return "image/webp";};
+MimeTypes.BMP =  function () {return "image/bmp";};
+MimeTypes.GIF =  function () {return "image/gif";};
+MimeTypes.JPEG =  function() {return "image/jpeg";};
+MimeTypes.TIFF =  function() {return "image/tiff";};
+MimeTypes.PJPEG = function() {return "image/pjpeg";};
+MimeTypes.PNG =  function () {return "image/png";};
+MimeTypes.SVG =  function () {return "image/svg+xml";};
+MimeTypes.WEBP =  function() {return "image/webp";};
 
 /* audio */
 MimeTypes.MP3 = function () {return "audio/mpeg";};
diff --git a/process/ServiceEmail_lib/ServiceEmail_lib.aod b/process/ServiceEmail_lib/ServiceEmail_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..de4bf2eeb2b4eca98275d074855cc89d4e4be9b4
--- /dev/null
+++ b/process/ServiceEmail_lib/ServiceEmail_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>ServiceEmail_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/ServiceEmail_lib/documentation.adoc</documentation>
+  <process>%aditoprj%/process/ServiceEmail_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/ServiceEmail_lib/documentation.adoc b/process/ServiceEmail_lib/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6e2f648140e9aef52329dc8948ca8bf5f563540c
--- /dev/null
+++ b/process/ServiceEmail_lib/documentation.adoc
@@ -0,0 +1,3 @@
+= ServiceEMail_lib
+
+This library contains functions essential for the creation of body and signature of service mails.
diff --git a/process/ServiceEmail_lib/process.js b/process/ServiceEmail_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..897d61384338c685f03269e1e2f534bf2b69f171
--- /dev/null
+++ b/process/ServiceEmail_lib/process.js
@@ -0,0 +1,324 @@
+import("system.datetime");
+import("system.util");
+import("Employee_lib");
+import("Sql_lib");
+import("system.db");
+import("system.translate");
+import("system.vars");
+import("DocumentTemplate_lib")
+
+
+/**
+ *  @description   Creates the header for the Text history
+ *  
+ *  @return     Header as a string
+ */
+function headerTextHistory()
+{
+    var textForBody ="<hr>";
+    textForBody +=" <p>-----"+ translate.text("Original message") +"----- </p>";
+    
+    return textForBody;
+}
+
+/**
+ *  @description   Gets the original email message by the customer via ticketID or taskID
+ *  
+ *  @param {String}      pTo the receiver address 
+ *  @param {String}      pSender the mail address of the orginal sender
+ *  @param {String}      pSubject the subject of the original massage
+ *  @param {String}      pTicketCode the code of the serviceticket
+ *  @param {String}      pTicketID the ticketID of the serviceticket. As an optional method to get the TaskID
+ *  @param {String}      pTaskID the taskID of the serviceticket
+ *  
+ *  @return     string with the original message, send date and time
+ */
+function getBodyHistory(pTo,pSender,pSubject,pTicketCode,pTicketID, pTaskID)
+{
+    //add Subject and From
+    var textForBody  = headerTextHistory(); 
+
+    if(!pTaskID)
+    {
+        pTaskID = newSelect("TASK_ID").from("TICKET").where("TICKET.TICKETID", pTicketID).cell();
+    }
+
+    var DateInfos = newSelect("START_DATE").from("TASK").where("TASK.TASKID", pTaskID).arrayRow();
+    var TicketInfos= newSelect("EMAIL_DESCRIPTION").from("TICKET").where("TICKET.TASK_ID", pTaskID).arrayRow();
+
+    textForBody +="<p>";
+    if(pSender)  //  customer mail address
+    {
+        textForBody += "<strong>"+(translate.text("From")+ ": </strong>" + pSender + "<br/>");  
+    }  
+
+    if(pTo)  //  to: receiver address
+    {
+        textForBody += "<strong>"+(translate.text("To")+ ": </strong>" + pTo + "<br/>"); 
+    }
+
+     // add DATE
+    if(DateInfos)
+    {
+        textForBody += "<strong>"+(translate.text("Sendet")+ ": </strong>" + 
+                        datetime.toDate(DateInfos, translate.text("dd.MM.YYYY HH:mm") , "Europe/Berlin") + "<br/>");  
+    }
+    if(pSubject)
+    {
+        textForBody += "<strong>"+(translate.text("Subject")+ ":  </strong>" +pSubject ); 
+    }
+    /// add code to subject
+    if(pTicketCode)
+    {
+        textForBody += ("[" + pTicketCode + "] <br/>"); 
+    } 
+    else 
+    {
+         textForBody += "<br/>";
+    }
+
+    textForBody +="</p>";
+
+    textForBody += "<br/>";
+
+    textForBody +="<p>"
+    textForBody += TicketInfos; 
+    textForBody +="</p>";
+
+    return textForBody;
+}
+ 
+ 
+/**
+ *  @description   Gets the original email message by the customer via a specific activityID
+ *  
+ *  @param {String}      pActivityID the activityID of the activity 
+ *  @param {String}      pTicketID the ticketID of the serviceticket.
+ *  @param {String}      pKind the subject of the original massage
+ *  @param {String}      pTo the receiver address 
+ *  @param {String}      pSender the mail address of the orginal sender
+ *  
+ *  @return     string with the original message, send date and time
+ */    
+function getBodyHistoryFromActivity(pActivityID, pTicketID, pKind, pTo, pSender)
+{
+    var activityInfo = [];
+    
+    if(pActivityID)
+    {
+        activityInfo =  newSelect("INFO, SUBJECT, ENTRYDATE")
+            .from("ACTIVITY")
+            .where("ACTIVITY.ACTIVITYID", pActivityID)
+            .arrayRow();
+    } 
+    else 
+    {
+        if(pTicketID && (pKind == "mostRecent"))
+        {
+            // select the newest activity from the ones with subject 'Antwort Kunde' or 'Sendung an Kunde
+             activityInfo = newSelect("INFO, SUBJECT, ENTRYDATE")
+                .from("ACTIVITY")
+                .where("ACTIVITY.PARENT_CONTEXT", 'SUPPORTTICKET')
+                .and("ACTIVITY.CATEGORY", 'MAIL')
+                .and("ACTIVITY.SUBJECT", ['Antwort Kunde','Sendung an Kunde'], SqlBuilder.IN())
+                .and("ACTIVITY.PARENT_ID", pTicketID)
+                .orderBy("ACTIVITY.DATE_NEW desc")
+                .arrayRow();      
+        } 
+    }
+    
+    if(activityInfo && activityInfo.length > 0)
+    {
+        
+        var textForBody  = headerTextHistory(); 
+        
+        textForBody +="<p>";
+        
+        // take Subject for intern
+        if(pKind == "intern")
+        {
+            textForBody += "<strong>"+translate.text("Activity")+ " " + (translate.text("Subject")+ ":  </strong>" 
+                            + activityInfo[1] + "<br/>" ); 
+        }        
+        // set FROM and TO
+        if(activityInfo[1] == "Antwort Kunde")
+        { 
+            if(pSender)  //  customer mail address
+            {
+                textForBody += "<strong>"+(translate.text("From")+ ": </strong>" + pSender + "<br/>");
+            }
+            if(pTo)  //  to: receiver address 
+            {
+                textForBody += "<strong>"+(translate.text("To")+ ": </strong>" + pTo + "<br/>");
+            }
+        } 
+        else if(activityInfo[1] == "Sendung an Kunde") 
+        {
+            if(pTo)  //  to: receiver address
+            {
+                textForBody += "<strong>"+(translate.text("From")+ ": </strong>" + pTo + "<br/>");
+            }
+            if(pSender)  //  customer mail address 
+            {
+                textForBody += "<strong>"+(translate.text("An")+ ": </strong>" + pSender + "<br/>"); 
+            }
+        }
+        
+        // add DATE
+        if(activityInfo[2])
+        {
+            textForBody += "<strong>"+(translate.text("Sendet")+ ": </strong>" + 
+                            datetime.toDate(activityInfo[2], translate.text("dd.MM.YYYY HH:mm") , "Europe/Berlin") + "<br/>");   
+        }    
+        textForBody +="</p>"; 
+        
+        /// ADD ACTIVITY DESCRIPTION
+        textForBody += ("<p>" +activityInfo[0] + "</p>");
+        
+       return textForBody;
+    } 
+    else 
+    {
+        return "";
+    }     
+}
+
+
+/**
+ *  @description   Gets the original email message by the customer viaactivities
+ *  
+ *  @param {String}      pTicketID the ticketID of the serviceticket.
+ *  @param {String}      pTaskID the taskID of the serviceticket.
+ *  @param {String}      pKind the subject of the original massage
+ *  @param {String}      pTo the receiver address 
+ *  @param {String}      pSender the mail address of the orginal sender
+ *  @param {String}      pSubject the subject of the original massage 
+ *  @param {String}      pTicketCode the ticketcode of the serviceticket
+ *  
+ *  @return     string with the original message, send date and time
+ */ 
+function getBodyHistoryForAllActivities(pTicketID, pTaskID, pKind, pTo, pSender, pSubject, pTicketCode)
+{
+    
+    // first original ticket
+    var textForBody = "";
+    
+    // get original erst
+    textForBody += getBodyHistory(pTo,pSender,pSubject,pTicketCode,pTicketID, pTaskID)
+    
+    var allActivities = newSelect("ACTIVITYID")
+            .from("ACTIVITY")
+            .where("ACTIVITY.PARENT_CONTEXT", 'SUPPORTTICKET')
+                .and("ACTIVITY.CATEGORY", 'MAIL')
+                .and("ACTIVITY.SUBJECT", ['Antwort Kunde','Sendung an Kunde', "Ticket wiedereröffnet"], SqlBuilder.IN())
+                .and("ACTIVITY.PARENT_ID", pTicketID)
+                .orderBy("ACTIVITY.DATE_NEW desc")
+            .array(db.COLUMN);
+            
+    allActivities.forEach(function(activityId)
+    { 
+         textForBody += getBodyHistoryFromActivity(activityId, null, pKind, pTo,pSender);
+    });     
+    
+    return textForBody;
+}   
+
+
+/**
+ *  @description   Gets the signature as a string
+ *  
+ *  @param {String}      pSignagureID the ID of the signature to add
+ *  
+ *  @return     string the signature
+ */ 
+function getSignatureContent(pSignatureID)
+{
+    let dokumentTemplateId = newSelect("SIGNATURE_DOCUMENTTEMPLATE_ID")
+        .from("MAILSIGNATURE")
+        .where("MAILSIGNATURE.MAILSIGNATUREID", pSignatureID)
+        .cell();
+
+    let documentContent = newSelect("TEMPLATECONTENT")
+        .from("DOCUMENTTEMPLATE")
+        .where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", dokumentTemplateId)
+        .cell();
+
+    let contactId = EmployeeUtils.getCurrentContactId();
+
+    ///REPLACE CONTENT WITH PLACEHOLDERS   
+
+    if(contactId)
+    {
+        var template = new DocumentTemplate(util.encodeBase64String(documentContent),
+                                            DocumentTemplate.types.HTML, undefined, true);
+        signature = template.getReplacedContentByContactId(contactId, false, true);
+    } 
+    else
+    {
+        signature = documentContent;
+    }  
+
+    return signature;
+
+}
+
+
+/**
+ *  @description   Gets the signature as a stringwithout placeholders
+ *  
+ *  @param {String}      pDocumentContent the signature is "TEMPLATECONTENT"  from DOCUMENTTEMPLATE
+ *  
+ *  @return     string the signature without placeholder
+ */ 
+function getSignatureWithoutPlaceholder(pDocumentContent)
+{
+// 
+    ///DELETE PLACEHOLDERS    
+   if(pDocumentContent)
+   {
+        var template = new DocumentTemplate(util.encodeBase64String(pDocumentContent),
+                                            DocumentTemplate.types.HTML, undefined, true);
+
+        var signature = template.getReplacedContentByContactId(null, false, true);
+        return signature;
+    } 
+    return "";
+}
+
+/**
+ *  @description   create the email body for the answer email
+ *  
+ *  @param {String}      pDocumentTemplate the documenttemplate used to create the first part of the mail
+ *  @param {String}      pSignature the signature to be added below the documentTemplate
+ *  @param {String}      phistoryEmailText the original mail added at the bottom of the mail
+ *  
+ *  @return     string the signature without placeholder
+ */ 
+function createBodyEmail(pDocumanteTemplate, pSignature, pHistoryEmailText)
+{
+    var emailBody = "";
+    
+    if(pDocumanteTemplate)
+    {
+        emailBody = "<p>" + pDocumanteTemplate + "</p>" ;
+    }
+    else
+    {
+         emailBody = "<br/><br/>";  // place to write
+    }
+    
+    if(pSignature)
+    {
+        emailBody += pSignature ;
+    }
+    
+    emailBody += "</br>"
+    
+    if(pHistoryEmailText)
+    {
+        emailBody += pHistoryEmailText ;
+    }
+
+    return emailBody;
+    
+}
\ No newline at end of file
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 5d9e1ce138a32abd36fb6ef12ce58a3fa33ddb28..542b4a9acb9900a4979fc7cbbb09c6a9cd75c68c 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -4040,6 +4040,34 @@ SqlMaskingUtils.prototype.hourFromDate = function(pField)
             return "EXTRACT (HOUR FROM " + pField + ")";
     }
 }
+
+
+/**
+ * gets the last day of the month from a timestamp
+ *
+ * @param {String} pField timestamp to get the last day of the month from
+ *
+ * @return {String} sql expression that extracts the last day of the month from a timestamp
+ */
+SqlMaskingUtils.prototype.lastDayOfMonth = function(pField)
+{
+    switch (this.dbType)
+    {
+        case db.DBTYPE_ORACLE10_CLUSTER:
+        case db.DBTYPE_ORACLE10_THIN:
+        case db.DBTYPE_ORACLE10_OCI:
+        case db.DBTYPE_DERBY10:
+        case db.DBTYPE_MYSQL4:
+        case db.DBTYPE_MARIADB10:
+            return "LAST_DAY(" + pField + ")";
+        case db.DBTYPE_SQLSERVER2000:
+            return "DATEADD(MONTH, DATEDIFF(MONTH, 0 ," + pField + ") + 1, 0) -1";
+        case db.DBTYPE_POSTGRESQL8:
+            return "DATE_TRUNC('month'," + pField + "::date) + interval '1 month' - interval '1 day')::date"; 
+    }
+}
+
+
 /**
  * returns the first field, that is not null or empty
  * masks the behaviour of coalesce with case when
diff --git a/process/TicketTemplate_lib/TicketTemplate_lib.aod b/process/TicketTemplate_lib/TicketTemplate_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a924520077912349899b2f9e2dbc6e06653158dd
--- /dev/null
+++ b/process/TicketTemplate_lib/TicketTemplate_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>TicketTemplate_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/TicketTemplate_lib/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/TicketTemplate_lib/process.js b/process/TicketTemplate_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..0555f45acc7bc2d9405d7879fa83045702e03ca0
--- /dev/null
+++ b/process/TicketTemplate_lib/process.js
@@ -0,0 +1,120 @@
+import("system.logging");
+import("system.eMath");
+import("system.db");
+import("system.datetime");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+
+function TicketTemplateUtils(){}
+
+
+/**
+ * creates a new support ticket from template
+ * 
+ * @param {String} pTemplateId                  the id of the template for the ticket
+ * @param {Array} pAdditionalColumnsTicket      the columns that should also be filled in the ticket
+ * @param {Array} pAdditionalValuesTicket       the values that should also be filled in the ticket
+ * @param {Array} pAdditionalColumnsTask        the columns that should also be filled in the task
+ * @param {Array} pAdditionalValuesTask         the values that should also be filled in the task
+ */
+TicketTemplateUtils.createTicketFromTemplate = function(pTemplateId, pAdditionalColumnsTicket, pAdditionalValuesTicket, 
+                                                            pAdditionalColumnsTask, pAdditionalValuesTask)
+{
+    var ticketTemplateColsTask = ["TITLE", "DESCRIPTION", "PRIORITY", "STATUS_MAILBRIDGE", "MATURING_TIME"];
+    var ticketTemplateColsTicket = ["INBOX_ID", "CATEGORY", "CONCLUSION_MAILBRIDGE"];
+    var ticketTemplateCols = ticketTemplateColsTask.concat(ticketTemplateColsTicket);
+    var ticketTemplateData = newSelect( "tickettemplate."+ ticketTemplateCols.join( ", tickettemplate."))
+        .from( "tickettemplate")
+        .where( "tickettemplate.TICKETTEMPLATEID", pTemplateId)
+        .arrayRow();
+        
+    var insertColsTicket = pAdditionalColumnsTicket || [];
+    var insertValuesTicket = pAdditionalValuesTicket || [];
+    var tableTicket = "TICKET";
+    
+    var insertColsTask = pAdditionalColumnsTask || [];
+    var insertValuesTask = pAdditionalValuesTask || [];
+    var tableTask = "TASK";
+    
+    
+    ticketTemplateCols.forEach( function(column, index)
+    {
+        
+        currentVal = ticketTemplateData[index];
+        
+        if(ticketTemplateColsTask.includes(column)) //checks if the column belongs to task 
+        {
+            if(ticketTemplateData[index])
+            {
+                insertColsTask.push(TicketTemplateUtils.ticketTemplateColumnMapping(column));
+                if(column == "MATURING_TIME")
+                {
+                    let currentDay = Math.floor(datetime.date() / datetime.ONE_DAY) * datetime.ONE_DAY;
+                    insertValuesTask.push(eMath.addInt(currentDay, eMath.mulInt( datetime.ONE_DAY, parseInt( currentVal)))); 
+                }
+                else
+                {
+                    insertValuesTask.push(currentVal);
+                }
+                if(column == "STATUS_MAILBRIDGE")
+                {
+                    if (currentVal != $KeywordRegistry.taskStatus$entry())
+                    {
+                        insertColsTicket.push("DATE_BEGIN");
+                        insertValuesTicket.push(datetime.date());
+                    }
+                    if (currentVal == $KeywordRegistry.taskStatus$ended())
+                    {
+                       insertColsTicket.push("DATE_END");
+                       insertValuesTicket.push(datetime.date());
+                    }
+                }
+            }
+        }
+        else //else the column belongs to ticket 
+        {
+            insertColsTicket.push(TicketTemplateUtils.ticketTemplateColumnMapping(column));
+            insertValuesTicket.push(currentVal);
+        }
+    });
+    var inserts = [[tableTask, insertColsTask, null, insertValuesTask],
+                   [tableTicket, insertColsTicket, null, insertValuesTicket]]
+
+    db.inserts(inserts)
+}
+
+
+/**
+ * returns the column of task or ticket that corresponds to the column of ticket template
+ * 
+ * @param {String} pColumn   the column of the ticket template to be mapped
+ */
+TicketTemplateUtils.ticketTemplateColumnMapping = function(pColumn)
+{
+    var mapping = {
+        "TITLE": "SUBJECT", 
+        "MATURING_TIME": "MATURITY_DATE",
+        "STATUS_MAILBRIDGE": "STATUS",
+        "CONCLUSION_MAILBRIDGE": "CONCLUSION"
+    };
+    
+    return mapping[pColumn] || pColumn;
+}
+
+/**
+ * checks whether the Template has an individual answer mail activitated
+ * 
+ * returns                                      the answer mail document template if true 
+ * 
+ * @param {String} pTemplateId                  the id of the template for the ticket
+ */
+TicketTemplateUtils.checkIndividualAnswer = function (pTemplateId)
+{
+  var sql = newSelect("DOCUMENTTEMPLATE.TEMPLATECONTENT")
+            .from("TICKETTEMPLATE")
+            .join("DOCUMENTTEMPLATE","TICKETTEMPLATE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID")
+            .whereIfset("TICKETTEMPLATE.TICKETTEMPLATEID",pTemplateId)
+            .cell()
+  return sql;
+}
\ No newline at end of file
diff --git a/process/Ticket_lib/process.js b/process/Ticket_lib/process.js
index 4a8fa2388a2c2c1f064a6790eb00afbdfccbd928..b04606139a0fa727898edd989b312b7dbd0b06ad 100644
--- a/process/Ticket_lib/process.js
+++ b/process/Ticket_lib/process.js
@@ -1,3 +1,8 @@
+import("Context_lib");
+import("system.neon");
+import("system.question");
+import("system.util");
+import("system.vars");
 import("Util_lib");
 import("ActivityTask_lib");
 import("KeywordRegistry_basic");
@@ -149,4 +154,89 @@ TicketUtils.prototype.getDefaultPriority = function()
     // consider using the same construct as for status
     // (--> using keyword attributes (e.g. whitelist) on the ticket type for making grouping over all (task /) tickets possible.
     return $KeywordRegistry.taskPriority$low();
+}
+
+
+/**
+ * Creates links for a task.<br>
+ * In the database table 'TASKLINK'.
+ * 
+ * @param {String} pTaskId                  <p>
+ *                                          The id of the task.<br>
+ * @param {String} pObjectType              <p>
+ *                                          The type of the object.<br>
+ * @param {String} pRowId                   <p>
+ *                                          The id of the row.<br>
+ */
+TicketUtils.insertLink = function (pTaskId, pObjectType, pRowId)
+{
+    var linkCols = [
+        "TASKLINKID",
+        "TASK_ID",
+        "OBJECT_ROWID",
+        "OBJECT_TYPE"
+    ];
+    
+    var linkVals = [
+        util.getNewUUID(),
+        pTaskId,
+        pRowId,
+        pObjectType
+    ];
+    
+    db.insertData("TASKLINK", linkCols, null, linkVals);
+}
+
+
+/*  
+ *  @description Opens a new SupportticketEdit_view. Links context and contact if possible. If you don't want any links, use neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW) instead
+ *  
+ *  @param {String} pStr_pirmaryKeyId   req     id of the primary key of primary context-table
+ *  @param {String} pStr_contextName    req     name of context expected, utilizes local context if empty
+ *  @param {String} pStr_contactId      opt     id of related contact. Useful if you want to link a person, f.e. for offers. Won't search if null/undefined. Dont't insert if context is Person or Organisation
+ *  
+ *  @return true if contextName and primaryKeyId could be found, false else
+ */
+TicketUtils.openNewSupportticket = function( pStr_pirmaryKeyId, pStr_contextName, pStr_contactId)
+{
+    pStr_contextName = pStr_contextName || ContextUtils.getCurrentContextId();
+    
+    if( !pStr_pirmaryKeyId || !pStr_contextName)
+    {
+        return false;
+    }
+
+    var arr_links = [[pStr_contextName, pStr_pirmaryKeyId]];
+    if( pStr_contactId)
+    {
+        arr_links.push( ["Person", pStr_contactId]);
+    }
+    var obj_links = 
+    {
+        "PresetLinks_param": JSON.stringify( arr_links)
+    };
+
+    neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW, obj_links);
+    return true;
+}
+
+
+/*
+ *  @description    Opens a new SupportTicketEdit_view, inserts pArr_linksParam as links. use     neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW) if you don't want links
+ *  
+ *  @param      {2d String array}  pArr_linksParams   req     2 dimensional array of links expected. Structure is [[contextName, contextPrimaryKeyId], [otherContextName, otherContextPrimaryKeyId]...]
+ *  
+ *  @return     false if pArr_linksParams isn't an array
+ */
+TicketUtils.openNewSupportticketWithLinks = function( pArr_linksParams)
+{
+    if( !pArr_linksParams || Object.prototype.toString.call( pArr_linksParams) != '[object Array]' || pArr_linksParams.length == 0)
+    {
+        return false;
+    }
+    var obj_links = {
+        "PresetLinks_param": JSON.stringify( pArr_linksParams)
+    }
+    neon.openContext("SupportTicket", "SupportTicketEdit_view", null, neon.OPERATINGSTATE_NEW, obj_links);
+    return true;
 }
\ No newline at end of file
diff --git a/process/WebserviceSupportTicket_lib/WebserviceSupportTicket_lib.aod b/process/WebserviceSupportTicket_lib/WebserviceSupportTicket_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..47c6e5df20e676fe153f2b423407cba7f4dbb8e7
--- /dev/null
+++ b/process/WebserviceSupportTicket_lib/WebserviceSupportTicket_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>WebserviceSupportTicket_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/WebserviceSupportTicket_lib/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/WebserviceSupportTicket_lib/process.js b/process/WebserviceSupportTicket_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0d9ce9e4fe5d41d6fc15b750665fafe8bb906bf
--- /dev/null
+++ b/process/WebserviceSupportTicket_lib/process.js
@@ -0,0 +1,165 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("Ticket_lib");
+import("Sql_lib");
+import("KeywordData_lib");
+import("system.logging");
+import("Util_lib");
+import("system.entities");
+
+/**
+ * Inserts a Supportticket
+ * 
+ * @param {Object} res the object where the data of supportticket is encluded (res Obj of webservice)
+ * @return {array} return the array (id of supportticket, ticketCode of supportticket)
+ */
+function insertSupportTicket(res)
+{
+    var ticketCode = NumberSequencingUtils.getNextUniqueNumber("CODE", "TICKET");
+    
+    //todo: Login in zu Kontakt ummünzen
+    var contactRelId = res.login;
+    var subject = getInboxNameById(res.inbox) +" / "+ KeywordUtils.getViewValue($KeywordRegistry.ticketCategory(), res.category);
+    
+    var config = entities.createConfigForAddingRows();
+    config.entity("SupportTicket_entity");
+    
+    // mapping of the EntityFields and their values
+    var obj = {
+        "TASK_REQUESTOR_CONTACT_ID" : contactRelId,
+        "TICKETCATEGORY" : res.category,
+        "TASK_DESCRIPTION" : res.description,
+        "MEDIUM" : $KeywordRegistry.activityCategory$contactFormular(),
+        "INBOX_ID": res.inbox,
+        "TASK_SUBJECT" : subject.toString()
+    };
+    
+    //filter if required fields are not filled
+    if(!contactRelId || !res.category || !res.description)
+    {
+        return [];
+    }
+    
+    config.fieldValues(obj);
+    
+    
+    var id = entities.createRow(config);// execution method for creating a new dataset
+
+    //insert OrderLink
+    if(res.salesorderCode)
+    {
+        salesOrderId = newSelect("SALESORDERID")
+        .from("SALESORDER")
+        .where("SALESORDER.SALESORDERCODE", res.salesorderCode)
+        .cell();
+        
+        taskId = newSelect("TASK_ID")
+        .from("TICKET")
+        .where("TICKET.TICKETID", id)
+        .cell();
+        
+        TicketUtils.insertLink(taskId, "Order", salesOrderId);
+    }
+    
+    return new Array(id, ticketCode);
+}
+
+/**
+ * Returns all Supporttickets of the requester
+ * 
+ * @param {String} pRequesterContactId the requester of the supporttickets
+ * @return {Object} the supporttickets of the requesterParam
+ */
+function getSupportTickets(pRequesterContactId)
+{
+    // creating the configuration object
+    var config = entities.createConfigForLoadingRows();
+    // setting the Entity's name
+    config.entity("SupportTicket_entity");
+    // defining the required EntityFields
+    config.fields([
+        "CODE",
+        "TASK_SUBJECT",
+        "TASK_START_DATE",
+        "TASK_STATUS",
+        "TASK_REQUESTOR_CONTACT_ID",
+        "TICKETID"
+        ]);
+
+    var resTickets = entities.getRows(config);
+    
+    var ticketsOfRequester = [];
+    
+    for (let i in resTickets)
+    {
+        if(resTickets[i]["TASK_REQUESTOR_CONTACT_ID"] == pRequesterContactId)
+            ticketsOfRequester.push(resTickets[i]);
+    }
+    return ticketsOfRequester;
+
+}
+
+/**
+ * Returns all details of one supportticket
+ * 
+ * @param {String} pTicketId the id of the supporttickets
+ * @return {Object} the details of the supportticket
+ */
+function getTicketDetails(pTicketId)
+{
+    // creating the configuration object
+    var config = entities.createConfigForLoadingRows();
+    // setting the Entity's name
+    config.entity("SupportTicket_entity");
+    // defining the required EntityFields
+    config.fields([
+        "CODE",
+        "TICKETID",
+        "TASK_SUBJECT",
+        "TASK_START_DATE",
+        "TASK_STATUS",
+        "TASK_REQUESTOR_CONTACT_ID",
+        "ALTERNATIVE_EMAILADDR",
+        "ALTERNATIVE_PHONEADDR",
+        "TASK_DESCRIPTION",
+        "TASK_MATURITY_DATE",
+        "TASK_PRIORITY",
+        "TICKETCATEGORY",
+        "TASK_PROGRESS",
+        "TASK_TYPE",
+        "TICKETTYPE"
+        ]);
+        
+    config.uid(pTicketId);
+    var ticketDetails = entities.getRows(config);
+    
+    return ticketDetails;
+}
+
+
+/**
+ * Returns all keywords from a keyword container
+ * 
+ * @param {String} pContainer the container (keywordCategory)
+ * @return {Object} the keyword (format: id : "id", name : "name")
+ */
+function getKeywords (pContainer)
+{
+    return KeywordData.getSimpleData(pContainer).map(function (item) 
+    {
+        return {
+            id : item[0], 
+            name : item[1]
+        };
+        
+    });
+}
+
+function getInboxNameById (pInboxId)
+{ 
+    var inboxName = newSelect("NAME")
+        .from("INBOX")
+        .where("INBOX.INBOXID", pInboxId)
+        .cell()
+    return inboxName;
+}
\ No newline at end of file
diff --git a/process/autostartNeon/process.js b/process/autostartNeon/process.js
index eec238d38e229844662e2f48cd10bf27a8617eb0..9165420787d1717ae70885d3eae573357418fdfa 100644
--- a/process/autostartNeon/process.js
+++ b/process/autostartNeon/process.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
 import("system.vars");
 import("PermissionCalendar_lib");
 import("Employee_lib");
@@ -9,4 +10,12 @@ var userContactId = EmployeeUtils.getCurrentContactId();
 vars.set("$global.user.contactId", userContactId);
 
 var currentUser = EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId());
-PermissionCalendar.setPermissions(currentUser);
\ No newline at end of file
+PermissionCalendar.setPermissions(currentUser);
+
+
+var defaultSignatureData = newSelect("COUNT(MAILSIGNATUREID)")
+.from("MAILSIGNATURE")
+.where("MAILSIGNATURE.DEFAULTSIGNATURE", "1")
+.cell();
+
+vars.set("$global.default_mailsignature", defaultSignatureData);
\ No newline at end of file
diff --git a/process/getAllTickets_get/getAllTickets_get.aod b/process/getAllTickets_get/getAllTickets_get.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b609774c59852149dbb47be57e6c2370473c2908
--- /dev/null
+++ b/process/getAllTickets_get/getAllTickets_get.aod
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>getAllTickets_get</name>
+  <title>getAllTickets</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/getAllTickets_get/process.js</process>
+  <publishAsWebservice v="true" />
+  <style>REST</style>
+  <restAcceptedMimeType>application/json</restAcceptedMimeType>
+  <restDeliveredMimeType>application/json</restDeliveredMimeType>
+  <loginTypeId>
+    <element>internal.none</element>
+  </loginTypeId>
+  <jditoWebserviceUser>Admin</jditoWebserviceUser>
+  <alias>Data_alias</alias>
+</process>
diff --git a/process/getAllTickets_get/process.js b/process/getAllTickets_get/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f3db2ae79d8412c3861457e4915e5a25a202dee
--- /dev/null
+++ b/process/getAllTickets_get/process.js
@@ -0,0 +1,63 @@
+import("WebserviceSupportTicket_lib");
+import("system.util");
+import("system.translate");
+
+function restget(pRequestAsJson)
+{
+    //Umwandeln des Strings in ein JSON Objekt
+    pRequestAsJson = JSON.parse(pRequestAsJson);
+    var res = pRequestAsJson.query;
+    var jsonResult = {};
+    
+    if (res.login)
+    {
+
+        var login = res.login;
+        //login zur contactId ummünzen
+        var requesterContactId = login;
+        var tickets = getSupportTickets(requesterContactId);
+        if(JSON.stringify(tickets)!= "[]")
+        {
+            jsonResult = {
+                result:{
+                    statusCode: 200,
+                    str: "The tickets were successfully fetched!"
+                },
+                data:{
+                    tickets: tickets.toSource()
+                }
+            };
+            pRequestAsJson.response.statuscode = 200; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+        else
+        {
+            jsonResult = {
+                result:{
+                    statusCode: 400,
+                    str: "No tickets found!"
+                },
+                data:{
+                    tickets: tickets.toSource(),
+                    relId: login
+                }
+            };
+            pRequestAsJson.response.statuscode = 400; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+    }
+    else
+    {
+        jsonResult = {
+            result:{
+                statusCode: 405,
+                str: "You have not sent the parameters! Invalid Input"
+            },
+            data:{}
+        };
+        pRequestAsJson.response.statuscode = 405;
+        pRequestAsJson.response.body = JSON.stringify(jsonResult);
+    }
+    //Umwandeln des JSON Objekts in einen String
+    return JSON.stringify(pRequestAsJson);
+}
diff --git a/process/getKeywords_get/getKeywords_get.aod b/process/getKeywords_get/getKeywords_get.aod
new file mode 100644
index 0000000000000000000000000000000000000000..72d87e061f4f2be3ae695bc6e74d09f26d3a3e2d
--- /dev/null
+++ b/process/getKeywords_get/getKeywords_get.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>getKeywords_get</name>
+  <title>getKeyword</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/getKeywords_get/process.js</process>
+  <publishAsWebservice v="true" />
+  <style>REST</style>
+  <loginTypeId>
+    <element>internal.none</element>
+  </loginTypeId>
+  <jditoWebserviceUser>Admin</jditoWebserviceUser>
+  <alias>Data_alias</alias>
+</process>
diff --git a/process/getKeywords_get/process.js b/process/getKeywords_get/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..18d29cf397dfcb318229708b69a61cc11259cad1
--- /dev/null
+++ b/process/getKeywords_get/process.js
@@ -0,0 +1,64 @@
+import("WebserviceSupportTicket_lib");
+import("system.util");
+import("system.translate");
+
+
+function restget(pRequestAsJson)
+{
+    //Umwandeln des Strings in ein JSON Objekt
+    pRequestAsJson = JSON.parse(pRequestAsJson);
+    var res = pRequestAsJson.query;
+    var jsonResult = {};
+    
+    if (res.keywordCategory)
+    {
+
+        var keywordCategory = res.keywordCategory;
+        var keywords = getKeywords(keywordCategory);
+        if(JSON.stringify(keywords)!= "[]")
+        {
+            jsonResult = {
+                result:{
+                    statusCode: 200,
+                    str: "The keywords were successfully fetched!"
+                },
+                data:{
+                    keywordCategory : keywordCategory,
+                    keywords: keywords.toSource()
+                }
+            };
+        
+            pRequestAsJson.response.statuscode = 200; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+        else
+        {
+            jsonResult = {
+                result:{
+                    statusCode: 400,
+                    str: "Keywords not found!"
+                },
+                data:{
+                    keywordCategory : keywordCategory,
+                    keywords: keywords.toSource()
+                }
+            };
+            pRequestAsJson.response.statuscode = 400; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+    }
+    else
+    {
+        jsonResult = {
+            result:{
+                statusCode: 405,
+                str: "The parameters were not sent! Invalid Input"
+            },
+            data:{}
+        };
+        pRequestAsJson.response.statuscode = 405;
+        pRequestAsJson.response.body = JSON.stringify(jsonResult);
+    }
+    //Umwandeln des JSON Objekts in einen String
+    return JSON.stringify(pRequestAsJson);
+}
\ No newline at end of file
diff --git a/process/getTicketDetails_get/getTicketDetails_get.aod b/process/getTicketDetails_get/getTicketDetails_get.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2a7bb37222e4b78ad28bb3de0843ec622643fb54
--- /dev/null
+++ b/process/getTicketDetails_get/getTicketDetails_get.aod
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>getTicketDetails_get</name>
+  <title>getTicketDetails</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/getTicketDetails_get/process.js</process>
+  <publishAsWebservice v="true" />
+  <style>REST</style>
+  <restAcceptedMimeType>application/json</restAcceptedMimeType>
+  <restDeliveredMimeType>application/json</restDeliveredMimeType>
+  <loginTypeId>
+    <element>internal.none</element>
+  </loginTypeId>
+  <jditoWebserviceUser>Admin</jditoWebserviceUser>
+  <alias>Data_alias</alias>
+</process>
diff --git a/process/getTicketDetails_get/process.js b/process/getTicketDetails_get/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..788d2aaf505d91bbe225a5d0a0201711b9eb8992
--- /dev/null
+++ b/process/getTicketDetails_get/process.js
@@ -0,0 +1,61 @@
+import("WebserviceSupportTicket_lib");
+import("system.util");
+import("system.translate");
+
+function restget(pRequestAsJson)
+{
+    //Umwandeln des Strings in ein JSON Objekt
+    pRequestAsJson = JSON.parse(pRequestAsJson);
+    var res = pRequestAsJson.query;
+    var jsonResult = {};
+    
+    if (res.ticketId)
+    {
+        var ticketId = res.ticketId;
+        var ticketDetails = getTicketDetails(ticketId);
+        
+        if(JSON.stringify(ticketDetails)!= "[]")
+        {
+            jsonResult = {
+                result:{
+                    statusCode: 200,
+                    str: "The ticket details were successfully fetched!"
+                },
+                data:{
+                    ticketDetails: ticketDetails.toSource()
+                }
+            };
+            pRequestAsJson.response.statuscode = 200; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+        else
+        {
+            jsonResult = {
+                result:{
+                    statusCode: 400,
+                    str: "Ticket not found!"
+                },
+                data:{
+                    ticketDetails: ticketDetails.toSource(),
+                    id: ticketId
+                }
+            };
+            pRequestAsJson.response.statuscode = 400; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+    }
+    else
+    {
+        jsonResult = {
+            result:{
+                statusCode: 405,
+                str: "You have not sent the parameters! Invalid input"
+            },
+            data:{}
+        };
+        pRequestAsJson.response.statuscode = 405; 
+        pRequestAsJson.response.body = JSON.stringify(jsonResult);
+    }
+    //Umwandeln des JSON Objekts in einen String
+    return JSON.stringify(pRequestAsJson);
+}
\ No newline at end of file
diff --git a/process/insertTicket_post/insertTicket_post.aod b/process/insertTicket_post/insertTicket_post.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ca045b09a6cf6bdac8b866eb22ea10551b6a445a
--- /dev/null
+++ b/process/insertTicket_post/insertTicket_post.aod
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>insertTicket_post</name>
+  <title>insertTicket</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/insertTicket_post/process.js</process>
+  <publishAsWebservice v="true" />
+  <style>REST</style>
+  <restAcceptedMimeType>application/json</restAcceptedMimeType>
+  <restDeliveredMimeType>application/json</restDeliveredMimeType>
+  <loginTypeId>
+    <element>internal.none</element>
+  </loginTypeId>
+  <jditoWebserviceUser>Admin</jditoWebserviceUser>
+  <alias>Data_alias</alias>
+</process>
diff --git a/process/insertTicket_post/process.js b/process/insertTicket_post/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1807cf7940aa33e6333650eccd87253b3ee3d2a
--- /dev/null
+++ b/process/insertTicket_post/process.js
@@ -0,0 +1,67 @@
+import("system.util");
+import("WebserviceSupportTicket_lib");
+import("system.logging");
+import("system.translate");
+
+function restpost(pRequestAsJson)
+{
+    //Umwandeln des Strings in ein JSON Objekt
+    pRequestAsJson = JSON.parse(pRequestAsJson);
+    var jsonResult = {};
+    var res = pRequestAsJson.body;
+    res = JSON.parse(util.decodeBase64String(res));
+    
+    try
+    {
+        var arr = insertSupportTicket(res);
+                
+        if(arr[0])
+        {
+            jsonResult = {
+                result:{
+                    statusCode:201,
+                    str:"The ticket was created successfully!"
+                },
+                data:{
+                    ticketID:arr[0], 
+                    ticketNr: arr[1]
+                }
+            };
+                
+            pRequestAsJson.response.statuscode = 201; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+        else
+        {
+            jsonResult = {
+                result:{
+                    statusCode:405,
+                    str:"You have not sent a correct body! "
+                + "Invalid Input\n "
+                + "The properties \"description\", \"category\", \"login\" are required! "
+                },
+                data:{}
+            }
+            pRequestAsJson.response.statuscode = 405; 
+            pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        }
+    }
+    catch(ex)
+    {
+        jsonResult = {
+            result:{
+                statusCode:500,
+                str:"Internal Server Error: Ticket not created!"
+            },
+            data:{
+                ex: ex
+            }
+        }
+        pRequestAsJson.response.statuscode = 500;
+        pRequestAsJson.response.body = JSON.stringify(jsonResult);
+        logging.log(ex);
+    }
+        
+    //Umwandeln des JSON Objekts in einen String
+    return JSON.stringify(pRequestAsJson);
+}
\ No newline at end of file
diff --git a/process/mailbridge_service/documentation.adoc b/process/mailbridge_service/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6528b9bcab635ff94e0c4e7369b0b7b39463d2b5
--- /dev/null
+++ b/process/mailbridge_service/documentation.adoc
@@ -0,0 +1,3 @@
+= mailbridge_service
+
+Handling of the service mailbridge process.
\ No newline at end of file
diff --git a/process/mailbridge_service/mailbridge_service.aod b/process/mailbridge_service/mailbridge_service.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ead7fbaf8db41b68a56cb98ac80bc0940a67a7c3
--- /dev/null
+++ b/process/mailbridge_service/mailbridge_service.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>mailbridge_service</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/mailbridge_service/documentation.adoc</documentation>
+  <process>%aditoprj%/process/mailbridge_service/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
diff --git a/process/mailbridge_service/process.js b/process/mailbridge_service/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..28c37df7476c35dfedcc1af130e0cb0f0bd8e56a
--- /dev/null
+++ b/process/mailbridge_service/process.js
@@ -0,0 +1,1026 @@
+import("Communication_lib");
+import("system.workflow");
+import("system.translate");
+import("Attribute_lib");
+import("TicketTemplate_lib");
+import("KeywordRegistry_basic");
+import("system.project");
+import("Sql_lib");
+import("system.tools");
+import("system.tools");
+import("system.datetime");
+import("system.text");
+import("IncomingEmailExecutor_lib");
+import("system.vars");
+import("system.mail");
+import("system.logging");
+import("system.neon");
+import("system.util");
+import("Keyword_lib");
+import("system.eMath");
+import("ActivityTask_lib");
+import("Util_lib");
+import("Email_lib");
+import("ServiceEmail_lib");
+import("MimeType_lib");
+import("system.db");
+//////////////////////////////////////////////////////////
+function ticketMailbridgeUtils() {}
+
+/**
+ * Insert Log
+ */
+ticketMailbridgeUtils.insertLog = function(pTicketID, pFilterResult)
+{
+    var desc = pFilterResult;
+    var valueFields = 
+    {
+        "AB_LOGHISTORYID" : util.getNewUUID(), 
+        "LOGTYPE" : "I", 
+        "TABLENAME" : "TICKET", 
+        "TABLENAMEID" : pTicketID, 
+        "DESCRIPTION" : desc, 
+        "DATE_NEW" : vars.get("$sys.date"), 
+        "USER_NEW" : "adito.server"
+    }
+    new SqlBuilder().insertFields(valueFields, "AB_LOGHISTORY", "AB_LOGHISTORYID");
+ 
+}
+
+
+/**
+ * Deliver Information of a specific Inbox 
+ */
+ticketMailbridgeUtils.getInboxInformation = function(pRecipients, pSender, possibleBCC, possibleBCCUnfiltered)
+{
+    
+    
+    var inboxObj                    = {};   
+    inboxObj["inboxID"] = new SqlBuilder()
+                  .select(["INBOX.INBOXID","INBOX.REOPEN_DELAY", "INBOX.EMAIL_ADDRESS"])
+                  .from("INBOX")
+                  .leftJoin("MAILSIGNATURE", "INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
+                  .whereIfSet("EMAIL_ADDRESS", pRecipients, SqlBuilder.IN())
+                  .arrayRow();    
+ 
+    // found an INbox?
+    if(inboxObj.inboxID.length > 0)
+    {  
+        inboxObj["reopenDelay"] = newSelect("INBOXID, REOPEN_DELAY ")
+                                    .from("INBOX")
+                                    .leftJoin("MAILSIGNATURE", "INBOX_ID = INBOXID")
+                                    .whereIfSet("INBOX.EMAIL_ADDRESS", pRecipients, SqlBuilder.IN())
+                                    .or("MAILSIGNATURE.MAIL_ADDRESS", pRecipients, SqlBuilder.IN())
+                                    .arrayRow()[1];
+                
+        inboxObj["mailSignatureID"] = newSelect("MAILSIGNATUREID, MAIL_ADDRESS, t1.TEMPLATECONTENT, t2.TEMPLATECONTENT, WORKFLOW, SEND_MAIL, ANSWER_MAIL_ADDRESS")
+                                    .from("MAILSIGNATURE")
+                                    .leftJoin("documenttemplate", "t1.DOCUMENTTEMPLATEID = DOCUMENTTEMPLATE_ID", "t1")
+                                    .leftJoin("documenttemplate", "t2.DOCUMENTTEMPLATEID = SIGNATURE_DOCUMENTTEMPLATE_ID", "t2")
+                                    .whereIfSet(newWhereIfSet("MAILSIGNATURE.INBOX_ID", inboxObj["inboxID"][0])
+                                            .andIfSet("MAILSIGNATURE.MAIL_ADDRESS", pRecipients, SqlBuilder.IN()))
+                                    .or(newWhereIfSet("MAILSIGNATURE.DEFAULTSIGNATURE", 1))
+                                    .orderBy("MAILSIGNATURE.DEFAULTSIGNATURE asc")
+                                    .arrayRow();
+    }
+    else // try to find some from possible BCC without INBOX-Mails
+    {
+        inboxObj["inboxID"] = new SqlBuilder()
+                  .select(["INBOX.INBOXID","INBOX.REOPEN_DELAY", "INBOX.EMAIL_ADDRESS"])
+                  .from("INBOX")
+                  .leftJoin("MAILSIGNATURE", "INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
+                  .whereIfSet("EMAIL_ADDRESS", possibleBCC, SqlBuilder.IN())
+                  .arrayRow();
+                  
+        if(inboxObj.inboxID.length > 0)
+        {
+            inboxObj["reopenDelay"] = newSelect("INBOXID, REOPEN_DELAY ")
+                                    .from("INBOX")
+                                    .leftJoin("MAILSIGNATURE", "INBOX_ID = INBOXID")
+                                    .whereIfSet("INBOX.EMAIL_ADDRESS", possibleBCC, SqlBuilder.IN())
+                                    .or("MAILSIGNATURE.MAIL_ADDRESS", possibleBCC, SqlBuilder.IN())
+                                    .arrayRow()[1];
+                
+        inboxObj["mailSignatureID"] = newSelect("MAILSIGNATUREID, MAIL_ADDRESS, t1.TEMPLATECONTENT, t2.TEMPLATECONTENT, WORKFLOW, SEND_MAIL, ANSWER_MAIL_ADDRESS")
+                                    .from("MAILSIGNATURE")
+                                    .leftJoin("documenttemplate", "t1.DOCUMENTTEMPLATEID = DOCUMENTTEMPLATE_ID", "t1")
+                                    .leftJoin("documenttemplate", "t2.DOCUMENTTEMPLATEID = SIGNATURE_DOCUMENTTEMPLATE_ID", "t2")
+                                    .whereIfSet(newWhereIfSet("MAILSIGNATURE.INBOX_ID", inboxObj["inboxID"][0])
+                                            .andIfSet("MAILSIGNATURE.MAIL_ADDRESS", possibleBCC, SqlBuilder.IN()))
+                                    .or(newWhereIfSet("MAILSIGNATURE.DEFAULTSIGNATURE", 1))
+                                    .orderBy("MAILSIGNATURE.DEFAULTSIGNATURE asc")
+                                    .arrayRow();
+        }
+        else // use BACKUP INBOX-Mails
+        {
+            
+            inboxObj["inboxID"] = new SqlBuilder()
+                  .select(["INBOX.INBOXID","INBOX.REOPEN_DELAY", "INBOX.EMAIL_ADDRESS"])
+                  .from("INBOX")
+                  .leftJoin("MAILSIGNATURE", "INBOX.INBOXID = MAILSIGNATURE.INBOX_ID")
+                  .whereIfSet("EMAIL_ADDRESS", possibleBCCUnfiltered, SqlBuilder.IN())
+                  .arrayRow();
+                  
+            if(inboxObj.inboxID.length > 0)
+            {
+                inboxObj["reopenDelay"] = newSelect("INBOXID, REOPEN_DELAY ")
+                                        .from("INBOX")
+                                        .leftJoin("MAILSIGNATURE", "INBOX_ID = INBOXID")
+                                        .whereIfSet("INBOX.EMAIL_ADDRESS", possibleBCCUnfiltered, SqlBuilder.IN())
+                                        .or("MAILSIGNATURE.MAIL_ADDRESS", possibleBCCUnfiltered, SqlBuilder.IN())
+                                        .arrayRow()[1];
+
+                inboxObj["mailSignatureID"] = newSelect("MAILSIGNATUREID, MAIL_ADDRESS, t1.TEMPLATECONTENT, t2.TEMPLATECONTENT, WORKFLOW, SEND_MAIL, ANSWER_MAIL_ADDRESS")
+                                        .from("MAILSIGNATURE")
+                                        .leftJoin("documenttemplate", "t1.DOCUMENTTEMPLATEID = DOCUMENTTEMPLATE_ID", "t1")
+                                        .leftJoin("documenttemplate", "t2.DOCUMENTTEMPLATEID = signature", "t2")
+                                        .whereIfSet(newWhereIfSet("MAILSIGNATURE.INBOX_ID", inboxObj["inboxID"][0])
+                                                .andIfSet("MAILSIGNATURE.MAIL_ADDRESS", possibleBCCUnfiltered, SqlBuilder.IN()))
+                                        .or(newWhereIfSet("MAILSIGNATURE.DEFAULTSIGNATURE", 1))
+                                        .orderBy("MAILSIGNATURE.DEFAULTSIGNATURE asc")
+                                        .arrayRow();
+            }
+        }
+    }
+    
+    inboxObj["filterArray"] = newSelect("RTRIM(COMPONENT), searchterm, TICKETTEMPLATE_ID, "
+                                        + "( case when ifnull(INBOXFILTERGROUP.PRIORITY,999) = 0 then 999 "
+                                        + "else ifnull(INBOXFILTERGROUP.PRIORITY,999)end )")
+                                    .from("INBOXFILTER")
+                                    .join("INBOXFILTERGROUP", "INBOXFILTERGROUPID = INBOXFILTER.INBOXFILTERGROUP_ID")
+                                    .join("INBOXFILTERGROUP_RELATION", "INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID = INBOXFILTERGROUPID")
+                                    .join("inbox", "inboxid = INBOX_ID")
+                                    .whereIfSet("inbox.inboxid", inboxObj["inboxID"][0])
+                                    .table();
+                                    
+    inboxObj["attributeFilterArray"] = newSelect("ATTRIBUTE_FILTERID, RTRIM(COMPONENT), SEARCHTERM, COMPARISON_METHOD, THRESHOLD")
+                                    .from("ATTRIBUTE_FILTER")
+                                    .join("INBOXFILTERGROUP", "INBOXFILTERGROUP.INBOXFILTERGROUPID = ATTRIBUTE_FILTER.INBOXFILTERGROUP_ID")
+                                    .join("INBOXFILTERGROUP_RELATION", "INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID = INBOXFILTERGROUP.INBOXFILTERGROUPID")
+                                    .join("INBOX", "INBOX.INBOXID = INBOXFILTERGROUP_RELATION.INBOX_ID")
+                                    .whereIfSet("INBOX.INBOXID", inboxObj["inboxID"][0])
+                                    .table();
+                                    
+   
+    // Create Blackliststuff
+    inboxObj["blacklist"]           = {};
+    var blackListArr = newSelect("NAME, BOOL_VALUE, TITLE")
+                                    .from("AB_KEYWORD_ENTRY")
+                                    .join("AB_KEYWORD_ATTRIBUTERELATION", "AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID")
+                                    .join("AB_KEYWORD_ATTRIBUTE", "AB_KEYWORD_ATTRIBUTE.CONTAINER = 'BLACKLIST' \n\
+                                            and  AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID")
+                                    .whereIfSet("AB_KEYWORD_ATTRIBUTE.container", "BLACKLIST")
+                                    .andIfSet("AB_KEYWORD_ENTRY.title", pSender, SqlBuilder.LIKE())
+                                    .andIfSet("AB_KEYWORD_ENTRY.ISACTIVE", 1)
+                                    .table();
+                                    
+    // Create BlacklistObject for easy accessing
+    for(let i = 0; i < blackListArr.length; i++)
+    {
+        if ( inboxObj.blacklist[blackListArr[i][0]] == undefined)  
+        {
+            inboxObj.blacklist[blackListArr[i][0]] = [blackListArr[i][1], blackListArr[i][2]]
+        }
+    }
+    return inboxObj;
+}
+
+
+/**
+ * Deliver Information of person
+ */
+ticketMailbridgeUtils.findCustomer = function(pSender)
+{
+   return newSelect("distinct CONTACTID")
+                                    .from("CONTACT")
+                                    .join("PERSON", "PERSONID = PERSON_ID")
+                                    .leftJoin("COMMUNICATION", "OBJECT_ROWID = CONTACTID")
+                                    .whereIfSet("COMMUNICATION.ADDR", pSender)
+                                    .and ("OBJECT_TYPE = 'Contact'")
+                                    .arrayColumn();
+   
+}
+ 
+/**
+ * Create Activity
+ */
+ticketMailbridgeUtils.insertActivity = function(pSubject, pTicketID)
+{
+    ActivityUtils.createNewActivity(pTicketID, undefined, "SupportTicket", pTicketID, pSubject, null, "i")
+}
+
+
+/**
+ * Saving Attachements
+ */
+ticketMailbridgeUtils.saveAttachement  = function(pUid, pMailObject, pType)
+{
+    // mailAttachmentToDoc 
+    var infos = mail.getAttachmentInfos(pMailObject)
+    for (let i = 0; i < infos.length; i++)
+    {
+        if ( mail.getAttachmentHeader(pMailObject, i, "x-adito-nodata") != "true" )
+        {
+            var fileInfos = text.decodeMS(infos[i]);
+            var filename = fileInfos[0];
+
+            if (filename == "noname")
+            {
+                switch(fileInfos[2])
+                {
+                    case MimeTypes.BMP():
+                        filename += ".bmp";
+                        break;
+                    case MimeTypes.JPG():
+                    case MimeTypes.PJPEG():
+                        filename += ".jpg";
+                        break;
+                    case MimeTypes.PNG():
+                        filename += ".png";
+                        break;
+                    case MimeTypes.GIF():
+                        filename += ".gif";
+                        break;
+                    default:
+                        continue;
+                }
+            }
+            var assignmentTable = pType;
+            var assignmentName = "DOCUMENT";
+            var assignmentRowId = pUid;
+            var bindata =  mail.getAttachment(pMailObject, i);
+            if(filename.length > 127)
+            {
+                filename = filename.split(".")[0].substr(0,120)+"."+filename.split(".")[1]
+            }
+            var description = "";
+            var alias = "_____SYSTEMALIAS";
+            var id = util.getNewUUID();
+
+            if(bindata != '' && filename != '')
+            {
+                var keyword = 'MAINDOCUMENT';
+                 
+                var uid = db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "", 
+                    bindata, filename, description, keyword, alias, id);
+            }
+        }
+    }
+}
+
+
+/**
+ * Searching for existing Ticket 
+ */
+ticketMailbridgeUtils.findTicket = function(pSubject, pInboxObject, pMailObj)
+{
+    var ticketID = "";
+    
+    
+    if(pSubject != undefined && pSubject != "")
+    {
+        if(pSubject.match(this.codeRegex))
+        {
+            var cleanTicketCode = pSubject.match(this.codeRegex).toString().replace("\]","").replace("\[","");
+            
+            var ticketData = newSelect("TICKETID, STATUS, ifnull(DATE_EDIT_STATUS, START_DATE), TASKID, TICKET.EDITOR_CONTACT_ID, SENDER_EMAIL")
+            .from("TICKET")
+            .join("TASK", "TASK_ID = TASKID")
+            .whereIfSet("TICKET.CODE", cleanTicketCode)
+            .table();
+            
+            if(ticketData.length > 0)
+            {
+                if(ticketData.length > 1) { //if ticketcode is not unique -> check for sender email
+                    var singleTicket = ticketData.findIndex(function(mail) {
+                        return mail[5] == pMailObj.send;
+                    });
+                    
+                    if(singleTicket > -1) {
+                        ticketData = ticketData[singleTicket];
+                    } else {
+                        ticketData = ticketData[0];
+                    }
+                } else 
+                    ticketData = ticketData[0];
+                
+                // set TicketID    
+                ticketID = ticketData[0];
+           
+                // Check for Closed Status
+                if(ticketData[1].trim() == $KeywordRegistry.taskStatus$done()) //  --> Closed
+                {
+                    var reopenDelay = pInboxObject.reopenDelay;
+                    var finalDate = eMath.addInt(+ticketData[2], datetime.ONE_DAY * reopenDelay );
+             
+                    if(finalDate < vars.get("$sys.date")) // -- > new Ticket -> Problem is old Customernumber
+                    {
+                        // Call function for using filer
+                        ticketMailbridgeUtils.useFiler(pInboxObject, pMailObj, true);
+                    }
+                    else // --> Reopen
+                    {
+                        // Update Ticket/Task
+                        var TaskfieldValues = 
+                        {
+                            "STATUS" : $KeywordRegistry.taskStatus$reopen()
+                        }
+                        newWhere("TASK.TASKID", ticketData[3]).updateFields(TaskfieldValues);
+                        
+                        //************************************************************
+                        //************************************************************
+                        
+                       
+                        // Update Ticket
+                        var TicketfieldValues = 
+                        {
+                            "DATE_EDIT_STATUS" : vars.get("sys.date"),
+                            "DATE_END"         : ""
+                        }                    
+                        newWhere("TICKET.TASK_ID", ticketData[3]).updateFields(TicketfieldValues);
+
+                        // insert for ACTIVITY
+                        var activityID = util.getNewUUID();
+                        var DataPreset =
+                        {
+                            "activityId"         : activityID,
+                            "directionKeywordId" : $KeywordRegistry.activityDirection$incoming(),
+                            "subject"            : "Ticket wiedereröffnet",
+                            "content"            : pMailObj[mail.MAIL_SUBJECT]+"<br>"+ pMailObj[mail.MAIL_TEXT],
+                            "categoryKeywordId"  : $KeywordRegistry.activityCategory$mail(), 
+                            "userNew"            : "System"
+                        }
+                        var ActivityLink =
+                        {
+                            "SupportTicket"  : ticketID
+                        }
+
+                        ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+                        
+                        // add Attachment from Mail
+                        ticketMailbridgeUtils.saveAttachement(activityID, pMailObj, "ACTIVITY")
+                       
+                    }
+                }
+                else // --> still opened
+                {
+                    // only change Status if, curr. status != ENTRY and status != REOPEN
+                    if(ticketData[1].trim() != $KeywordRegistry.taskStatus$entry() && ticketData[1].trim() != $KeywordRegistry.taskStatus$reopen())
+                    {
+                        // Update Task
+                        var TaskfieldValues = 
+                        {
+                            "STATUS" : $KeywordRegistry.taskStatus$reply()
+                        }
+                        newWhere("TASK.TASKID", ticketData[3]).updateFields(TaskfieldValues);                    
+                    }
+                
+                    // insert for ACTIVITY
+                    // insert for ACTIVITY
+                    var activityID = util.getNewUUID();
+                    var DataPreset =
+                    {
+                        "activityId"         : activityID,
+                        "directionKeywordId" : $KeywordRegistry.activityDirection$incoming(),
+                        "subject"            : "Antwort Kunde",
+                        "content"            : pMailObj[mail.MAIL_SUBJECT]+"<br>"+ pMailObj[mail.MAIL_TEXT],
+                        "categoryKeywordId"  : $KeywordRegistry.activityCategory$mail(), 
+                        "userNew"            : "System"
+                    }
+                    var ActivityLink =
+                    {
+                        "SupportTicket"  : ticketID
+                    }
+                    ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+                    
+                    // add Attachment from Mail
+                    ticketMailbridgeUtils.saveAttachement(activityID, pMailObj, "ACTIVITY")
+                    
+                   
+                }
+            }
+        }
+        else // search for double entries -> Check for Status Entry and in Progress 
+        {
+            // BLACKLIST-Function   
+            if(pInboxObject.blacklist["Shortcut"])
+            {
+                if(pInboxObject.blacklist["Shortcut"][0] == 0)
+                {
+                    return ticketID;
+                }
+                ticketID = new SqlBuilder()
+                               .select("TICKET.TICKETID")
+                               .from("TICKET")
+                               .join("TASK","TASK.TASKID = TICKET.TASK_ID")
+                               .where("TICKET.SENDER_EMAIL",pInboxObject.blacklist["Shortcut"][1])
+                               .and("TASK.STATUS",[$KeywordRegistry.taskStatus$entry(),$KeywordRegistry.taskStatus$inProgress()])
+                               .and("TICKET.INBOX_ID", pInboxObject.inboxID[0])
+                               .cell();
+            }
+            else
+            {
+                ticketID = new SqlBuilder()
+                               .select("TICKET.TICKETID")
+                               .from("TICKET")
+                               .join("TASK","TASK.TASKID = TICKET.TASK_ID")
+                               .where("TICKET.SENDER_EMAIL",pMailObj.send)
+                               .and("TASK.STATUS",[$KeywordRegistry.taskStatus$entry(),$KeywordRegistry.taskStatus$inProgress()])
+                               .and("TICKET.INBOX_ID", pInboxObject.inboxID[0])
+                               .cell();
+            }
+             
+            if(ticketID != "")
+            {
+                // insert for ACTIVITY
+                var activityID = util.getNewUUID();
+                var DataPreset =
+                {
+                    "activityId"         : activityID,
+                    "directionKeywordId" : $KeywordRegistry.activityDirection$incoming(),
+                    "subject"            : "Antwort Kunde",
+                    "content"            : pMailObj[mail.MAIL_SUBJECT]+"<br>"+ pMailObj[mail.MAIL_TEXT],
+                    "categoryKeywordId"  : $KeywordRegistry.activityCategory$mail(), 
+                    "userNew"            : "System"
+                }
+                var ActivityLink =
+                {
+                    "SupportTicket"  : ticketID
+                }
+                ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+                
+                ticketMailbridgeUtils.saveAttachement(activityID, pMailObj, "ACTIVITY")
+            }   
+        }
+    } 
+    return ticketID;
+    
+}
+    
+            
+/**
+ * Create a Ticket 
+ */
+ticketMailbridgeUtils.createTicket = function(pMailObject, pFilterResult, pInboxObj, pTicketfromOldOne)
+{
+    // Maildata
+    var ticketSub   = pMailObject[mail.MAIL_SUBJECT];
+    
+    if(pTicketfromOldOne)
+    {
+        ticketSub = ticketSub.replace(this.codeRegex, "");
+    }
+    
+    var ticketDesc  = pMailObject[mail.MAIL_TEXT];
+    var persFrom    = pMailObject.send;
+    var persTo      = pMailObject[mail.MAIL_RECIPIENT];
+    var persCC      = pMailObject[mail.RECIPIENT_CC];
+    
+    var inboxID     = pInboxObj.inboxID[0];
+    var inboxUser   = pInboxObj.inboxID[2];
+    var mailSigID   = pInboxObj.mailSignatureID[0];
+    var mailRec     = pInboxObj.mailSignatureID[1];
+    var customer    = this.findCustomer(persFrom, pInboxObj.companyGroup);
+    var ticketCode  = "";
+    var ticketID    = util.getNewUUID();
+    var taskID      = util.getNewUUID();
+    var ticketTemplateId = [];
+    var answerMail  = pInboxObj.mailSignatureID[2]; 
+    var signature   = pInboxObj.mailSignatureID[3];
+    var answerMailActive = pInboxObj.mailSignatureID[5];
+    var Editor      = "";
+    
+    var cols        = [];
+    var vals        = [];
+    
+    // Replace all CRLF with <BR>
+    ticketDesc = ticketDesc.replace(/(?:\r\n|\r|\n)/g, '<br>');
+   
+    // Customer/DV-Logic
+    if(customer != "" && customer != undefined && customer.length > 0)
+    {
+            customer = customer[0];
+    }   
+    
+    //searches for the template to be used based on the prioritization of the inbox filter group
+    if(pFilterResult.scoreData)
+    {
+        for(let i = 0; i < pFilterResult.scoreData.length; i++)
+        {
+            if(ticketTemplateId.length > 0)
+            {
+                if(ticketTemplateId[1] > pFilterResult.scoreData[i][0] )  
+                {
+                    ticketTemplateId[0] =  pFilterResult.scoreData[i][1]; // tickettemplateid
+                    ticketTemplateId[1] =  pFilterResult.scoreData[i][0]; // prio
+                }
+            }
+            else
+            {
+                ticketTemplateId[0] = pFilterResult.scoreData[i][1];
+                ticketTemplateId[1] = pFilterResult.scoreData[i][0];
+            }
+        }
+    }
+    
+    //if no filter applies, the default template of the mail signature is used
+    if(ticketTemplateId.length == 0)
+    {      
+        ticketTemplateId[0] = newSelect("DEFAULT_TICKETTEMPLATE_ID")
+                                .from("MAILSIGNATURE")
+                                .where("MAILSIGNATURE.MAILSIGNATUREID", mailSigID);
+    }
+    // Check for attachments
+    for (let i = 0; i < mail.getAttachmentInfos(pMailObject).length; i++)
+    {
+        if(text.decodeMS(mail.getAttachmentInfos(pMailObject)[i])[2] == "message/rfc822")
+        {
+            var emailAttachment = util.decodeBase64String(mail.getAttachment(pMailObject, i), "UTF-8");
+            var mailData = mail.parseRFC(emailAttachment, "UTF-8"); 
+            ticketDesc += mailData[mail.MAIL_TEXT].replace(/(?:\r\n|\r|\n)/g, '<br>');
+        }
+    }
+    
+    //generate new ticket code
+    ticketCode = NumberSequencingUtils.getNextUniqueNumber("CODE", "TICKET");
+    
+    //insert service ticket from template
+    var insertColsTicket = ["TICKETID", "EDITOR_CONTACT_ID", "EMAIL_SUBJECT", "TASK_ID", "TICKETTYPE", "MAILSIGNATURE_ID", 
+                            "SENDER_EMAIL", "MEDIUM", "CC_RECIPIENTS",
+                            "CODE", "EMAIL_DESCRIPTION"];
+    var insertValsTicket = [ticketID,  Editor, ticketSub, taskID, "SUPPORTTICKET", mailSigID,  
+                            persFrom,  "MAIL", persCC,
+                            ticketCode, ticketDesc]; 
+    var insertColsTask = ["TASKID",  "START_DATE", 
+                            "KIND", "PROGRESS"];
+    var insertValsTask = [taskID, vars.get("$sys.date"),
+                            "TICKET", $KeywordRegistry.taskProgress$0()];
+                        
+    if(customer != "")
+    {   
+        insertColsTask.push("REQUESTOR_CONTACT_ID");
+        insertValsTask.push(customer);
+    }
+    
+    TicketTemplateUtils.createTicketFromTemplate(ticketTemplateId[0], insertColsTicket, insertValsTicket, 
+                                                            insertColsTask, insertValsTask);
+             
+    ticketMailbridgeUtils.useAttributeFilter(pInboxObj, ticketID, pMailObject);
+    
+    
+    // Insert KATEGORY LOG  
+    ticketMailbridgeUtils.insertLog(ticketID, translate.text("Category determination") + ":\n" + pFilterResult.CategoryLogInfo.toString());
+    
+    // mailAttachmentToDoc 
+    var infos = mail.getAttachmentInfos(pMailObject)
+    
+    for (let i = 0; i < infos.length; i++)
+    {
+      
+        if ( mail.getAttachmentHeader(pMailObject, i, "x-adito-nodata") != "true" )
+        {
+            var fileInfos = text.decodeMS(infos[i]);
+            var filename = fileInfos[0];
+
+            if (filename == "noname")
+            {
+                switch(fileInfos[2])
+                {
+                    case MimeTypes.BMP():
+                        filename += ".bmp";
+                        break;
+                    case MimeTypes.JPEG():
+                    case MimeTypes.PJPEG():
+                        filename += ".jpg";
+                        break;
+                    case MimeTypes.PNG():
+                        filename += ".png";
+                        break;
+                    case MimeTypes.GIF():
+                        filename += ".gif";
+                        break;
+                    case MimeTypes.EML():
+                        filename +=".eml";
+                    default:
+                        continue;
+                }
+            }
+            var assignmentTable = "TICKET";
+            var assignmentName = "DOCUMENT";
+            var assignmentRowId = ticketID;
+            var bindata =  mail.getAttachment(pMailObject, i);
+            var filename = filename;
+            
+           
+            
+            if(filename.length > 127)
+            {
+                filename = filename.split(".")[0].substr(0,120)+"."+filename.split(".")[1]
+            }
+            var description = "";
+            var alias = "_____SYSTEMALIAS";
+            var id = util.getNewUUID();
+
+            if(bindata != '' && filename != ''){
+                var keyword = 'MAINDOCUMENT';
+                var uid = db.insertBinary(assignmentTable, assignmentName, assignmentRowId, "", 
+                    bindata, filename, description, keyword, alias, id);
+            }
+        }
+    }
+    
+    // BLACKLIST-Function   
+    if(pInboxObj.blacklist["Autoanswer"])
+    {
+        if(pInboxObj.blacklist["Autoanswer"][0] == 0)
+        {
+            return;
+        }
+    }
+
+    // sending Automatic Answeremail 
+    if(answerMail != "" && answerMail != undefined && answerMailActive !="" && answerMailActive == true)
+    {
+        var eml             = new Email();
+        eml.sender          = mailRec || inboxUser;
+        eml.subject         = ticketSub +" ["+ ticketCode +"]";
+        
+        eml.body            = answerMail.toString() + "\n"+ getSignatureWithoutPlaceholder(signature) ;
+        eml.toRecipients    = [persFrom];
+        
+        // overwrite eml.body with individual answer, if individual answer template is set for the selected ticket template
+        var indiAns         = TicketTemplateUtils.checkIndividualAnswer(ticketTemplateId[0]);
+        if(indiAns !="" && indiAns != undefined)
+        {
+            eml.body = indiAns.toString() + "\n"+ getSignatureWithoutPlaceholder(signature);
+        }
+        // overwrite eml.sender with answer mail address, if answer mail address is set for the selected inbox
+       
+        var commAddr = pInboxObj.mailSignatureID[6];
+        if (commAddr)
+        eml.sender = commAddr || inboxUser;
+        
+        var senderUser      = tools.getUserByAttribute(tools.EMAIL, [inboxUser], tools.PROFILE_FULL);
+        
+       
+        // If it works then...
+        if(  eml.send(senderUser[tools.TITLE]))
+        {
+            // insert for ACTIVITY  
+            var activityID = util.getNewUUID();
+                var DataPreset =
+                {
+                    "activityId"         : activityID,
+                    "directionKeywordId" : $KeywordRegistry.activityDirection$incoming(),
+                    "subject"            : "Automatische Sendung an Kunde",
+                    "content"            : "<p>"+ eml.subject +"</p><br>"+ eml.body.toString(),
+                    "categoryKeywordId"  : $KeywordRegistry.activityCategory$mail(), 
+                    "userNew"            : "System"
+                }
+                var ActivityLink =
+                {
+                    "SupportTicket"  : ticketID
+                }
+                ActivityUtils.insertNewActivity(DataPreset, ActivityLink);
+        }
+        else
+        {
+            logging.log(ticketCode + " was not sent!") 
+        }
+        
+    }
+    
+    //start workflow
+    var workflowKey = pInboxObj["mailSignatureID"][4];
+    if(workflowKey){
+        var processVariables = {
+            "targetId": ticketID,
+            "targetContext": "SupportTicket"
+        };
+        workflow.startProcessByKey(workflowKey, processVariables);
+    }
+    
+}
+ 
+  
+
+/**
+ * Apply Filter on each Part
+ */
+ticketMailbridgeUtils.useFiler = function(pInboxObj, pMailObject, pTicketfromOldOne)
+{
+   
+    var scoreObject = {};
+    var categoriesFormatted = "";
+    var filterArray = pInboxObj.filterArray;
+    var componentType;
+    
+    for(let i = 0; i < filterArray.length; i++)
+    {
+        var component   = filterArray[i][0];   // Component to search("body or subject")
+        var searchTerm  = filterArray[i][1];  
+        var tickettemplateId = filterArray[i][2];
+        var prioCriteria = filterArray[i][3];
+        
+        // Define Pattern.. COMPONENT, TARGET, VALUE, TITLE
+        var patternArr = new Object(); 
+       
+        patternArr[searchTerm] = "*"+searchTerm+"*";
+         
+        switch(component) // Where to search?
+        {
+            case "BODY":
+                componentType = pMailObject[mail.MAIL_TEXT] || " ";
+                break;
+            case "SUBJECT":
+                componentType = pMailObject[mail.MAIL_SUBJECT] || " ";
+                break;
+            case "RECIPIENT":
+                componentType = pMailObject[mail.MAIL_RECIPIENT];
+                break;
+            case "SENDER":
+                componentType = pMailObject[mail.MAIL_SENDER];
+                break;
+            default:
+                componentType = pMailObject[mail.MAIL_TEXT];
+                break;
+        }
+       
+        var score = text.analyzeText(componentType, patternArr, false);
+              
+        if(score[searchTerm] > 0)
+        {
+            scoreObject["scoreData"] = scoreObject["scoreData"] || [];
+            scoreObject["scoreData"].push([prioCriteria, tickettemplateId]); // Adding Score to Object      
+            categoriesFormatted += translate.text("Search term") + " '" +   searchTerm.toString() +"' " + translate.text("determined in") + " "+ KeywordUtils.getViewValue($KeywordRegistry.inboxFilterComponent(), component) + "\n";
+        }
+    }
+    
+    scoreObject["CategoryLogInfo"] = categoriesFormatted;
+    
+    this.createTicket(pMailObject ,scoreObject, pInboxObj, pTicketfromOldOne);
+    
+}
+
+ticketMailbridgeUtils.setTicketCodeRegex = function(pRegexString){
+    this.codeRegex = new RegExp(pRegexString, "g");
+}
+
+ticketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailObject)
+{
+    var attributeFilters = pInboxObj["attributeFilterArray"];
+    var fixAttributeFilters = [];
+    var probabiltityAttributeFilters = [];
+    var matchedAttributeFilterIds = [];
+    var attributesToInsert = [];
+    var attributeIds = [];
+    var inserts = [];
+    var IDX_COMP_METHOD = 3;
+    var IDX_MAX_COUNT = 0;
+    var IDX_EXISTING_ATTRS = 1;
+    var IDX_ATTRIBUTEID = 0;
+    var attributeCountObj = {};
+    var logMessageFix = "";
+    var logMessageProbability = "";
+    
+    // Divide fixed and probability attribute filer
+    attributeFilters.forEach(function(attributeFilter){
+        if(attributeFilter[IDX_COMP_METHOD] == $KeywordRegistry.attributeFilterComparisonMethod$fix())
+        {
+            fixAttributeFilters.push(attributeFilter);
+        }
+        else
+        {
+            probabiltityAttributeFilters.push(attributeFilter);
+        }
+    });
+    
+    // searches for the appropriate fix attribute filter ids
+    if(fixAttributeFilters.length > 0)
+    {
+       var resultCheckFixAttrFilters = ticketMailbridgeUtils.checkAttributeFilters(fixAttributeFilters, pMailObject, $KeywordRegistry.attributeFilterComparisonMethod$fix());
+        matchedAttributeFilterIds = resultCheckFixAttrFilters[0];
+       logMessageFix = resultCheckFixAttrFilters[1];
+    }
+    
+    // searches for the appropriate probability attribute filter ids
+    if(probabiltityAttributeFilters.length > 0)
+    {
+        var resultCheckProbabilityAttrFilters = ticketMailbridgeUtils.checkAttributeFilters(fixAttributeFilters, pMailObject, $KeywordRegistry.attributeFilterComparisonMethod$probability());
+        matchedAttributeFilterIds.concat(resultCheckProbabilityAttrFilters[0]);
+        logMessageProbability = resultCheckProbabilityAttrFilters[1];
+    }
+    
+    var logMessage = logMessageFix + "\n" + logMessageProbability
+    
+     if(matchedAttributeFilterIds.length > 0)
+    {
+        // Fetches the stored attributes of the matching attribute filter
+        attributesToInsert = newSelect(" distinct AB_ATTRIBUTE_ID, CHAR_VALUE, ID_VALUE, DATE_VALUE, NUMBER_VALUE, INT_VALUE")
+                    .from("AB_ATTRIBUTERELATION")
+                    .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", matchedAttributeFilterIds, SqlBuilder.IN())
+                    .and("AB_ATTRIBUTERELATION.OBJECT_TYPE", "AttributeFilter")
+                    .table();
+        
+        // creates the max count object so that the maximum number of the attribute can be checked
+        if(attributesToInsert.length > 0)
+        {
+            attributesToInsert.forEach(function(attribute){
+                attributeIds.push(attribute[IDX_ATTRIBUTEID]);
+                attributeCountObj[attribute[IDX_ATTRIBUTEID]] = [0, 0]; // [maxCount, alreadyExistingAttributes]
+            });
+            
+            var attributeCounts = newSelect("AB_ATTRIBUTE_ID, MAX_COUNT")
+                                .from("AB_ATTRIBUTEUSAGE")
+                                .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeIds, SqlBuilder.IN())
+                                .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", "SupportTicket")
+                                .and("AB_ATTRIBUTEUSAGE.MAX_COUNT is not null")
+                                .table();
+            
+            
+            attributeCounts.forEach(function([attributeId, maxCount]){
+                attributeCountObj[attributeId][IDX_MAX_COUNT] = maxCount;
+            });
+            
+            var table = "AB_ATTRIBUTERELATION";
+            var vals = [];
+            var attributeTypeIdx = {
+                "CHAR_VALUE": 1,
+                "ID_VALUE": 2,
+                "DATE_VALUE": 3,
+                "NUMBER_VALUE": 4,
+                "INT_VALUE": 5
+            }
+            
+            attributesToInsert.forEach(function(attribute){
+                // if there is no maximum count or the maximum count of the attribute has not been exceeded the attribute will be inserted
+                if(attributeCountObj[attribute[IDX_ATTRIBUTEID]][IDX_MAX_COUNT] == 0 || 
+                    attributeCountObj[attribute[IDX_ATTRIBUTEID]][IDX_EXISTING_ATTRS] < 
+                        attributeCountObj[attribute[IDX_ATTRIBUTEID]][IDX_MAX_COUNT]) 
+                {
+                    attributeCountObj[attribute[IDX_ATTRIBUTEID]][IDX_EXISTING_ATTRS]++;
+                    
+                    let cols = ["AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE", "OBJECT_ROWID", "DATE_NEW", "USER_NEW"];
+                    let attributeType = AttributeUtil.getAttributeType(attribute[IDX_ATTRIBUTEID]); 
+                    let attributeColumn = AttributeTypeUtil.getDatabaseField(attributeType);
+                    cols.push(attributeColumn);
+                    
+                    vals = [util.getNewUUID(), attribute[IDX_ATTRIBUTEID], "SupportTicket", pTicketID, vars.get("$sys.date"), 
+                            "System", attribute[attributeTypeIdx[attributeColumn]]];
+                        
+                    inserts.push([table, cols, null, vals]);
+                    
+                }
+            });
+            
+            new db.inserts(inserts);
+        }
+    }
+    if(inserts.length > 0)
+    { 
+        ticketMailbridgeUtils.insertLog(pTicketID, translate.text("Attribute determination") + ":\n" + logMessage);
+    }
+
+    
+}
+
+/*
+* checks for possible attribute filters and returns the matching attributefilter IDs and a log message
+* 
+* @param pFixAttributeFilters {Array}   the detected attribute filters
+* @param pMailObject {Object}           the inbox object created in funktion ticketMailbridgeUtils.getInboxInformation()
+* @param pKind {String}                 the kind of serch
+* 
+* @return {Array}                       structure: [[attributeFilterId], logMessage]
+*/
+ticketMailbridgeUtils.checkAttributeFilters = function(pFixAttributeFilters, pMailObject, pKind)
+{
+    var filterResult;
+    
+    pFixAttributeFilters.forEach(function([attributeFilterId, component, searchterm, coparisonMethod, threshold]){
+        
+        var textToSearch;
+        searchterm = searchterm || "";
+        
+        switch(component) // Where to search?
+        {
+            case $KeywordRegistry.inboxFilterComponent$body():
+                textToSearch = pMailObject[mail.MAIL_TEXT] || " ";
+                break;
+            case $KeywordRegistry.inboxFilterComponent$subject():
+                textToSearch = pMailObject[mail.MAIL_SUBJECT] || " ";
+                break;
+            case $KeywordRegistry.inboxFilterComponent$sender():
+                textToSearch = pMailObject[mail.MAIL_SENDER];
+                break;
+            default:
+                textToSearch = pMailObject[mail.MAIL_TEXT];
+                break;
+        }
+        textToSearch = textToSearch || "";
+        
+        if(pKind == $KeywordRegistry.attributeFilterComparisonMethod$fix())
+        {
+            filterResult = ticketMailbridgeUtils.checkFixAttributeFilters(searchterm, attributeFilterId, textToSearch, component);
+        }
+        else if(pKind == $KeywordRegistry.attributeFilterComparisonMethod$probability()) {
+            filterResult = ticketMailbridgeUtils.checkProbabilityAttributeFilters(searchterm, attributeFilterId, textToSearch, component);
+        }
+    });
+    
+    return filterResult;
+}
+
+/**
+* checks if the mailtext matches the fixed filter and returns the attribute filter ids and the log message
+* 
+* @param pSearchterm {String}          the text that is being searched for
+* @param pAttributeFilterId {String}   the id of the attribute filter
+* @param pTextToSearch {String}        the mail text
+* @param pComponent {String}           the component being searched
+* 
+* @return {Array}                      structure: [[attributeFilterId], logMessage]
+*/
+ticketMailbridgeUtils.checkFixAttributeFilters = function(pSearchterm, pAttributeFilterId, pTextToSearch, pComponent)
+{
+    var matchedAttributeFilterIds = [];
+    var logMessageAttributeFiilter = "";
+            
+        if(pTextToSearch.match(new RegExp(pSearchterm, "g")) != null)
+        {
+            logMessageAttributeFiilter += translate.text("Search term") + " '" + pSearchterm +"' " + translate.text("determined in") + " " + KeywordUtils.getViewValue($KeywordRegistry.inboxFilterComponent(), pComponent) + "\n";
+           
+            matchedAttributeFilterIds.push(pAttributeFilterId);
+        }
+    
+    return [matchedAttributeFilterIds, logMessageAttributeFiilter];
+}
+
+/**
+* checks if the mailtext matches the probability filter and returns the attribute filter ids and the log message
+* 
+* @param pSearchterm {String}          the text that is being searched for
+* @param pAttributeFilterId {String}   the id of the attribute filter
+* @param pTextToSearch {String}        the mail text
+* @param pComponent {String}           the component being searched
+* 
+* @return {Array}                      structure: [[attributeFilterId], logMessage]
+*/
+ticketMailbridgeUtils.checkProbabilityAttributeFilters = function(pSearchterm, pAttributeFilterId, pTextToSearch, pComponent)
+{
+    var matchedAttributeFilterIds = [];
+    var attributes = [];
+    var logMessageAttributeFiilter = "";
+    
+        //is not implemented
+    return [[], logMessageAttributeFiilter];
+}
+
+
+//////////////////////////// EMAIL ENTRY ////////////////////////
+
+// Mailobjecthandling
+var sender                  = text.decodeFirst(vars.getString("$local.sender"));
+var recipients              = text.decodeMS(vars.getString("$local.recipients"));
+var mailObj                 = mail.resolveMail(vars.getString("$local.mail"));
+var body                    = mailObj[mail.MAIL_SENDER];
+var possibleBCC             = []; 
+var possibleBCCUnfiltered   = [];
+var possibleReplyTo         = [];
+mailObj["send"]             = sender;
+mailObj["reci"]             = recipients;
+mailObj.send =sender;
+
+//Subject Fallback
+if(mailObj[mail.MAIL_SUBJECT] == "" || mailObj[mail.MAIL_SUBJECT] == undefined)
+{
+    mailObj[mail.MAIL_SUBJECT] = "ohne Betreff"
+}
+
+// BCC Functionality
+possibleBCC = mail.getHeader(mailObj, "Received").toString().match(/[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?/g) || [];
+possibleBCCUnfiltered   = mail.getHeader(mailObj, "Received").toString().match(/[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?/g) || [];
+ 
+var indexLength =  possibleBCC.length;
+
+ 
+// delete possible ' from recipients
+if(recipients != undefined)
+{
+    for(var i = 0; i < recipients.length; i++)
+    {
+        recipients[i] = recipients[i].replace(/'/g,"");
+    } 
+}
+
+ticketMailbridgeUtils.setTicketCodeRegex(project.getPreferenceValue("custom.supportticket.coderegex",""));
+// InboxObject
+var inboxObj = ticketMailbridgeUtils.getInboxInformation(recipients, sender, possibleBCC, possibleBCCUnfiltered);
+ 
+// First search vor available Ticket-Nr:
+if(ticketMailbridgeUtils.findTicket(mailObj[mail.MAIL_SUBJECT], inboxObj, mailObj) == "")
+{
+    // Call function for using filter
+    ticketMailbridgeUtils.useFiler(inboxObj, mailObj);
+}
+ 
\ No newline at end of file
diff --git a/role/PROJECT_Support/PROJECT_Support.aod b/role/PROJECT_ServiceAdmin/PROJECT_ServiceAdmin.aod
similarity index 81%
rename from role/PROJECT_Support/PROJECT_Support.aod
rename to role/PROJECT_ServiceAdmin/PROJECT_ServiceAdmin.aod
index dcac92a0a44aa0057634e88e233a6419f3e83586..7464e8bd029352b8ff4147bc06ac739757cd6cbe 100644
--- a/role/PROJECT_Support/PROJECT_Support.aod
+++ b/role/PROJECT_ServiceAdmin/PROJECT_ServiceAdmin.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <role xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/role/1.2.0">
-  <name>PROJECT_Support</name>
-  <title>Support</title>
+  <name>PROJECT_ServiceAdmin</name>
+  <title>Service-Admin</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
 </role>
diff --git a/role/PROJECT_ServiceAgent/PROJECT_ServiceAgent.aod b/role/PROJECT_ServiceAgent/PROJECT_ServiceAgent.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d8d174d6a1667efaff9e6e1c07b1a53c015e2f02
--- /dev/null
+++ b/role/PROJECT_ServiceAgent/PROJECT_ServiceAgent.aod
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/role/1.2.0">
+  <name>PROJECT_ServiceAgent</name>
+  <title>Serviceagent</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <children />
+</role>
diff --git a/system/default/default.aod b/system/default/default.aod
index 9a52a413a65379d11c6a4f41d481f78eef758db0..8e540abc20f2a9d47ab7f391fd84e499833df500 100644
--- a/system/default/default.aod
+++ b/system/default/default.aod
@@ -10,4 +10,5 @@
   <autoLogin v="false" />
   <aditoDebug></aditoDebug>
   <enableJDitoDebug v="true" />
+  <serverAddress>xrm-service.dev.c2.adito.cloud</serverAddress>
 </system>