merged origin/master into Receipt

09fc1f29 · Mohamed Mansour · 2aefd47b · afda66af · 09fc1f29 · 09fc1f29
Commit 09fc1f29 authored 5 years ago by Mohamed Mansour
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
 #This file is generated by ADITO designer. Do NOT delete or modify!
-#Wed Jul 17 11:50:23 CEST 2019
-version=5.1.19
+#Fri Jul 26 06:57:10 CEST 2019
+version=6.0.0
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml
@@ -6,7 +6,7 @@

            <column name="NAME" value="icon"/>
            <column name="CONTAINER" value="ActivityDirection"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7770bafa-22f0-4a74-a2cf-5001b620a4b2"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
@@ -6,7 +6,7 @@

            <column name="NAME" value="defaultAvatarRepresentation"/>
            <column name="CONTAINER" value="ActivityCategory"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="94529505-1913-4827-9812-026053bfcb51"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
@@ -6,14 +6,14 @@

            <column name="NAME" value="organisation"/>
            <column name="CONTAINER" value="AddressType"/>
-            <column name="TYPE" value="BOOL_VALUE"/>
+            <column name="KIND" value="BOOL_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTE">
            <column name="AB_KEYWORD_ATTRIBUTEID" value="c4c5352b-ff72-4323-80b9-631a24dd7245"/>

            <column name="NAME" value="contact"/>
            <column name="CONTAINER" value="AddressType"/>
-            <column name="TYPE" value="BOOL_VALUE"/>
+            <column name="KIND" value="BOOL_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="49bb6904-dd20-4ede-aaff-ae80131ed274"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml
@@ -48,7 +48,7 @@
                <column name="AB_KEYWORD_ATTRIBUTEID" value="307ecfc6-15c8-4ab9-8afa-e97b90a00c5f"/>
                <column name="NAME" value="defaultAvatarRepresentation"/>
                <column name="CONTAINER" value="AttributeType"/>
-                <column name="TYPE" value="CHAR_VALUE"/>
+                <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
                <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="0c537ea0-6ba2-4d9a-a27c-7c6a6920e303"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
@@ -6,14 +6,14 @@

            <column name="NAME" value="category"/>
            <column name="CONTAINER" value="CommunicationMedium"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTE">
            <column name="AB_KEYWORD_ATTRIBUTEID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>

            <column name="NAME" value="contentType"/>
            <column name="CONTAINER" value="CommunicationMedium"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
@@ -6,14 +6,14 @@

            <column name="NAME" value="AdvertisingBan"/>
            <column name="CONTAINER" value="CommunicationMediumCampaign"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTE">
            <column name="AB_KEYWORD_ATTRIBUTEID" value="d6c0fd72-ded2-4e4d-adf5-f8832d7b24f2"/>

            <column name="NAME" value="AdvertisingBanIcon"/>
            <column name="CONTAINER" value="CommunicationMediumCampaign"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>                       
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="2acd3694-ccef-4d0b-ae7a-b3d31f8d9cc0"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
@@ -5,25 +5,25 @@
            <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2001"/>
            <column name="NAME" value="LET"/>
            <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
-            <column name="TYPE" value="BOOL_VALUE"/>
+            <column name="KIND" value="BOOL_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTE">
            <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2002"/>
            <column name="NAME" value="MAI"/>
            <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
-            <column name="TYPE" value="BOOL_VALUE"/>
+            <column name="KIND" value="BOOL_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTE">
            <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2003"/>
            <column name="NAME" value="ATT"/>
            <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
-            <column name="TYPE" value="BOOL_VALUE"/>
+            <column name="KIND" value="BOOL_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTE">
            <column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
            <column name="NAME" value="TEX"/>
            <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
-            <column name="TYPE" value="BOOL_VALUE"/>
+            <column name="KIND" value="BOOL_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-423e-b130-dp88b2b51123"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
@@ -6,7 +6,7 @@

            <column name="NAME" value="percentValue"/>
            <column name="CONTAINER" value="OfferProbability"/>
-            <column name="TYPE" value="NUMBER_VALUE"/>
+            <column name="KIND" value="NUMBER_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="e14fab55-4a85-48c2-a109-125eaed9dc3f"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
@@ -6,7 +6,7 @@

            <column name="NAME" value="defaultAvatarRepresentation"/>
            <column name="CONTAINER" value="TaskPriority"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ENTRY">
            <column name="AB_KEYWORD_ENTRYID" value="97ec9a7e-a1dd-4167-bf7d-57ee3d79d46f"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/salesprojectsource_add_icon_attr.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/salesprojectsource_add_icon_attr.xml
@@ -6,7 +6,7 @@

            <column name="NAME" value="defaultAvatarRepresentation"/>
            <column name="CONTAINER" value="SalesprojectSource"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>

        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">

--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
@@ -55,7 +55,7 @@
                <column name="AB_KEYWORD_ATTRIBUTEID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
                <column name="NAME" value="bulkMailIcon"/>
                <column name="CONTAINER" value="BulkMailStatus"/>
-                <column name="TYPE" value="CHAR_VALUE"/>
+                <column name="KIND" value="CHAR_VALUE"/>
        </insert>
        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
                <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="801268a9-e93e-4481-b98d-1e37ca308e10"/>

--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaign.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaign.xml
@@ -20,7 +20,7 @@
            </column>
            <column name="USER_EDIT" type="NVARCHAR(50)" />
            <column name="DATE_EDIT" type="DATE" />
-            <column name="STATE" type="CHAR(36)">
+            <column name="STATUS" type="CHAR(36)">
                <constraints nullable="false"/>
            </column>
        </createTable>

--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignParticipantLog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignParticipantLog.xml
@@ -14,6 +14,7 @@
            <column name="CAMPAIGNSTEP_ID" type="CHAR(36)">
                <constraints nullable="false"/>
            </column>
+            <column name="PREVIOUS_CAMPAIGNSTEP_ID" type="CHAR(36)"/>
            <column name="USER_NEW" type="NVARCHAR(50)">
                <constraints nullable="false"/>
            </column>

--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStep.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStep.xml
@@ -21,7 +21,7 @@
            <column name="DATE_END" type="DATE">
                <constraints nullable="false"/>
            </column>
-            <column name="STATE" type="CHAR(36)">
+            <column name="STATUS" type="CHAR(36)">
                <constraints nullable="false"/>
            </column>
            <column name="SORTING" type="INTEGER">

--- a/.liquibase/Data_alias/basic/2019.1.4/Contact_add_columns.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Contact_add_columns.xml
@@ -8,7 +8,7 @@
            <column name="CONTACTROLE" type="NVARCHAR(50)"/>
        </addColumn>
        <addColumn tableName="CONTACT">
-            <column name="POSITION" type="NVARCHAR(50)"/>
+            <column name="CONTACTPOSITION" type="NVARCHAR(50)"/>
        </addColumn>
    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.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="a.voegl" id="8de6cb0d-0dc3-4440-9ad9-a3c084b0d470">
-        <renameColumn newColumnName="STATE_OLD" oldColumnName="STATE" columnDataType="INTEGER" tableName="SALESPROJECT"/>
+        <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" columnDataType="INTEGER" tableName="SALESPROJECT"/>
 	<addColumn tableName="SALESPROJECT">
-            <column name="STATE" type="CHAR(36)"/>
+            <column name="STATUS" type="CHAR(36)"/>
 	</addColumn> 
        <update tableName="SALESPROJECT">
-            <column name="STATE" value="SALPROJSTATOPEN"/>
-            <where>STATE_OLD = 1</where>
+            <column name="STATUS" value="SALPROJSTATOPEN"/>
+            <where>STATUS_OLD = 1</where>
        </update>
        <update tableName="SALESPROJECT">
-            <column name="STATE" value="SALPROJSTATPOSTPONED"/>
-            <where>STATE_OLD = 2</where>
+            <column name="STATUS" value="SALPROJSTATPOSTPONED"/>
+            <where>STATUS_OLD = 2</where>
        </update>
        <update tableName="SALESPROJECT">
-            <column name="STATE" value="SALPROJSTATABORT"/>
-            <where>STATE_OLD = 3</where>
+            <column name="STATUS" value="SALPROJSTATABORT"/>
+            <where>STATUS_OLD = 3</where>
        </update>
        <update tableName="SALESPROJECT">
-            <column name="STATE" value="SALPROJSTATPARTIAL"/>
-            <where>STATE_OLD = 4</where>
+            <column name="STATUS" value="SALPROJSTATPARTIAL"/>
+            <where>STATUS_OLD = 4</where>
        </update>
        <update tableName="SALESPROJECT">
-            <column name="STATE" value="SALPROJSTATORDER"/>
-            <where>STATE_OLD = 5</where>
+            <column name="STATUS" value="SALPROJSTATORDER"/>
+            <where>STATUS_OLD = 5</where>
        </update>
        <update tableName="SALESPROJECT">
-            <column name="STATE" value="SALPROJSTATLOST"/>
-            <where>STATE_OLD = 6</where>
+            <column name="STATUS" value="SALPROJSTATLOST"/>
+            <where>STATUS_OLD = 6</where>
        </update>
-        <dropColumn tableName="SALESPROJECT" columnName="STATE_OLD"/>
+        <dropColumn tableName="SALESPROJECT" columnName="STATUS_OLD"/>
    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
@@ -5,12 +5,12 @@
            <column name="ORGANISATIONID" value="0"/>
            <column name="NAME" value="privat"/>
            <column name="CUSTOMERCODE" value=""/>
-            <column name="TYPE" value="ORGCUTOMER"/>
+            <column name="KIND" value="ORGCUTOMER"/>
 	</insert>
        <insert tableName="CONTACT">
            <column name="CONTACTID" value="0"/>
            <column name="ORGANISATION_ID" value="0"/>
-            <column name="LANGUAGE" value="deu"/>
+            <column name="ISOLANGUAGE" value="deu"/>
            <column name="STATUS" value="CONTACTSTATACTIVE"/>
            <column name="ADDRESS_ID" value="0"/>
        </insert>

--- a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml
@@ -5,7 +5,7 @@
            <column name="AB_KEYWORD_ATTRIBUTEID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
            <column name="NAME" value="longName"/>
            <column name="CONTAINER" value="SalesprojectPhase"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>

        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">

--- a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
@@ -5,7 +5,7 @@
            <column name="AB_KEYWORD_ATTRIBUTEID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
            <column name="NAME" value="icon"/>
            <column name="CONTAINER" value="SalesprojectPhase"/>
-            <column name="TYPE" value="CHAR_VALUE"/>
+            <column name="KIND" value="CHAR_VALUE"/>
        </insert>

        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">