diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 529db43dc538ae9bcd337e7b1b9af89ff79c3eea..25ce4df92392e1a5e8c8847f16471593fb1baefd 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -265,6 +265,21 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>KeywordCategory</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -316,6 +331,10 @@
<name>CREATOR.value</name>
<recordfield>ACTIVITY.CREATOR</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CATEGORY.displayValue</name>
+ <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1083f22c88d6280ef1cb91e22a5169f1f6f8a8c
--- /dev/null
+++ b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.ActivityCategory);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6f62dcf12a4843bb6aac2f820d8dea7024e1c5c
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityCategory, "ACTIVITY.CATEGORY");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 3da30a47df88abadd9685a05c36af3f4edc97cc8..2bbdb1138f4cd0aa58e369b2f30a77cf44ef4314 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -187,6 +187,21 @@
<documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>KeywordAddressType</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -254,6 +269,10 @@
<name>ZIP.value</name>
<recordfield>ADDRESS.ZIP</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDR_TYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..d94b1e852be6638011a6fe581953d25d0e7f339f
--- /dev/null
+++ b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.AddressType);
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js b/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ffc9444b90d2ae8a6b4b14be3099c784ca2912b
--- /dev/null
+++ b/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AddressType, "ADDRESS.ADDR_TYPE");
+result.string(sql);
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 3aea00abca2559bc84bea3e8e90d165fb141e5c7..ec2b11927e9b4149fb5880510eea31658e9f534f 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -174,6 +174,21 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>KeywordMedium</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -211,6 +226,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>STANDARD.value</name>
<recordfield>COMMUNICATION.STANDARD</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MEDIUM_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..017dca7fccdf0ca07d9bbf697823f8c81ee80a95
--- /dev/null
+++ b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.CommunicationMedium);
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js b/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ca588b73c625d4be29961c893115e709df8c2a9
--- /dev/null
+++ b/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.CommunicationMedium, "COMMUNICATION.MEDIUM_ID");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index f51c8dab46ab46b09a0ddb2d02672fcbf66dc3e6..12810a620803ccce6baa9a5eaaea76321c083bd7 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -247,6 +247,96 @@
<fieldName>KeywordProbabilties</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>KeywordCategory</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordProbability</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>fa831dac-3287-422a-8f28-504fc525876a</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>KeywordMedium</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2ed3c1ee-0cae-4017-aaf2-49bf4307abc4</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>KeywordAddressType</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordPrice_Politics</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>KeywordPrice_Politics</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordWeakness</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>854148e2-2532-4562-b393-832819e8d462</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordStrenght</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>613d5861-0494-45f9-a839-a705347a68da</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>KeywordWeakness</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>KeywordStrenght</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>35298a2b-6d6a-4af8-817d-1647068fe1fa</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordEstimation</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordState</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>KeywordPhase</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f672b4a5-7d68-46c8-9834-4f706d0d8720</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordPhase</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordPriority</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index a8c757e5b623e80ef92a703451f2a586dd312cd3..0fc9689963c7d1081dd517b6101e1993bf14e7a8 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -368,6 +368,21 @@
<fieldName>LanguagesISO3Code</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordProbability</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -484,6 +499,10 @@
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PROBABILITY.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a8622fcede40b9a9c31684358e8111fa3065e27
--- /dev/null
+++ b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.OfferProbability);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..8718498cbce42f7e07acc4c4b13302f919791a0e
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferProbability, "OFFER.PROBABILITY");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 7692f06dc4e5c53e9b9a9ba09eaf29c2d6e36c29..fc41a485f2b2366a8d0232671f5519746513e2ea 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -475,6 +475,51 @@
<fieldName>LanguagesISO3Code</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordPrice_Politics</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordWeakness</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStrenght</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -574,6 +619,18 @@
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE_POLITICS.displayValue</name>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>WEAKNESS.displayValue</name>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STRENGTH.displayValue</name>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..164f16fcc53184600073169dd821faa55a3065ff
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectPricePolitics);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..9688e9d0a754f99651c2a111b61da316a9985c20
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectStrenght);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..924004e96f5e1cd0dd125b3f13fedb1b2a7caeb1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectWeakness);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b241686b07844ade69d98f75b616615da5b640e
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPricePolitics, "ORGANISATION.PRICE_POLITICS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..622c9e2e8e7a2129a12cd32045d0946fc1abd5da
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectStrenght, "ORGANISATION.STRENGTH");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..5eed0cbf94ccf6d26e9d0b1bc397dab84bf9e705
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 21629dc90bdbc50be9ea7dcb469904a602c81615..6e1d7e07ad52fbcd5286f9d4770af5fdd83d0072 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -144,6 +144,66 @@
<title>Phase</title>
<possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/phase/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
+ <entityConsumer>
+ <name>KeywordPrice_Politics</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordWeakness</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStrenght</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPhase</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -228,6 +288,22 @@
<name>PHASE.value</name>
<recordfield>SALESPROJECT_COMPETITION.PHASE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_PRICE_POLITICS.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_WEAKNESS.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_STRENGTH.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PHASE.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8da600c125b86a957641c45b60d852b15cd5d93
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectPhase);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..164f16fcc53184600073169dd821faa55a3065ff
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectPricePolitics);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..9688e9d0a754f99651c2a111b61da316a9985c20
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectStrenght);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..5eed0cbf94ccf6d26e9d0b1bc397dab84bf9e705
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b241686b07844ade69d98f75b616615da5b640e
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPricePolitics, "ORGANISATION.PRICE_POLITICS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..622c9e2e8e7a2129a12cd32045d0946fc1abd5da
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectStrenght, "ORGANISATION.STRENGTH");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..5eed0cbf94ccf6d26e9d0b1bc397dab84bf9e705
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a00ab72fd1fe8804847ae5a2cddb88afceb1d77
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPhase, "SALESPROJECT.PHASE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 187aeefd5659a4287be44398fc10894bdb9d090f..3b17aa4a0b591b67d00626a2986e34f918bdc770 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -387,6 +387,51 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordEstimation</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordState</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPhase</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -477,6 +522,18 @@
<name>PROBABILITY.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ESTIMATIONVALUE.displayValue</name>
+ <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATE.displayValue</name>
+ <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PHASE.displayValue</name>
+ <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..4463ef92a8dcc4301c23d3e50d69e6a207c774ad
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectEstimation);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8da600c125b86a957641c45b60d852b15cd5d93
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectPhase);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..87fd3dd173cdd9bd3e1b086108fe1a60bc5f5259
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectState);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b115fd11659f1f86fe6b616f03dbf249c1c2903
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectEstimation, "SALESPROJECT.ESTIMATIONVALUE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a00ab72fd1fe8804847ae5a2cddb88afceb1d77
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPhase, "SALESPROJECT.PHASE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..3760bf66522240508659d3518aaab608058fa7e6
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectState, "SALESPROJECT.STATE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 4e792a2decaf645afe88c4b7bd2b120eea618036..1cc8e7b44dee6184cadf8bdb2cb0b377d9368c94 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -170,6 +170,15 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordPriority</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -250,6 +259,10 @@
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRIORITY.displayValue</name>
+ <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1416e0d693943c2e5f0f6cc5c02d4c89c0689a1
--- /dev/null
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskPriority, "TASK.PRIORITY");
+result.string(sql);
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 336d6b092bda8ab38166821c8d50c82ace586ceb..100174eab9a13777611d079f565208841c187c07 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>xRM-Basic2019</projectName>
+ <projectName>xRM-Basic 2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 6d18e14f0afb4cf3233faf17873928bc8428a445..9e9513540269f8029bcd9e5dbe1f28300314eec2 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -46,6 +46,7 @@ $KeywordRegistry.get = {
StockWarehouse: "StockWarehouse",
SalesprojectProbability: "SalesprojectProbability",
ActivityCategory: "ActivityCategory",
+ AddressType: "AddressType",
OfferProbability: "OfferProbability",
CommunicationMedium: "CommunicationMedium",
SalesprojectPricePolitics: "SalesprojectPricePolitics",