Merge branch 'master' into campaignmanagement

# Conflicts:
#	entity/Campaign_entity/Campaign_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

.aditoprj/project.version

 #This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Apr 23 16:51:47 CEST 2019
-version=5.1.12
+#Fri May 03 10:13:46 CEST 2019
+version=5.1.13

.liquibase/Data_alias/basic/2019.2/AditoBasic/create_ab_loghistory.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="m.kuhn" id="fbe17fba-5bf7-4203-8f6f-01723e07194c">
+        <createTable tableName="AB_LOGHISTORY">
+            <column name="USER_NEW" type="NVARCHAR(50)">
+                <constraints nullable="false"/>
+            </column> 
+            <column name="DATE_NEW" type="DATETIME">
+                <constraints nullable="false"/>
+            </column>          
+            <column name="DESCRIPTION" type="NCLOB"/>
+            <column name="LOGTYPE" type="CHAR(1)"/>
+            <column name="SOURCE_TABLENAME" type="NVARCHAR(30)"/>
+            <column name="SOURCE_TABLENAMEID" type="CHAR(36)"/>
+            <column name="TABLENAME" type="NVARCHAR(30)"/>
+            <column name="TABLENAMEID" type="CHAR(36)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2019.2/changelog.xml

@@ -140,9 +140,10 @@
     <include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
 
     <include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
-
-    <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>
-
+    
+    <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
+    
     <include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
     <include relativeToChangelogFile="true" file="miscellaneous/Contact_additionalColumns.xml" />
 

.liquibase/_____SYSTEMALIAS/basic/2019.2/create_asys_notificationcontents.xml

@@ -9,7 +9,7 @@
         <column name="CAPTION" type="VARCHAR(512)"/>
         <column name="CREATIONDATE" type="BIGINT"/>
         <column name="DESCRIPTION" type="VARCHAR(1023)"/>
-        <column name="FORCEDPRIORITY" type="INTEGER"/>
+        <column name="FORCEDPRIORITY" type="VARCHAR(15)"/>
         <column name="ICON_INFO" type="VARCHAR(1023)"/>
         <column name="LIFETIME" type="BIGINT"/>
         <column name="LINK_INFO" type="VARCHAR(1023)"/>

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/address/entityfields/country/customproperties/translate4log/property.js

+import("system.result");
+import("Country_lib");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var countryName = CountryUtils.getLatinNameByIso2(params.value, params.locale);
+result.string(countryName);
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/language/customproperties/translate4log/property.js

+import("system.result");
+import("Loghistory_lib");
+import("Keyword_lib");
+
+var params = Translate4LogParams.load();
+var res = LanguageKeywordUtils.getViewValue(params.value, params.locale);
+result.string(res);
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js

+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/language/customproperties/translate4log/property.js

+import("system.result");
+import("Loghistory_lib");
+import("Keyword_lib");
+
+var params = Translate4LogParams.load();
+var res = LanguageKeywordUtils.getViewValue(params.value, params.locale);
+result.string(res);
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js

+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale)));
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js

+import("system.result");
+import("system.db");
+import("Sql_lib");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+
+var res = db.cell(SqlCondition.begin()
+                              .andPrepare("SALESPROJECT.SALESPROJECTID", params.value)
+                              .buildSql("select PROJECTTITLE from SALESPROJECT"));
+result.string(res);
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js

+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale)));
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js

+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
\ No newline at end of file

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js

+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);

aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject_member/entityfields/contact_id/customproperties/translate4log/property.js

+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
+result.string(res);
\ No newline at end of file

aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod

@@ -1445,19 +1445,6 @@
               <name>auditSyncConfig</name>
             </auditSyncConfig>
             <entityFields>
-              <entityFieldDb>
-                <name>ACOLUMNNAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="127" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>ALIAS</name>
                 <dbName></dbName>
@@ -1614,6 +1601,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>AOCOLUMNNAME</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>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <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="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>

entity/360Degree_entity/360Degree_entity.aod

 <?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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
   <name>360Degree_entity</name>
-  <title>360 Degree</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>360 Degree</title>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>

entity/ActivityLink_entity/ActivityLink_entity.aod

 <?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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
   <name>ActivityLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Connection</title>
+  <titlePlural>Connections</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>

entity/Activity_entity/Activity_entity.aod

 <?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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
   <name>Activity_entity</name>
-  <title>Activity</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
+  <title>Activity</title>
   <afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
   <iconId>NEON:HISTORY</iconId>
   <image>VAADIN:SHOP</image>
   <imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
+  <titlePlural>Activities</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityField>
@@ -93,7 +94,6 @@
     </entityParameter>
     <entityConsumer>
       <name>Documents</name>
-      <title>Documents</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -117,7 +117,6 @@
     </entityConsumer>
     <entityConsumer>
       <name>MainDocuments</name>
-      <title>Maindocuments</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
       <dependency>
@@ -154,7 +153,6 @@
     </entityField>
     <entityConsumer>
       <name>Links</name>
-      <title>Connections</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -284,7 +282,6 @@
     </entityField>
     <entityConsumer>
       <name>ModuleTrees</name>
-      <title>History</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -367,12 +364,11 @@
     </entityField>
     <entityConsumer>
       <name>Attributes</name>
-      <title>Attributes</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
         <entityName>AttributeRelation_entity</entityName>
-        <fieldName>RelationsForSpecificObject</fieldName>
+        <fieldName>AttributeRelations</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -410,11 +406,10 @@
     </entityParameter>
     <entityConsumer>
       <name>AttributeTree</name>
-      <title>Attributes</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
-        <entityName>AttributeRelationTree_entity</entityName>
+        <entityName>AttributeRelation_entity</entityName>
         <fieldName>TreeProvider</fieldName>
       </dependency>
       <children>

entity/AddressType_entity/AddressType_entity.aod

 <?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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
   <name>AddressType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <titleProcess>%aditoprj%/entity/AddressType_entity/titleProcess.js</titleProcess>
+  <contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>