diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 3dee6599cf492929231b59053ee737c67fd219d0..4d2a7d0dacffaa7ab4e7c61f52ec92f7b0d16cfc 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,129 +1,129 @@
-<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>AttributeUsage_entity</name>
- <title>Attribute Usage</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>OBJECT_TYPE</name>
- <title>Context</title>
- <possibleItemsProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <contentType>DATE</contentType>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <contentType>DATE</contentType>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- </entityField>
- <entityField>
- <name>AB_ATTRIBUTEUSAGEID</name>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attributeusageid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>AB_ATTRIBUTE_ID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>Attribute_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeUsage_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>attributeId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>MIN_COUNT</name>
- <title>Minimal Count</title>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>MAX_COUNT</name>
- <title>Maximal Count</title>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
- <tableName>AB_ATTRIBUTEUSAGE</tableName>
- <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTE_ID.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTEUSAGEID.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MAX_COUNT.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.MAX_COUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MIN_COUNT.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
+ <name>AttributeUsage_entity</name>
+ <title>Attribute Usage</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Context</title>
+ <possibleItemsProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ </entityField>
+ <entityField>
+ <name>AB_ATTRIBUTEUSAGEID</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attributeusageid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>AB_ATTRIBUTE_ID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>Attribute_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeUsage_dfo</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>attributeId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>MIN_COUNT</name>
+ <title>Minimal Count</title>
+ <contentType>NUMBER</contentType>
+ <searchable v="false" />
+ <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>MAX_COUNT</name>
+ <title>Maximal Count</title>
+ <contentType>NUMBER</contentType>
+ <searchable v="false" />
+ <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
+ <tableName>AB_ATTRIBUTEUSAGE</tableName>
+ <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_ATTRIBUTE_ID.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_ATTRIBUTEUSAGEID.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MAX_COUNT.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.MAX_COUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MIN_COUNT.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 1a0519f21ae114b3e5ad7c3772f4f50df93c387b..e9e08ea81546d62cfee5236feaf4b4f498c296e6 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,152 +1,152 @@
-<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Attribute_entity</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
- <iconId>VAADIN:TAG</iconId>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ATTRIBUTE_NAME</name>
- <title>Name</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>ATTRIBUTE_TYPE</name>
- <title>Type</title>
- <mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- <entityField>
- <name>AB_ATTRIBUTEID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/ab_attributeid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ATTRIBUTE_PARENT_ID</name>
- <title>Parent Attribute</title>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <title>{$DATE_NEW}</title>
- <contentType>DATE</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <title>{$DATE_EDIT}</title>
- <contentType>DATE</contentType>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <title>{$USER_NEW}</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <title>{$USER_EDIT}</title>
- </entityField>
- <entityConsumer>
- <name>AttributeChild_dfo</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <fieldName></fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>AttributeParent_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityParameter>
- <name>attrParentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>AttributeUsage_dfo</name>
- <title>Usage</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeUsage_entity</entityName>
- <fieldName>Attribute_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>attributeId_param</name>
- <code>%aditoprj%/entity/Attribute_entity/entityfields/attributeusage_dfo/children/attributeid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>ATTRIBUTE_ACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>b5fd38e1-b315-4e66-bd68-569dfc04710c</name>
- <tableName>AB_ATTRIBUTE</tableName>
- <primaryKey>AB_ATTRIBUTEID</primaryKey>
- <isUIDTable v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTEID.value</name>
- <recordfield>AB_ATTRIBUTE.AB_ATTRIBUTEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ATTRIBUTE_NAME.value</name>
- <recordfield>AB_ATTRIBUTE.ATTRIBUTE_NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ATTRIBUTE_PARENT_ID.value</name>
- <recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ATTRIBUTE_TYPE.value</name>
- <recordfield>AB_ATTRIBUTE.ATTRIBUTE_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>AB_ATTRIBUTE.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>AB_ATTRIBUTE.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>AB_ATTRIBUTE.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>AB_ATTRIBUTE.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ATTRIBUTE_ACTIVE.value</name>
- <recordfield>AB_ATTRIBUTE.ATTRIBUTE_ACTIVE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
+ <name>Attribute_entity</name>
+ <title>Attributes</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
+ <iconId>VAADIN:TAG</iconId>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ATTRIBUTE_NAME</name>
+ <title>Name</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>ATTRIBUTE_TYPE</name>
+ <title>Type</title>
+ <mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>AB_ATTRIBUTEID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/ab_attributeid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ATTRIBUTE_PARENT_ID</name>
+ <title>Parent Attribute</title>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>{$DATE_NEW}</title>
+ <contentType>DATE</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <title>{$DATE_EDIT}</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <title>{$USER_NEW}</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <title>{$USER_EDIT}</title>
+ </entityField>
+ <entityConsumer>
+ <name>AttributeChild_dfo</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <fieldName></fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityProvider>
+ <name>AttributeParent_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityParameter>
+ <name>attrParentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>AttributeUsage_dfo</name>
+ <title>Usage</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeUsage_entity</entityName>
+ <fieldName>Attribute_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>attributeId_param</name>
+ <code>%aditoprj%/entity/Attribute_entity/entityfields/attributeusage_dfo/children/attributeid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>ATTRIBUTE_ACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_active/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>b5fd38e1-b315-4e66-bd68-569dfc04710c</name>
+ <tableName>AB_ATTRIBUTE</tableName>
+ <primaryKey>AB_ATTRIBUTEID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_ATTRIBUTEID.value</name>
+ <recordfield>AB_ATTRIBUTE.AB_ATTRIBUTEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ATTRIBUTE_NAME.value</name>
+ <recordfield>AB_ATTRIBUTE.ATTRIBUTE_NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ATTRIBUTE_PARENT_ID.value</name>
+ <recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ATTRIBUTE_TYPE.value</name>
+ <recordfield>AB_ATTRIBUTE.ATTRIBUTE_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>AB_ATTRIBUTE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>AB_ATTRIBUTE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>AB_ATTRIBUTE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>AB_ATTRIBUTE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ATTRIBUTE_ACTIVE.value</name>
+ <recordfield>AB_ATTRIBUTE.ATTRIBUTE_ACTIVE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index b1c7a1d8d711c9685f4cfc83236606dc7135d8df..01998eff129713a119a9419833bd636eec7bb1cc 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -235,6 +235,26 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>ObjectRelation_dfo</name>
+ <title>Relations</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelation_entity</entityName>
+ <fieldName>ByAnyObject_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AnyObjectRowid_param</name>
+ <code>%aditoprj%/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectType_param</name>
+ <code>%aditoprj%/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a986948950be876fd394dc2b62dcf465308140a
--- /dev/null
+++ b/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTRACTID"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 4640c44225814795c216579eb41677c27dcd1dc1..b6c7b26e448c60cd09e5abdf7cb3a34aaeef2271 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -306,6 +306,26 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>ObjectRelation_dfo</name>
+ <title>Relations</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelation_entity</entityName>
+ <fieldName>ByAnyObject_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AnyObjectRowid_param</name>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectType_param</name>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b119ebfa1944164fd2a1cb645511740bec9015e
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 033d33fc04f35f7944598bfb79e136c5f4fba547..778e0d52bd98b0136d64642b019f618ba80b7dfb 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,48 +1,48 @@
-<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Turnover_entity</name>
- <title>Turnover</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <iconId>VAADIN:CHART</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Year</title>
- </entityField>
- <entityField>
- <name>Y</name>
- <title>Turnover</title>
- </entityField>
- <entityField>
- <name>PARENT</name>
- <title>Parent</title>
- </entityField>
- <entityField>
- <name>CATEGORY</name>
- <title>Category</title>
- </entityField>
- <entityField>
- <name>X</name>
- <title>Year</title>
- <contentType>TEXT</contentType>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT.value</element>
- <element>CATEGORY.value</element>
- <element>X.value</element>
- <element>Y.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
+ <name>Turnover_entity</name>
+ <title>Turnover</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <iconId>VAADIN:CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Year</title>
+ </entityField>
+ <entityField>
+ <name>Y</name>
+ <title>Turnover</title>
+ </entityField>
+ <entityField>
+ <name>PARENT</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>CATEGORY</name>
+ <title>Category</title>
+ </entityField>
+ <entityField>
+ <name>X</name>
+ <title>Year</title>
+ <contentType>TEXT</contentType>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT.value</element>
+ <element>CATEGORY.value</element>
+ <element>X.value</element>
+ <element>Y.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
index a572f5a1933975f196029cc415471e6e558b4997..597ac9502a58f95a5c666e853338c7f276225c48 100644
--- a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
+++ b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
@@ -13,6 +13,10 @@
<name>ActivityLinkFilter_template</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>2cf427f2-2dcd-4e4e-9f5c-82f103f9cf86</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>27bc9661-7f28-44d6-bda5-1353d8734b7a</name>
<entityField>OBJECT_ROWID</entityField>
diff --git a/neonView/ContractMain_view/ContractMain_view.aod b/neonView/ContractMain_view/ContractMain_view.aod
index 336d5e46fa301c2551cb4476b751d7af0161b54e..1f9ead0fdb3480ff7bbe1976ee5699542ace50f2 100644
--- a/neonView/ContractMain_view/ContractMain_view.aod
+++ b/neonView/ContractMain_view/ContractMain_view.aod
@@ -24,5 +24,10 @@
<entityField>ContractDocument_dfo</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b6b0289f-9faa-42c6-812d-fe4dbc1f3be4</name>
+ <entityField>ObjectRelation_dfo</entityField>
+ <view>ObjectRelationFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 55f37e95a316a49e7d2500e61f9b66c9eda68094..5a39f33825f263214a8315dcf8ae8d5f47ee20de 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -59,5 +59,10 @@
<entityField>SalesprojectTimetracking_dfo</entityField>
<view>TimetrackingFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d02bf839-1901-4ca1-bcee-245ee9512fe2</name>
+ <entityField>ObjectRelation_dfo</entityField>
+ <view>ObjectRelationFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml b/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
index 1a566efa2f35444e50f92ec9f7d4cf6f0e7af249..3b0f9e8e11744d7d8f5856ef93daa961680874c4 100644
--- a/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
+++ b/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
@@ -10,6 +10,7 @@
<include file="system_alias/struct/create_asys_timer.xml"/>
<include file="system_alias/struct/create_asys_users.xml"/>
<include file="system_alias/struct/create_asys_calendarbackend.xml"/>
+ <include file="system_alias/struct/create_asys_calendarlink.xml"/>
<include file="system_alias/data/insert_asys_aliasconfig.xml"/>
<include file="system_alias/data/insert_asys_system.xml"/>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
index 5c486a82cab29b57efc46113650d95a68b0487ef..e98798d6a817f3d16f99e5b106547551a866ba0f 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -19,7 +19,15 @@
<column name="ESTIMATIONVALUE" valueNumeric="2"/>
<column name="PROBABILITY" valueNumeric="30"/>
</insert>
-
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="6dd516b2-7887-4a17-930a-d39607c8b626"/>
+ <column name="USER_NEW" value="admin"/>
+ <column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/>
+ <column name="OBJECT1_TYPE" value="Salesproject_context"/>
+ <column name="OBJECT1_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+ <column name="OBJECT2_TYPE" value="Pers_context"/>
+ <column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ </insert>
<insert tableName="SALESPROJECT_SOURCE">
<column name="SALESPROJECT_SOURCEID" value="1c1f83ad-9e4b-4d0f-b820-98e724e34aec"/>
<column name="USER_NEW" value="admin"/>
diff --git a/others/db_changes/system_alias/struct/create_asys_calendarlink.xml b/others/db_changes/system_alias/struct/create_asys_calendarlink.xml
new file mode 100644
index 0000000000000000000000000000000000000000..568434ad03e91e2c903778a62ec9a4cb3eaccce0
--- /dev/null
+++ b/others/db_changes/system_alias/struct/create_asys_calendarlink.xml
@@ -0,0 +1,20 @@
+<?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.schindlbeck" id="c31ed111-b98d-46b6-b7bf-845420624e28">
+ <createTable tableName="ASYS_CALENDARLINK">
+ <column name="DBALIAS" type="VARCHAR(127)"/>
+ <column name="DBID" type="VARCHAR(1023)">
+ <constraints primaryKey="true" primaryKeyName="PK_ASYS_CALENDARLINK_DBID"/>
+ </column>
+ <column name="DBIDCOLUMN" type="VARCHAR(127)"/>
+ <column name="DBTABLENAME" type="VARCHAR(127)"/>
+ <column name="ENTRYID" type="VARCHAR(512)"/>
+ <column name="ENTRYSTORE" type="VARCHAR(255)"/>
+ <column name="FRAME" type="VARCHAR(1023)"/>
+ <column name="ID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="TITLE" type="VARCHAR(2000)"/>
+ </createTable>
+</changeSet>
+</databaseChangeLog>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 3f9daeb173f0de1d87682e389317618aba75d421..336d6b092bda8ab38166821c8d50c82ace586ceb 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>basic 2019</projectName>
+ <projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 2d5cf378f4e0f0c19ed87cbcd8dc5a611fcbb281..04827e89f5fd11c2839281bc494cb43631c24f75 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -116,7 +116,7 @@ AttributeHandler.prototype.getAttributeContentType = function ()
AttributeHandler.prototype.setAttributeValue = function (pValue)
{
- var field = this.getAttributeField();
+ var field = "$field." + this.getAttributeField();
if (field != null && vars.exists(field))
neon.setFieldValue(field, pValue)
return pValue;