diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 93d6528d6c0a10d8be8120d6b5928436f71899a7..04ded24d59d1c873bbe26652c0286777885ba246 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -16,6 +16,7 @@
<entityField>
<name>DESCRIPTION</name>
<title>Description</title>
+ <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>DOCUMENTTEMPLATEID</name>
@@ -33,6 +34,7 @@
<entityField>
<name>TYPE</name>
<title>Type</title>
+ <consumer>KeywordDocumentTemplateType</consumer>
<mandatory v="true" />
</entityField>
<entityField>
@@ -44,8 +46,9 @@
<mandatory v="true" />
</entityField>
<entityField>
- <name>LANGUAGE_documentmanagement</name>
+ <name>LANGUAGE</name>
<title>Language</title>
+ <consumer>Languages</consumer>
<mandatory v="true" />
</entityField>
<entityField>
@@ -75,6 +78,30 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Languages</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDocumentTemplateType</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -104,7 +131,7 @@
<recordfield>DOCUMENTTEMPLATE.DESCRIPTION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>LANGUAGE_documentmanagement.value</name>
+ <name>LANGUAGE.value</name>
<recordfield>DOCUMENTTEMPLATE.LANGUAGE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d01f72a9ca9c8d5200473ded7df761fc013de5fe
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.documentTemplateType());
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 51e1e3816382908c36c346b3c01aece3e55d6800..a3d25003bc799af6a437321d3ac292084214c741 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -367,6 +367,12 @@
<fieldName>KeywordContactStates</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>1f4a5dd6-38c5-4f62-ad50-61826c9ab4ab</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>KeywordDocumentTemplateType</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 42d80eae1666fa2e9ad84b8bba9f18c1a523f980..397ae3964a5f1ca442f5e0d6a9cc15a6105dd6c0 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -68,6 +68,12 @@
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>bb4074b3-47e8-41d8-bad3-34481a20396a</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
</entityFields>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c5f248c8401c19760de79b504e6da75530ec5d4a..0735ec854ba2248eb7f2350b354a606f47d83f07 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -337,6 +337,10 @@
<key>City</key>
<value>Ort</value>
</entry>
+ <entry>
+ <key>Text Modular</key>
+ <value>Textbaustein</value>
+ </entry>
<entry>
<key>State</key>
<value>Status</value>
@@ -766,6 +770,10 @@
<key>Won</key>
<value>Gewonnen</value>
</entry>
+ <entry>
+ <key>Letter</key>
+ <value>Brief</value>
+ </entry>
<entry>
<key>Checked</key>
<value>Geprüft</value>
@@ -1457,6 +1465,7 @@
</entry>
<entry>
<key>asdf</key>
+ <value></value>
</entry>
<entry>
<key>{$TASK_STATUS}</key>
@@ -1674,6 +1683,10 @@
<key>New attribute</key>
<value>Neues Attribut</value>
</entry>
+ <entry>
+ <key>Attachment</key>
+ <value>Anhang</value>
+ </entry>
<entry>
<key>Solomon Islands</key>
<value>Salomon-Inseln</value>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index 555ab60afb0da74bb4c9e5d4b44f9143d8d56f43..042e06aa4c45d216ac807b16b8eb68d1f5a7eedb 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -26,8 +26,8 @@
<entityField>NAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>ea86f04c-cd45-4d19-b8c7-70288148a9c2</name>
- <entityField>LANGUAGE_documentmanagement</entityField>
+ <name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
+ <entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>0fed8c5c-1be5-4599-938d-31241c4c9395</name>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
index cac4a83b0c53949ced486e78b5554bad0662ba43..85bb1004a41c226653544b65526bd4fb0725c2ee 100644
--- a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -24,8 +24,8 @@
<entityField>TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>d3fc4acc-0754-4e0a-8143-5c90f4a3b9f9</name>
- <entityField>LANGUAGE_documentmanagement</entityField>
+ <name>cb9b2d01-b3a0-4806-9494-94b1f6ad683e</name>
+ <entityField>LANGUAGE</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index de67cb9ddabe8a3cdd5207c11dabcb2d9bb2b4ec..a8c4a893a888db66a67bee15238815623b5ddec3 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -132,4 +132,5 @@
<include relativeToChangelogFile="true" file="create_documenttemplate.xml"/>
<include relativeToChangelogFile="true" file="create_documenttemplatelink.xml"/>
+ <include relativeToChangelogFile="true" file="data/AditoBasic/init_DocumentTemplateType.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
index 448f72ab561a6f45d401d58e19b8f186882c1610..04d875917753fe320147e9b378b9cfcd42fc74d8 100644
--- a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
@@ -1,35 +1,41 @@
<?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="j.hoermann" id="44c06ef1-d9b7-4c5a-a3ee-276ed84caca3">
- <delete tableName="AB_OBJECTRELATION"/>
-
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
+ <changeSet author="d.lechner" id="documentTemplateType-1">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-423e-b130-dp88b2b518ad"/>
+ <column name="KEYID" value="LET"/>
+ <column name="TITLE" value="Letter"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
- <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6f4c6e49-36ca-4b98-ba83-c507203wawal"/>
+ <column name="KEYID" value="MAI"/>
+ <column name="TITLE" value="Mail"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
- <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-9771-b458-6751f137a941"/>
+ <column name="KEYID" value="ATT"/>
+ <column name="TITLE" value="Attachment"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
- <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bb38aa51-ee36-9771-b458-6751f137a941"/>
+ <column name="KEYID" value="TEX"/>
+ <column name="TITLE" value="Text Modular"/>
+ <column name="CONTAINER" value="DocumentTemplateType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/init_DocumentTemplateType.xml b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/init_DocumentTemplateType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..448f72ab561a6f45d401d58e19b8f186882c1610
--- /dev/null
+++ b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/init_DocumentTemplateType.xml
@@ -0,0 +1,35 @@
+<?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="j.hoermann" id="44c06ef1-d9b7-4c5a-a3ee-276ed84caca3">
+ <delete tableName="AB_OBJECTRELATION"/>
+
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
+ </insert>
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
+ <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="OBJECT2_ROWID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
+ </insert>
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
+ <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
+ </insert>
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
+ <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ec0826d23261cb279bb1ac85606d40d91e4495fe..7f6b2df6ecd8d43fe1b75b70c5e98bbbe72b9b40 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -66,4 +66,4 @@ $KeywordRegistry.paymentTerm = function(){return "PaymentTerm";};
$KeywordRegistry.contactDepartment = function(){return "ContactDepartment";};
$KeywordRegistry.contactPosition = function(){return "ContactPosition";};
$KeywordRegistry.contactContactrole = function(){return "ContactContactrole";};
-
+$KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};