diff --git a/.liquibase/Data_alias/basic/2021.2.2/Employee/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Employee/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d71510f3a08b861f96016cdf609308c9b510007e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Employee/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="insert_ServiceDepartment.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.xml b/.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2b0bafe8d7cbd9958edf719ce06a9dda40a0b6fe
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.xml
@@ -0,0 +1,35 @@
+<?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="ce4bcbe5-e2a6-468d-8481-6bef9d538de5">
+ <update tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_NAME" value="IT"/>
+ <where> AB_ATTRIBUTEID = 'e47c7fb1-1072-4f03-a275-e4b6331deec1'</where>
+ </update>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Service"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="30324d52-53c6-4e2b-a604-38a35a2184e0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Office staff"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a4048b9a-1c5e-45b5-8996-9b68d3e78af8"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Field staff"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Person/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Person/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d07fccaf8322be29e8a370377c947344af22881b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Person/changelog.xml
@@ -0,0 +1,7 @@
+<?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="insert_ServiceRole.xml"/>
+ <include relativeToChangelogFile="true" file="insert_ServiceDeparment.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.xml b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a53d52b0996a78243e52635c7268ecf4d427996c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.xml
@@ -0,0 +1,17 @@
+<?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="bf635bf3-a1db-4c23-8a09-718b98847aa4">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="26c175af-c13d-4056-8ac3-b69a3dcb387c"/>
+ <column name="KEYID" value="CONTACTSERVICE"/>
+ <column name="TITLE" value="Service"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="cda5deac-5b7c-4c98-9904-2eb3b224235d"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceRole.xml b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceRole.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd8e827f3b02ac665fa7bc7e9f5c23f5b6300ac5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceRole.xml
@@ -0,0 +1,17 @@
+<?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="23b94ef5-1ff8-4f8b-9411-29ea69f17912">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b1f74f90-bfe3-4062-a018-cdfe839e62cb"/>
+ <column name="KEYID" value="CONTACTROLESERVICE"/>
+ <column name="TITLE" value="Service Manager"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="8"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="866fd65f-131c-4038-99ce-78606971ec98"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
index d305c8241e2e7d485b6ae523c45de336e141c76d..43e15c15bb8cbc6cfda7cf120c656630e6b977c3 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -4,4 +4,6 @@
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_offer_showprice.xml"/>
<include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Person/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Employee/changelog.xml"/>
</databaseChangeLog>
\ 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
index 563673fcbbc2a5383b123991053823e2e7b48adb..1865a37469558b88ce61bcb249676ba2cc99772e 100644
--- a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
@@ -20,7 +20,7 @@ if( str_requestorContactId)
.and( "communication.MEDIUM_ID in ('COMMPHONE', 'COMMMOBIL')")
.orderBy("communication.ISSTANDARD desc")
.cell();
- if(str_email && vars.exists("$field.CommEMail"))
+ if(str_email && vars.exists("$field.CommEmail"))
{
neon.setFieldValue("$field.CommEmail",
str_email
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 50d0738fb82a5a337077ba8f5c5d4760bd59093f..399ceef3cf82a9f802a367463c4a248715a7a5b8 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -56,7 +56,7 @@
<intervall v="5000" />
<bridgeMode v="3" />
<flagMode v="2" />
- <process>mailbridge_service</process>
+ <process>mailbridge</process>
<errorProcess></errorProcess>
<attachmentHandling>ALL</attachmentHandling>
</mailbridgeMailserver>
@@ -223,7 +223,6 @@
<customStringProperty>
<name>mosaico.url</name>
<description>Url of the Mosaico Email Editor</description>
- <property>https://mosaico.xrm-service.dev.c2.adito.cloud</property>
</customStringProperty>
</customProperties>
</preferences>