diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 51c8902f8ed67138ad0b9bd713a8c7f463f3440a..ee903cf09e9a7e224a5f8c7c9e0f303354a8b3ec 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,152 +1,153 @@
-<?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">
- <name>DocumentTemplateLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DATE_EDIT</name>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATE_ID_PARENT</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATELINKID</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATE_ID_CHILD</name>
- <consumer>Attachments</consumer>
- <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>DocumentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Attachments</name>
- <title></title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Attachments</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>Links</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>DocumentId_param</name>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>Type_param</name>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>Type_param</name>
- <expose v="true" />
- <triggerRecalculation v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
- <tableName>DOCUMENTTEMPLATELINK</tableName>
- <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATELINKID.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</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.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
+ <name>DocumentTemplateLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Attachment</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID_PARENT</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATELINKID</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID_CHILD</name>
+ <consumer>Attachments</consumer>
+ <linkedContext>DocumentTemplate</linkedContext>
+ <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Attachments</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Links</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Type_param</name>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
+ <tableName>DOCUMENTTEMPLATELINK</tableName>
+ <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATELINKID.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 024c1447f42309f830061978bdc798cc6bdaa440..460033f4b5aefe62b46439933e20fb125c8a9c47 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,8 +1,8 @@
<?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>DocumentTemplateTypeCategory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <titleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/titleProcess.js</titleProcess>
+ <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js b/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..554c806f6eba1b0e1f71ea1b1b1b9dc8f032b094
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index a3509daefc01d27ed4502fe0b6b3df024dbb8611..e261bf0ca52946813c1dfcda1593ed3de4d2be93 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,9 +1,10 @@
<?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>DocumentTemplate_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:FILE_FONT</icon>
- <titleProcess>%aditoprj%/entity/DocumentTemplate_entity/titleProcess.js</titleProcess>
+ <title>Document Template</title>
+ <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -36,6 +37,7 @@
<title>Type</title>
<consumer>KeywordDocumentTemplateType</consumer>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
</entityField>
@@ -111,7 +113,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -131,7 +133,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -150,6 +152,8 @@
<contentType>HTML</contentType>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>texText</name>
@@ -157,6 +161,8 @@
<contentType>LONG_TEXT</contentType>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CLASSIFICATION</name>
@@ -164,6 +170,7 @@
<consumer>DocumentTemplateTypeCategory</consumer>
<state>DISABLED</state>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>DocumentTemplateTypeCategory</name>
@@ -197,7 +204,6 @@
</entityProvider>
<entityConsumer>
<name>Links</name>
- <title>Attachment</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
<dependency>
@@ -235,6 +241,12 @@
<fieldName>DocumentTemplateText</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>DocumentTemplateTex</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
diff --git a/entity/DocumentTemplate_entity/contentTitleProcess.js b/entity/DocumentTemplate_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..50558aa1c66aa3d4589060db47e5ab49a46eadbd
--- /dev/null
+++ b/entity/DocumentTemplate_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.NAME")));
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fa63d8f1e264fdb9df414a564214a57a2a58868
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.documentTemplateTypeCategory(), vars.get("$field.CLASSIFICATION")));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f466ca039d12607076026cbc9beb07797bf33d83
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.util");
+import("system.db");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+ result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d970a867f246821e5e4b98b5fe9483d8b9cca91
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.util");
+import("system.db");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+ result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..49d3d53d991cc1a864d6db072347af1800f035cf
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
index 4b0594846b2bc749f410dade62902cedcd28f97a..2f13bfd83f2b04a297b4bb3aa174698f30228391 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.db");
import("system.util");
@@ -9,7 +10,7 @@ var bindataUpload = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA")
var filename = "";
var bindata = "";
-if(bindata != "")
+if(bindataUpload != "")
{
filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
bindata = bindataUpload;
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 05c2f6464ab903608dfa0609d6151b91aa6f273f..e662c45cb7d287b5366e964ed126b841e3464ae0 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -7,7 +7,6 @@
<contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:CART</iconId>
- <titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -385,7 +384,7 @@
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
- <expose v="true" />
+ <expose v="false" />
</entityParameter>
</children>
</entityConsumer>
@@ -620,7 +619,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
+ <fieldName>RelationsForSpecificObject</fieldName>
</dependency>
<children>
<entityParameter>
@@ -648,7 +647,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
+ <entityName>AttributeRelationTree_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
@@ -705,18 +704,26 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>chooseTEXHeader</name>
+ <consumer>DocumentTemplateTex</consumer>
+ </entityField>
<entityConsumer>
- <name>LogHistoryConsumer</name>
+ <name>DocumentTemplateTex</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
- <name>tablenames_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Offer_entity/contentTitleProcess.js b/entity/Offer_entity/contentTitleProcess.js
index 98f9e420320b5614344632935f8bb864a240052e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Offer_entity/contentTitleProcess.js
+++ b/entity/Offer_entity/contentTitleProcess.js
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.OfferCode_VersNr_fieldgroup"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..90d0786d0d58c1664a2c481e5583a260dd7da783
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("TEX");
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9738198122152a6fbabc4dd57c08ec73cb8b6e39
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documenttemplatetex/children/documenttemplatetypeclassification_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("3")
\ No newline at end of file
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index b629f50fb310cab7c9b5cd7b2e46dad234b9063d..b5234dd548b0bf391932422e78d422181951f02e 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>DocumentTemplateEdit_view</name>
- <title>Document Template</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:FILE_FONT</icon>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Details</name>
- <editMode v="true" />
- <showDrawer v="false" />
- <entityField>#ENTITY</entityField>
- <title></title>
- <fields>
- <entityFieldLink>
- <name>63388992-5b40-4f1e-a2be-aa35bedbfd2e</name>
- <entityField>BINDATA</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5e68bfdb-b5c9-4ea0-8f5d-152e36262401</name>
- <entityField>NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e3940793-c511-4fb1-93e7-68fb9f614b32</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>de86d66c-8281-4050-946b-a6b35bb01db8</name>
- <entityField>CLASSIFICATION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>850130f7-75b1-42ef-9da9-da98966d6367</name>
- <entityField>htmlText</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf313ea8-821a-4693-8ba2-4246ad8a4f62</name>
- <entityField>texText</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0fed8c5c-1be5-4599-938d-31241c4c9395</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>f146618e-4690-46da-bc02-ea57f3019f02</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>2e118acd-473a-4587-9945-a0ca59012f40</name>
- <entityField>Links</entityField>
- <view>DocumentTemplateLinkMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DocumentTemplateEdit_view</name>
+ <title>Document Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_FONT</icon>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Details</name>
+ <editMode v="true" />
+ <showDrawer v="false" />
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <fields>
+ <entityFieldLink>
+ <name>63388992-5b40-4f1e-a2be-aa35bedbfd2e</name>
+ <entityField>BINDATA</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5e68bfdb-b5c9-4ea0-8f5d-152e36262401</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e3940793-c511-4fb1-93e7-68fb9f614b32</name>
+ <entityField>TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>de86d66c-8281-4050-946b-a6b35bb01db8</name>
+ <entityField>CLASSIFICATION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
+ <entityField>LANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>850130f7-75b1-42ef-9da9-da98966d6367</name>
+ <entityField>htmlText</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf313ea8-821a-4693-8ba2-4246ad8a4f62</name>
+ <entityField>texText</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0fed8c5c-1be5-4599-938d-31241c4c9395</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>2e118acd-473a-4587-9945-a0ca59012f40</name>
+ <entityField>Links</entityField>
+ <view>DocumentTemplateLinkMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8111a7d1-efc0-4588-a5a7-d798b0a8c7bb</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index 75ee9ba67be44bd11a2126af1f0e8e8f00d36df3..0e66b53543dd9c6d6ce3ea2058b025a441d75573 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -1,29 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>DocumentTemplatePreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Card</name>
- <titleField>NAME</titleField>
- <subtitleField>TYPE</subtitleField>
- <entityField>#ENTITY</entityField>
- <title>Document Template</title>
- </cardViewTemplate>
- <neonViewReference>
- <name>632c3a73-41f9-4d95-b394-2699a7200cf1</name>
- <entityField>Links</entityField>
- <view>DocumentTemplateLinkList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
- <entityField>Documents</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DocumentTemplatePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Card</name>
+ <titleField>NAME</titleField>
+ <subtitleField>TYPE</subtitleField>
+ <entityField>#ENTITY</entityField>
+ <title>Document Template</title>
+ </cardViewTemplate>
+ <neonViewReference>
+ <name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
+ <entityField>Documents</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>632c3a73-41f9-4d95-b394-2699a7200cf1</name>
+ <entityField>Links</entityField>
+ <view>DocumentTemplateLinkList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1595b577-7694-49db-bf4f-963f2c00c4d8</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 4bbd9ff96962e74d458ee612745af48cf0c8de30..d260c7f3db7e619420928733753afbf67f468308 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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic2019</projectName>
+ <projectName>xRM-Basic - neon - 2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index c5d0caf1d19e8d98344c26d354d09a4bf1840e76..ece0b8e36a049827b257050e159e263d018c66aa 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -86,3 +86,7 @@ $KeywordRegistry.campaignState$planning = function(){return "e04c9c59-0590-463c-
$KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
$KeywordRegistry.campaignStepState$open = function(){return "bbf69673-2ec6-46f8-b231-684a31be9fbd";};
$KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagementCostCategory";};
+$KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};
+$KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
+$KeywordRegistry.documentTemplateType$mail = function(){return "MAI ";};
+$KeywordRegistry.documentTemplateType$attachment = function(){return "ATT ";};
\ No newline at end of file