Merge branch 'master' into campaignmanagement

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

Merge branch 'master' into campaignmanagement
c7bf4dd0 · Dominik Lechner · cafda049 · aece9d36 · c7bf4dd0 · c7bf4dd0
Commit c7bf4dd0 authored 5 years ago by Dominik Lechner
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
-#This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue May 14 15:19:29 CEST 2019
-version=5.1.14
+#This file is generated by ADITO designer. Do NOT delete or modify!
+#Tue May 28 08:41:41 CEST 2019
+version=5.1.15
--- a/.liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/.liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -51,7 +51,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2018-06-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1"/>
+        <column name="VOLUME" valueNumeric="1000"/>
    </insert>

    <insert tableName="SALESPROJECT_FORECAST">
@@ -64,7 +64,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1.1"/>
+        <column name="VOLUME" valueNumeric="2100"/>
    </insert>

    <insert tableName="SALESPROJECT_FORECAST">
@@ -77,7 +77,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2017-06-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1.5"/>
+        <column name="VOLUME" valueNumeric="1500"/>
    </insert>
    
    <insert tableName="SALESPROJECT_FORECAST">
@@ -90,7 +90,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2017-05-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1.3"/>
+        <column name="VOLUME" valueNumeric="1300"/>
    </insert>

    <insert tableName="SALESPROJECT_FORECAST">
@@ -103,7 +103,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2018-06-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="0.5"/>
+        <column name="VOLUME" valueNumeric="500"/>
    </insert>

    <insert tableName="SALESPROJECT_FORECAST">
@@ -116,7 +116,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1.2"/>
+        <column name="VOLUME" valueNumeric="1200"/>
    </insert>

    <insert tableName="SALESPROJECT_FORECAST">
@@ -129,7 +129,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2017-06-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1.4"/>
+        <column name="VOLUME" valueNumeric="1400"/>
    </insert>
    
    <insert tableName="SALESPROJECT_FORECAST">
@@ -142,7 +142,7 @@
        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>

        <column name="DATE_START" valueDate="2017-05-13T09:03:43"/>
-        <column name="VOLUME" valueNumeric="1.2"/>
+        <column name="VOLUME" valueNumeric="1200"/>
    </insert>

    <insert tableName="SALESPROJECT_COMPETITION">

--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/reasons/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/reasons/customproperties/translate4log/property.js
-import("system.result");
-import("Keyword_lib");
-import("system.text");
-import("Loghistory_lib");
-import("KeywordRegistry_basic")
-
-var params = Translate4LogParams.load();
-var reasons = params.value;
-if (reasons)
-{
-    reasons = text.decodeMS(reasons);
-    if (reasons.length)
-    {
-        var keywordMap = {};
-        KeywordUtils.getEntryNamesAndIdsByContainer(
-            $KeywordRegistry.salesprojectWonLost(), 
-            params.locale
-        ).forEach(function (keyword)
-        {
-            this[keyword[0]] = keyword[1];
-        }, keywordMap);
-        reasons = reasons.map(function (reasonId)
-        {
-            return this[reasonId];
-        }, keywordMap).join(", ");
-    }
-    else
-        reasons = "";
-}
-result.string(reasons);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("system.text");
+import("Loghistory_lib");
+import("KeywordRegistry_basic")
+import("KeywordData_lib")
+
+var params = Translate4LogParams.load();
+var res = "";
+var reasons = params.value;
+if (reasons)
+{
+    reasons = text.decodeMS(reasons);
+    if (reasons.length)
+    {
+        var keywordMap = KeywordData.getKeyIdMap($KeywordRegistry.salesprojectWonLost(), params.locale);
+        //translate and join all keyIds to titles, if not found the value is discarded
+        res = reasons.reduce(function (accumulator, currentVal){
+            if (keywordMap[currentVal])
+            {
+                if (accumulator != "")
+                    return accumulator + ", " + keywordMap[currentVal];
+                else
+                    return keywordMap[currentVal];
+            }
+            else 
+                return accumulator;
+        }, "");
+    }
+}
+result.string(res);
\ No newline at end of file
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>360Degree_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <title>360 Degree</title>
@@ -29,7 +29,6 @@
    </entityParameter>
    <entityProvider>
      <name>OrganisationObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <targetContextField>TARGET_CONTEXT</targetContextField>
      <targetIdField>TARGET_ID</targetIdField>
      <dependencies>
@@ -68,7 +67,6 @@
    </entityField>
    <entityProvider>
      <name>PersonObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <targetContextField>TARGET_CONTEXT</targetContextField>
      <targetIdField>TARGET_ID</targetIdField>
      <dependencies>
@@ -99,7 +97,6 @@
      <children>
        <entityActionField>
          <name>newOffer</name>
-          <fieldType>ACTION</fieldType>
          <title>Offer</title>
          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js</onActionProcess>
          <iconId>VAADIN:CART</iconId>
@@ -107,7 +104,6 @@
        </entityActionField>
        <entityActionField>
          <name>newSalesproject</name>
-          <fieldType>ACTION</fieldType>
          <title>Salesproject</title>
          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js</onActionProcess>
          <iconId>VAADIN:BOOK_DOLLAR</iconId>
@@ -115,7 +111,6 @@
        </entityActionField>
        <entityActionField>
          <name>newContract</name>
-          <fieldType>ACTION</fieldType>
          <title>Contract</title>
          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js</onActionProcess>
          <iconId>VAADIN:FILE_TEXT</iconId>
@@ -124,7 +119,6 @@
        </entityActionField>
        <entityActionField>
          <name>newCampaignParticipant</name>
-          <fieldType>ACTION</fieldType>
          <title>Add to Campaign</title>
          <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js</onActionProcess>
          <iconId>NEON:GROUP_APPOINTMENT</iconId>

--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>ActivityLink_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <title>Connection</title>
@@ -35,7 +35,6 @@
    </entityField>
    <entityProvider>
      <name>Links</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <targetContextField>OBJECT_TYPE</targetContextField>
      <targetIdField>OBJECT_ROWID</targetIdField>
      <recordContainer>db</recordContainer>
@@ -56,7 +55,6 @@
    </entityProvider>
    <entityConsumer>
      <name>Objects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Object_entity</entityName>
@@ -73,7 +71,6 @@
    </entityConsumer>
    <entityConsumer>
      <name>Context</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Context_entity</entityName>

--- a/entity/Activity_entity/Activity_entity.aod
+++ b/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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>Activity_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
@@ -96,7 +96,6 @@
    </entityParameter>
    <entityConsumer>
      <name>Documents</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Document_entity</entityName>
@@ -118,7 +117,6 @@
    </entityConsumer>
    <entityConsumer>
      <name>MainDocuments</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <stateProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
      <dependency>
        <name>dependency</name>
@@ -153,7 +151,6 @@
    </entityField>
    <entityConsumer>
      <name>Links</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>ActivityLink_entity</entityName>
@@ -168,7 +165,6 @@
    </entityConsumer>
    <entityConsumer>
      <name>KeywordDirections</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>KeywordEntry_entity</entityName>
@@ -184,7 +180,6 @@
    </entityConsumer>
    <entityProvider>
      <name>LinkedObjects</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
      <recordContainer>db</recordContainer>
      <dependencies>
@@ -282,7 +277,6 @@
    </entityField>
    <entityConsumer>
      <name>ModuleTrees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>ModuleTree_entity</entityName>
@@ -303,7 +297,6 @@
    </entityConsumer>
    <entityActionField>
      <name>newActivity</name>
-      <fieldType>ACTION</fieldType>
      <title>New activity</title>
      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
      <iconId>NEON:HISTORY</iconId>
@@ -312,7 +305,6 @@
    </entityActionField>
    <entityActionField>
      <name>newTask</name>
-      <fieldType>ACTION</fieldType>
      <title>New task</title>
      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
      <actionOrder v="1" />
@@ -342,7 +334,6 @@
    </entityField>
    <entityConsumer>
      <name>KeywordCategories</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>KeywordEntry_entity</entityName>
@@ -364,7 +355,6 @@
    </entityField>
    <entityConsumer>
      <name>Attributes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <onValidation>%aditoprj%/entity/Activity_entity/entityfields/attributes/onValidation.js</onValidation>
      <dependency>
        <name>dependency</name>
@@ -384,7 +374,6 @@
    </entityConsumer>
    <entityActionField>
      <name>newOffer</name>
-      <fieldType>ACTION</fieldType>
      <title>New offer</title>
      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
      <actionOrder v="0" />
@@ -392,7 +381,6 @@
    </entityActionField>
    <entityConsumer>
      <name>Employees</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Employee_entity</entityName>
@@ -407,7 +395,6 @@
    </entityParameter>
    <entityConsumer>
      <name>AttributeTree</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AttributeRelation_entity</entityName>

--- a/entity/Activity_entity/entityfields/attributes/onValidation.js
+++ b/entity/Activity_entity/entityfields/attributes/onValidation.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Attribute_lib");
 import("system.result");

-result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
--- a/entity/Activity_entity/entityfields/direction_icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/direction_icon/valueProcess.js
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
-
-var direction = vars.getString("$field.DIRECTION");
-
-if (direction)
-{
-    // cache to prevent multiple loading of the same icon-names
-    if (vars.exists("$context.cache_activity_dir-icon_" + direction) && vars.get("$context.cache_activity_dir-icon_" + direction))
-    {
-        result.string(vars.get("$context.cache_activity_dir-icon_" + direction));
-    }
-    else
-    {
-        var res = KeywordUtils.getAttributeRelationsByKey(direction, $KeywordRegistry.activityDirection())["icon"];
-
-        if (res)
-        {
-            result.string(res);
-            vars.set("$context.cache_activity_dir-icon_" + direction, res);
-        }
-        else
-        {
-            result.string("");
-            vars.set("$context.cache_activity_dir-icon_" + direction, "");
-        }
-    }
-}
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+var direction = vars.getString("$field.DIRECTION");
+
+var icon = KeywordUtils.getAttributeRelationsByKey(direction, $KeywordRegistry.activityDirection())["icon"];
+result.string(icon || "");
\ No newline at end of file
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>AddressType_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
@@ -19,7 +19,6 @@
    </entityField>
    <entityProvider>
      <name>ByCategory</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <lookupIdfield>KEYID</lookupIdfield>
      <dependencies>
        <entityDependency>

--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>AddressValidation_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
@@ -15,7 +15,6 @@
    </entityField>
    <entityProvider>
      <name>ZipValidaton</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
@@ -74,7 +73,6 @@
    </entityField>
    <entityProvider>
      <name>CityValidation</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
@@ -99,7 +97,6 @@
    </entityParameter>
    <entityProvider>
      <name>FullAddressValidation</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>

--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>Address_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
@@ -87,7 +87,6 @@
    </entityField>
    <entityProvider>
      <name>OrganisationAddresses</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
@@ -125,7 +124,6 @@
    </entityParameter>
    <entityProvider>
      <name>ContactAddresses</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
@@ -167,7 +165,6 @@
    </entityProvider>
    <entityConsumer>
      <name>Countries</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Countries_Entity</entityName>
@@ -176,7 +173,6 @@
    </entityConsumer>
    <entityProvider>
      <name>OrganisationAddressesByContact</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
      <titlePlural>Company Addresses</titlePlural>
      <dependencies>
@@ -223,7 +219,6 @@
    </entityParameter>
    <entityProvider>
      <name>OrganisationAndContactAddresses</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
@@ -267,7 +262,6 @@
    </entityParameter>
    <entityConsumer>
      <name>KeywordAddressTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AddressType_entity</entityName>
@@ -305,7 +299,6 @@
    </entityField>
    <entityConsumer>
      <name>ZipValidation</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AddressValidation_entity</entityName>
@@ -324,7 +317,6 @@
    </entityConsumer>
    <entityConsumer>
      <name>CityValidation</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AddressValidation_entity</entityName>
@@ -355,7 +347,6 @@
    </entityField>
    <entityConsumer>
      <name>FullAddressValidation</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AddressValidation_entity</entityName>

--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>Analyses_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <icon>VAADIN:GRID_BIG_O</icon>

--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>AnyContact_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>

--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>AppointmentLink_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <recordContainer>db</recordContainer>
@@ -42,7 +42,6 @@
    </entityParameter>
    <entityProvider>
      <name>Links</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <targetContextField>OBJECTTYPE</targetContextField>
      <targetIdField>OBJECTID</targetIdField>
      <recordContainer>db</recordContainer>
@@ -64,7 +63,6 @@
    </entityProvider>
    <entityConsumer>
      <name>Context</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Context_entity</entityName>
@@ -73,7 +71,6 @@
    </entityConsumer>
    <entityConsumer>
      <name>Objects</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Object_entity</entityName>
@@ -90,7 +87,6 @@
    </entityConsumer>
    <entityActionField>
      <name>opencontext</name>
-      <fieldType>ACTION</fieldType>
      <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
    </entityActionField>
  </entityFields>

--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>Appointment_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
@@ -77,7 +77,6 @@
      <children>
        <entityActionField>
          <name>accept</name>
-          <fieldType>ACTION</fieldType>
          <title>accept</title>
          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
          <actionOrder v="0" />
@@ -85,7 +84,6 @@
        </entityActionField>
        <entityActionField>
          <name>decline</name>
-          <fieldType>ACTION</fieldType>
          <title>decline</title>
          <description></description>
          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
@@ -93,7 +91,6 @@
        </entityActionField>
        <entityActionField>
          <name>tentative</name>
-          <fieldType>ACTION</fieldType>
          <title>tentative</title>
          <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
          <iconId>VAADIN:QUESTION</iconId>
@@ -154,7 +151,6 @@
    </entityParameter>
    <entityConsumer>
      <name>AppointmentLinks</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AppointmentLink_entity</entityName>

--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>AttributeRelation_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <title>Attribute</title>
@@ -29,7 +29,6 @@
    </entityParameter>
    <entityProvider>
      <name>TreeProvider</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
@@ -110,7 +109,6 @@
    </entityField>
    <entityConsumer>
      <name>SpecificAttribute</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Attribute_entity</entityName>
@@ -137,7 +135,6 @@
      <children>
        <entityActionField>
          <name>edit</name>
-          <fieldType>ACTION</fieldType>
          <onActionProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
          <iconId>NEON:PENCIL</iconId>
          <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
@@ -152,7 +149,6 @@
    </entityParameter>
    <entityProvider>
      <name>AttributeRelations</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>

--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
@@ -4,5 +4,5 @@ import("system.vars");

 var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
 var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
-if (rowId)
+if (vars.get("$param.GetTree_param") == "true" && rowId)
    result.object(AttributeRelationUtils.countAttributeRelations(rowId, objectType));
\ No newline at end of file
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>AttributeUsage_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
@@ -33,7 +33,6 @@
    </entityField>
    <entityProvider>
      <name>SpecificAttribute</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <recordContainer>db</recordContainer>
      <dependencies>
        <entityDependency>
@@ -69,7 +68,6 @@
    </entityField>
    <entityConsumer>
      <name>Context</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Context_entity</entityName>

--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_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.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
  <name>Attribute_entity</name>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
@@ -24,7 +24,9 @@
      <name>ATTRIBUTE_TYPE</name>
      <title>Type</title>
      <consumer>KeywordAttributeTypes</consumer>
-      <mandatory v="true" />
+      <mandatory v="false" />
+      <mandatoryProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/mandatoryProcess.js</mandatoryProcess>
+      <state>READONLY</state>
      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
      <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
@@ -47,7 +49,6 @@
    </entityField>
    <entityConsumer>
      <name>AttributeChildren</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/stateProcess.js</stateProcess>
      <dependency>
        <name>dependency</name>
@@ -71,7 +72,6 @@
    </entityConsumer>
    <entityProvider>
      <name>AttributeParent</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <dependencies>
        <entityDependency>
          <name>18bd148d-bed3-429f-ba54-c5eac76c5083</name>
@@ -108,7 +108,6 @@
    </entityParameter>
    <entityConsumer>
      <name>AttributeUsages</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>AttributeUsage_entity</entityName>
@@ -141,7 +140,6 @@
    </entityField>
    <entityConsumer>
      <name>KeywordAttributeTypes</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>KeywordEntry_entity</entityName>
@@ -151,7 +149,7 @@
        <entityParameter>
          <name>ContainerName_param</name>
          <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
+          <expose v="true" />
          <triggerRecalculation v="true" />
        </entityParameter>
      </children>
@@ -176,7 +174,6 @@
    </entityParameter>
    <entityProvider>
      <name>SpecificAttribute</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <lookupIdfield>UID</lookupIdfield>
      <dependencies>
        <entityDependency>
@@ -230,7 +227,6 @@
      <children>
        <entityActionField>
          <name>newChildAttribute</name>
-          <fieldType>ACTION</fieldType>
          <title>New attribute</title>
          <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
          <isMenuAction v="true" />
@@ -259,7 +255,6 @@
    </entityField>
    <entityProvider>
      <name>AttributeGroups</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
      <children>
        <entityParameter>
          <name>GetGroups_param</name>
@@ -278,7 +273,6 @@
    </entityProvider>
    <entityConsumer>
      <name>AttributeGroup</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
      <dependency>
        <name>dependency</name>
        <entityName>Attribute_entity</entityName>
@@ -315,6 +309,12 @@
      <expose v="true" />
      <description>PARAMETER</description>
    </entityParameter>
+    <entityParameter>
+      <name>AttributeTypeState_param</name>
+      <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributetypestate_param/valueProcess.js</valueProcess>
+      <expose v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
  </entityFields>
  <recordContainers>
    <jDitoRecordContainer>

--- a/entity/Attribute_entity/entityfields/attribute_type/mandatoryProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/mandatoryProcess.js
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var res = true;
+var state = vars.get("$param.AttributeTypeState_param");
+
+if (state == neon.COMPONENTSTATE_READONLY)
+    res = false;
+
+result.string(res);
\ No newline at end of file