merged origin/2020.2 into master

.aditoprj/ignoredScanServiceTasks.json

@@ -35,6 +35,12 @@
       "line": -1,
       "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
       "groupName": "nb-tasklist-warning"
+    },
+    {
+      "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
+      "line": -1,
+      "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
+      "groupName": "nb-tasklist-warning"
     }
   ]
 }
\ No newline at end of file

.aditoprj/project.version

 #This file is generated by ADITO designer. Do NOT delete or modify!
-#Mon Mar 16 10:08:50 CET 2020
-version=6.1.1
+#Tue Sep 08 15:42:02 CEST 2020
+version=6.2.0

.gitignore

@@ -5,3 +5,4 @@
 /others/db_changes/liqui_update.bat
 /others/db_changes/liqui_reset.ps1
 /others/jsdocOut
+/userhelp
\ No newline at end of file

.idea/inspectionProfiles/Project_Default.xml

-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml

@@ -11,7 +11,11 @@
     </changeSet>
     
     <changeSet dbms="!derby" author="b.ulrich" id="17c1eb73-3131-4a2b-bf9a-913590767c79">
+        <dropIndex  tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID"/>
         <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION">
+            <column name="MEDIUM_ID"/>
+        </createIndex>
     </changeSet>
 
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml

@@ -14,6 +14,9 @@
     </changeSet>
     
     <changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
+        <dropPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" dropIndex="true"/>
         <modifyDataType tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" newDataType="CHAR(36)"/>
+        <addNotNullConstraint columnName="DOCUMENTTEMPLATEID" tableName="DOCUMENTTEMPLATE" columnDataType="CHAR(36)" validate="true"/>
+        <addPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" columnNames="DOCUMENTTEMPLATEID"/>
     </changeSet>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml

@@ -19,8 +19,25 @@
     </changeSet>
     
     <changeSet dbms="!derby" author="b.ulrich" id="a53a2f38-3788-44a2-a151-13b3853ccb74">
+        <!--EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID-->
+        <dropIndex  tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="idx_exprttmppou_tmpltid"/>
         <modifyDataType tableName="EXPORTTEMPLATEPLACEOFUSE" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="idx_exprttmppou_tmpltid" tableName="EXPORTTEMPLATEPLACEOFUSE">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        
+        <!--EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID-->
+        <dropIndex  tableName="EXPORTTEMPLATEFIELD" indexName="idx_exprttmpfld_tmpltid"/>
         <modifyDataType tableName="EXPORTTEMPLATEFIELD" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="idx_exprttmpfld_tmpltid" tableName="EXPORTTEMPLATEFIELD">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        
+        <!--EXPORTTEMPLATESELECTION.EXPORTTEMPLATE_ID-->
+        <dropIndex  tableName="EXPORTTEMPLATESELECTION" indexName="idx_exprttmpselection_tmpltid"/>
         <modifyDataType tableName="EXPORTTEMPLATESELECTION" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="idx_exprttmpselection_tmpltid" tableName="EXPORTTEMPLATESELECTION">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
     </changeSet>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml

 <?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="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+    <changeSet author="s.pongratz" id="2153f1f9-b62b-4a65-948a-92e236ae53a3">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = 'f862f71e-9155-4e88-8158-170ddfa4dbf3'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="f862f71e-9155-4e88-8158-170ddfa4dbf3"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_PHONECALL"/>
@@ -11,7 +14,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="2a4cc7c2-c497-4c21-89b8-4e922fd7eee7">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '19876b72-cd7d-4916-b853-22c4d9fe49c2'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="19876b72-cd7d-4916-b853-22c4d9fe49c2"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_EMAIL"/>
@@ -21,7 +28,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="59aac29a-5cc8-4825-9868-33247bb45a71">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '16f9fbb5-9b8a-4908-babd-06c86032a22b'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="16f9fbb5-9b8a-4908-babd-06c86032a22b"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_APPOINTMENT"/>
@@ -31,7 +42,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="42c7f06f-eadb-45de-9aa0-129c475333ff">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '53458dba-80f5-427c-a44c-3fc8e74f3380'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="53458dba-80f5-427c-a44c-3fc8e74f3380"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_TODO"/>
@@ -41,7 +56,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="b0a0157b-8732-49e3-90d6-3797b1a035d4">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '3d2393b3-ed13-44d6-9a6f-9280d84252cb'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3d2393b3-ed13-44d6-9a6f-9280d84252cb"/>
             <column name="KEYID" value="DownloadReady"/>
@@ -51,7 +70,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="45cff8ed-3b4f-47b6-af6b-3b2a39877b68">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '09ce4611-3254-4590-958a-79178924188b'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="09ce4611-3254-4590-958a-79178924188b"/>
             <column name="KEYID" value="BulkMailSent"/>
@@ -61,7 +84,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="148a5837-b2a6-4e17-b812-7db0f4efd9b8">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = 'df47c6db-2a72-464a-b155-c4e33a4294ba'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="df47c6db-2a72-464a-b155-c4e33a4294ba"/>
             <column name="KEYID" value="Leadimport_Notification"/>
@@ -71,6 +98,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
+    </changeSet>
+    <changeSet author="s.pongratz" id="b15af488-facc-4245-9daa-2f38754ab8ea">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '58281d88-71a7-4fa7-8ef8-9289fc904697'</sqlCheck>  
+        </preConditions>  
         
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="58281d88-71a7-4fa7-8ef8-9289fc904697"/>

.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml

@@ -2,6 +2,9 @@
 <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="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = 'daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81"/>
             <column name="KEYID" value="TODELETE"/>

.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml

+<?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_district.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="create_indizes.xml"/>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml

+<?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="d.tran" id="4bfb41ea-ef43-403a-9a93-48d92294b1cb">
+        <createTable tableName="DISTRICT">
+            <column name="DISTRICTID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICT_DISTRICTID"/>
+            </column>
+            <column name="DISTRICT_NAME" type="VARCHAR(50)"/>
+            <column name="DISTRICT_NUMBER" type="INTEGER"/>
+            <column name="DISTRICT_INFO" type="VARCHAR(50)"/>
+            <column name="ISO3" type="VARCHAR(5)"/>
+            <column name="PARENTDISTRICT_DISTRICTID" type="CHAR(36)"/>
+            <column name="DISTRICT_FILTER" type="NCLOB"/>
+            <column name="DISTRICT_STATUS" type="INTEGER"/>
+            <column name="USER_NEW" type="NVARCHAR(50)"/>
+            <column name="USER_EDIT" type="NVARCHAR(50)"/>
+            <column name="DATE_NEW" type="DATETIME"/>
+            <column name="DATE_EDIT" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml

+<?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="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
+            <column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
+            <column name="TITLE" value="District Responsible"/>
+            <column name="CONTAINER" value="MemberRole"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml

+<?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="d.tran" id="0e5cc99d-3500-484c-abc4-441e3a5c4b7f">
+        <createTable tableName="DISTRICTRESPONSIBLE">
+            <column name="DISTRICTRESPONSIBLEID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICTRESPONSIBLE_DISTRICTRESPONSIBLEID"/>
+            </column>
+            <column name="DISTRICT_ID" type="CHAR(36)"/>
+            <column name="EMPLOYEE_CONTACT_ID" type="CHAR(36)"/>
+            <column name="DEPARTMENT_ATTRIBUTE_ID" type="CHAR(36)"/>
+            <column name="USER_NEW" type="NVARCHAR(50)"/>
+            <column name="USER_EDIT" type="NVARCHAR(50)"/>
+            <column name="DATE_NEW" type="DATETIME"/>
+            <column name="DATE_EDIT" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml

+<?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="d.tran" id="7dbaa3ae-ba37-4fd1-9b63-fab48975fb87">
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DEPARTMENT_ATTRIBUTE_ID">
+            <column name="DEPARTMENT_ATTRIBUTE_ID"/>
+        </createIndex>
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DISTRICTRESPONSIBLE_DISTRICT_ID">
+            <column name="DISTRICT_ID"/>
+        </createIndex>
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_EMPLOYEE_CONTACT_ID">
+            <column name="EMPLOYEE_CONTACT_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml

@@ -2,8 +2,8 @@
 <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="s.pongratz" id="99f19a82-62aa-41fc-b756-da4da3be45de">
-         <sql>
-            ALTER TABLE LEAD ADD COLUMN ATTRIBUTE_Industry VARCHAR(100);
-        </sql>
+        <addColumn tableName="LEAD">
+            <column name="ATTRIBUTE_Industry" type="VARCHAR(100)"/>
+        </addColumn>
     </changeSet>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.2.0/Lead/addAndRenameColumnLead.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="bcd6cb02-d074-444f-a307-34973b3dd4e1">
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMMOBIL"  
+            oldColumnName="COMMMOBIL"  
+            tableName="LEAD"/>
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMEMAIL"  
+            oldColumnName="COMMEMAIL"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMBLOG"  
+            oldColumnName="COMMBLOG"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMPHONE"  
+            oldColumnName="COMMPHONE"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMXING"  
+            oldColumnName="COMMXING"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMLINKEDIN"  
+            oldColumnName="COMMLINKEDIN"  
+            tableName="LEAD"/>
+        
+        <addColumn tableName="LEAD">
+            <column name="P_COMMMOBIL"     type="NVARCHAR(254)" />
+            <column name="P_COMMEMAIL"     type="NVARCHAR(254)" />
+            <column name="P_COMMPHONE"     type="NVARCHAR(254)" />
+            <column name="P_COMMBLOG"      type="NVARCHAR(254)" />
+            <column name="P_COMMXING"      type="NVARCHAR(254)" />
+            <column name="P_COMMLINKEDIN"  type="NVARCHAR(254)" />
+	</addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/Lead/changelog.xml

+<?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 file="addAndRenameColumnLead.xml" relativeToChangelogFile="true" />
+    <include file="insertAndUpdateImportFields.xml" relativeToChangelogFile="true" />
+</databaseChangeLog>

.liquibase/Data_alias/basic/2020.2.0/Lead/insertAndUpdateImportFields.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="bcd6cb02-d074-444f-a307-34973b3dd4e1">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMMOBIL"/>
+            <column name="TITLE" value="Mobile number (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="da3acc3a-457e-4c88-a477-8abdaf819539" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMEMAIL"/>
+            <column name="TITLE" value="Mail (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="2e7952b1-56a8-484d-9d82-564236c30d20" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMPHONE"/>
+            <column name="TITLE" value="Phone number (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="96534736-0247-4596-a8db-f6d7eee611c5" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMMOBIL"/>
+            <column name="TITLE" value="Internet (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="9ed26d58-cc2f-436e-b67b-afbb9f102bf4" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMBLOG"/>
+            <column name="TITLE" value="Blog (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="52bad941-02be-4c63-94a7-979e8ecef0c9" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMXING"/>
+            <column name="TITLE" value="Xing (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="8bf354dc-4278-493e-9824-40367382290f" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMLINKEDIN"/>
+            <column name="TITLE" value="Linked in (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="97e27378-e733-4629-b0c4-515faf89da7e" />
+            </whereParams>
+        </update>
+        
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="dd5abf99-b43d-4b3d-b4b0-376c70572490"/>
+        <column name="KEYID" value="P_COMMMOBIL"/>
+        <column name="TITLE" value="Mobile number (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="29"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="345fe723-73dc-4687-afd2-c4ebc16aebdc"/>
+        <column name="KEYID" value="P_COMMEMAIL"/>
+        <column name="TITLE" value="Mail (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="30"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="370672a7-946a-43b6-98dd-532422bef388"/>
+        <column name="KEYID" value="P_COMMPHONE"/>
+        <column name="TITLE" value="Phone number (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="31"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="01f18fd8-44c1-43ec-8601-bf1fe7e62700"/>
+        <column name="KEYID" value="P_COMMMOBIL"/>
+        <column name="TITLE" value="Internet (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="32"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="504d48d1-1a0d-437a-adc9-38501679137a"/>
+        <column name="KEYID" value="P_COMMBLOG"/>
+        <column name="TITLE" value="Blog (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="33"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="fde1a4d1-d77e-494c-a1e4-2ef82abec246"/>
+        <column name="KEYID" value="P_COMMXING"/>
+        <column name="TITLE" value="Xing (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="34"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="53e06704-e28d-49b5-a49f-e40ca250ee6a"/>
+        <column name="KEYID" value="P_COMMLINKEDIN"/>
+        <column name="TITLE" value="Linked in (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="35"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml

+<?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="d.tran" id="b16e0a6e-74b7-414a-9cc2-fb7f8f1c3d72">
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="bbd50206-c4d5-42e0-a19a-2d11e957af1f"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="63f5b453-24af-47a2-8ef1-ee5c91003428"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="910939c0-fe4f-4142-9656-d06ed1fe6d04"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="a5ccf0e5-2c4d-4782-8970-61af4db2dd31"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="460e8b4c-5124-4b83-ab81-16ad919abe35"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="Organisation"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="346113a2-e3b6-41e5-b058-13342e45984a"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b741dc23-8e46-46a6-9485-56a9033d944a"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="50cd8a91-5a48-479d-a329-aa9c1d1a3835"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="Organisation"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="5e2011ef-87aa-4b51-bea4-34cbfa11722f"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="e1422fa3-dcd2-4863-b972-1a3fb4b4fdc6"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>