From 180ca3e9a2e4c91b081ea224404c7e23b9dfb46e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 28 Feb 2019 11:37:39 +0100
Subject: [PATCH] KeywordRegistry usages
---
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 3 ++-
.../category.displayvalue/expression.js | 9 +++++----
.../direction.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../addr_type.displayvalue/expression.js | 11 ++++++-----
.../attribute_type/displayValueProcess.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../attribute_type.displayvalue/expression.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../medium_id.displayvalue/expression.js | 9 +++++----
.../valueProcess.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../entityfields/image/valueProcess.js | 3 ++-
.../contractstatus.displayvalue/expression.js | 3 ++-
.../contracttype.displayvalue/expression.js | 3 ++-
.../payment.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../type.displayvalue/expression.js | 3 ++-
.../currency/displayValueProcess.js | 17 +++++++++--------
.../entityfields/image/valueProcess.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../currency.displayvalue/expression.js | 3 ++-
.../probability.displayvalue/expression.js | 9 +++++----
.../status.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../groupcodeid.displayvalue/expression.js | 3 ++-
.../unit.displayvalue/expression.js | 3 ++-
.../currency/displayValueProcess.js | 17 +++++++++--------
.../entityfields/image/valueProcess.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../currency.displayvalue/expression.js | 3 ++-
.../status.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../groupcodeid.displayvalue/expression.js | 3 ++-
.../unit.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../price_politics.displayvalue/expression.js | 9 +++++----
.../status.displayvalue/expression.js | 3 ++-
.../strength.displayvalue/expression.js | 9 +++++----
.../type.displayvalue/expression.js | 3 ++-
.../weakness.displayvalue/expression.js | 9 +++++----
.../children/containername_param/code.js | 3 ++-
.../gender.displayvalue/expression.js | 3 ++-
.../source_id/possibleItemsProcess.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../groupcodeid.displayvalue/expression.js | 3 ++-
.../unit.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../currency.displayvalue/expression.js | 3 ++-
.../pricelist.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 3 ++-
.../expression.js | 9 +++++----
.../org_strength.displayvalue/expression.js | 9 +++++----
.../org_weakness.displayvalue/expression.js | 9 +++++----
.../phase.displayvalue/expression.js | 9 +++++----
.../reason.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../groupcode.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../expression.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../source.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../estimationvalue.displayvalue/expression.js | 9 +++++----
.../phase.displayvalue/expression.js | 9 +++++----
.../probability.displayvalue/expression.js | 3 ++-
.../state.displayvalue/expression.js | 9 +++++----
.../children/containername_param/code.js | 3 ++-
.../warehouse.displayvalue/expression.js | 3 ++-
.../children/containername_param/code.js | 9 +++++----
.../children/containername_param/code.js | 3 ++-
.../children/containername_param/code.js | 3 ++-
.../priority.displayvalue/expression.js | 9 +++++----
.../status.displayvalue/expression.js | 3 ++-
.../type.displayvalue/expression.js | 3 ++-
.../recordcontainers/jdito/contentProcess.js | 5 +++--
process/KeywordRegistry_basic/process.js | 14 ++++++++++++--
process/Offer_lib/process.js | 3 ++-
process/Organisation_lib/process.js | 3 ++-
100 files changed, 322 insertions(+), 213 deletions(-)
diff --git a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
index b1083f22c88..7b43ff2f6be 100644
--- a/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
+++ b/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.ActivityCategory);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.activityCategory());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js b/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
index 8cfc283099c..c135c700dd8 100644
--- a/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
+++ b/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ActivityDirection);
\ No newline at end of file
+result.string($KeywordRegistry.activityDirection());
\ 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
index b6f62dcf12a..5337285ee96 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityCategory, "ACTIVITY.CATEGORY");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.activityCategory(), "ACTIVITY.CATEGORY");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
index 1c43b5f520a..41920efa9a9 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityDirection, "ACTIVITY.DIRECTION");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.activityDirection(), "ACTIVITY.DIRECTION");
result.string(sql);
diff --git a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
index d94b1e852be..167d3dc35f3 100644
--- a/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
+++ b/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.AddressType);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 2ffc9444b90..34af55ea17e 100644
--- a/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
+++ b/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AddressType, "ADDRESS.ADDR_TYPE");
-result.string(sql);
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.addressType(), "ADDRESS.ADDR_TYPE");
+result.string(sql);
diff --git a/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
index 619f63d8dcc..1b16072cc5a 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
@@ -4,10 +4,11 @@ import("system.result");
import("system.vars");
import("Attribute_lib");
import("Keyword_lib");
+import("KeywordRegistry_basic");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
{
var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
if (type == $AttributeTypes.COMBO)
- result.string(KeywordUtils.getViewValue($KeywordRegistry.get.AttributeType, $AttributeTypes.COMBOVALUE));
+ result.string(KeywordUtils.getViewValue($KeywordRegistry.attributeType(), $AttributeTypes.COMBOVALUE));
}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js
index 437ff727d34..dc6dfca3329 100644
--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.AttributeType);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.attributeType());
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
index 8c745d3aa36..70d91a13284 100644
--- a/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
+++ b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AttributeType, "AB_ATTRIBUTE.ATTRIBUTE_TYPE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "AB_ATTRIBUTE.ATTRIBUTE_TYPE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
index 017dca7fccd..8f3681332b3 100644
--- a/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
+++ b/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.CommunicationMedium);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 8ca588b73c6..5fb31db85d8 100644
--- a/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
+++ b/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.CommunicationMedium, "COMMUNICATION.MEDIUM_ID");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationMedium(), "COMMUNICATION.MEDIUM_ID");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js b/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
index 279ddaaf279..5739345823b 100644
--- a/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
@@ -2,8 +2,9 @@ import("system.translate");
import("system.vars");
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var contractType = KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.get("$field.CONTRACTTYPE"));
+var contractType = KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.get("$field.CONTRACTTYPE"));
var contractCode = vars.get("$field.CONTRACTCODE");
result.string((contractType || translate.text("Contract")) + " " + contractCode);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
index 54ff29d035d..f17d453fcdc 100644
--- a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
+result.string($KeywordRegistry.contractPayment());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
index 54ff29d035d..f17d453fcdc 100644
--- a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
+result.string($KeywordRegistry.contractPayment());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
index 0fe52ea7a19..8b185106748 100644
--- a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ContractType);
\ No newline at end of file
+result.string($KeywordRegistry.contractType());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/image/valueProcess.js b/entity/Contract_entity/entityfields/image/valueProcess.js
index 0219288c0b8..7d2a0e8c8f6 100644
--- a/entity/Contract_entity/entityfields/image/valueProcess.js
+++ b/entity/Contract_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
import("system.vars");
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.contractType(), vars.getString("$field.CONTRACTTYPE")) );
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
index d84fac9571b..8e21b7b2cfa 100644
--- a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractStatus, "CONTRACT.CONTRACTSTATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACT.CONTRACTSTATUS");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
index 5f5e46ae862..dbf92aa783a 100644
--- a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractType, "CONTRACT.CONTRACTTYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACT.CONTRACTTYPE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
index 51b49d23059..a2edaa56105 100644
--- a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractPayment, "CONTRACT.PAYMENT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractPayment(), "CONTRACT.PAYMENT");
result.string(sql);
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js b/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js
index aee5aa764b5..e52675c31d5 100644
--- a/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js
+++ b/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.KeywordAttributeType);
\ No newline at end of file
+result.string($KeywordRegistry.keywordAttributeType());
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index 4095a1df3b8..a08460ea208 100644
--- a/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.KeywordAttributeType, "AB_KEYWORD_ATTRIBUTE.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.keywordAttributeType(), "AB_KEYWORD_ATTRIBUTE.TYPE");
result.string(sql);
diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
index 251895de0ca..c82efe19555 100644
--- a/entity/Offer_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
@@ -1,9 +1,10 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
-{
- var currency = KeywordUtils.getViewValue($KeywordRegistry.get.Currency, vars.get("$param.OfferCurrency_param"));
- result.string(currency);
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
+{
+ var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OfferCurrency_param"));
+ result.string(currency);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/image/valueProcess.js b/entity/Offer_entity/entityfields/image/valueProcess.js
index 4705d8645a4..17664f2a052 100644
--- a/entity/Offer_entity/entityfields/image/valueProcess.js
+++ b/entity/Offer_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
import("system.vars");
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.OfferStatus, vars.getString("$field.STATUS")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.offerStatus(), vars.getString("$field.STATUS")) );
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
index 0ef9cd25651..4c7780fc3a9 100644
--- a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+++ b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
+result.string($KeywordRegistry.currency());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
index 86f885ef0bc..84f4d795193 100644
--- a/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
+++ b/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.OfferStatus);
\ No newline at end of file
+result.string($KeywordRegistry.offerStatus());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
index 6a8622fcede..b5612781a16 100644
--- a/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
+++ b/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.OfferProbability);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.offerProbability());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
index 13bbda5570f..be3be7b53e2 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "OFFER.CURRENCY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "OFFER.CURRENCY");
result.string(sql);
\ 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
index 8718498cbce..e9591dca90a 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferProbability, "OFFER.PROBABILITY");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerProbability(), "OFFER.PROBABILITY");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index e6d5b0c724f..47456c05cd7 100644
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferStatus, "OFFER.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS");
result.string(sql);
diff --git a/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa9..0881ceab580 100644
--- a/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
index c21537814b1..116859e4d94 100644
--- a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+++ b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
index 55e2a9c3ac9..44fe0737367 100644
--- a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "OFFERITEM.GROUPCODEID");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "OFFERITEM.GROUPCODEID");
result.string(sql);
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
index 6804ff9fe01..1f5e5ef5089 100644
--- a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "OFFERITEM.UNIT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "OFFERITEM.UNIT");
result.string(sql);
diff --git a/entity/Order_entity/entityfields/currency/displayValueProcess.js b/entity/Order_entity/entityfields/currency/displayValueProcess.js
index 2519786ebeb..76d0d8a1e70 100644
--- a/entity/Order_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/currency/displayValueProcess.js
@@ -1,9 +1,10 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-
-if (vars.exists("$param.OrderCurrency_param"))
-{
- var currency = KeywordUtils.getViewValue($KeywordRegistry.get.Currency, vars.get("$param.OrderCurrency_param"));
- result.string(currency);
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+if (vars.exists("$param.OrderCurrency_param"))
+{
+ var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OrderCurrency_param"));
+ result.string(currency);
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/image/valueProcess.js b/entity/Order_entity/entityfields/image/valueProcess.js
index 52a10cb1a72..c02371b12be 100644
--- a/entity/Order_entity/entityfields/image/valueProcess.js
+++ b/entity/Order_entity/entityfields/image/valueProcess.js
@@ -1,5 +1,6 @@
import("system.vars");
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.SalesorderState, vars.getString("$field.STATUS")) );
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.getString("$field.STATUS")) );
diff --git a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
index 0ef9cd25651..4c7780fc3a9 100644
--- a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+++ b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
+result.string($KeywordRegistry.currency());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js b/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
index cd95c55b921..21e1ac4efb7 100644
--- a/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
+++ b/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.SalesorderState);
\ No newline at end of file
+result.string($KeywordRegistry.salesorderState());
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
index 260c4da2e24..96a20903efb 100644
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "SALESORDER.CURRENCY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "SALESORDER.CURRENCY");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 57efdee5469..f2b9a0bfd51 100644
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesorderState, "SALESORDER.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS");
result.string(sql);
diff --git a/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa9..0881ceab580 100644
--- a/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
index c21537814b1..116859e4d94 100644
--- a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+++ b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
index c9ff4dc3eed..98962fe2604 100644
--- a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESORDERITEM.GROUPCODEID");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESORDERITEM.GROUPCODEID");
result.string(sql);
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
index 23be3ff92aa..8df589a2cc9 100644
--- a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "SALESORDERITEM.UNIT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "SALESORDERITEM.UNIT");
result.string(sql);
diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
index e01caa2834a..2f4d03edea3 100644
--- a/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ContactStatus);
\ No newline at end of file
+result.string($KeywordRegistry.contactStatus());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js
index 06fbc3ebbb1..9f418ef99a7 100644
--- a/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.OrganisationType);
+result.string($KeywordRegistry.organisationType());
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
index 164f16fcc53..a76a7275341 100644
--- a/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPricePolitics);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 9688e9d0a75..cae1ead3876 100644
--- a/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectStrenght);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 924004e96f5..9973fed72b0 100644
--- a/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectWeakness);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 2b241686b07..d352cbd476f 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/price_politics.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPricePolitics, "ORGANISATION.PRICE_POLITICS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPricePolitics(), "ORGANISATION.PRICE_POLITICS");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index c831d8b5a5d..b63b2d57742 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContactStatus, "CONTACT.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contactStatus(), "CONTACT.STATUS");
result.string(sql);
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
index 622c9e2e8e7..0071a532b79 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/strength.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectStrenght, "ORGANISATION.STRENGTH");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectStrenght(), "ORGANISATION.STRENGTH");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index 619878d59fb..2265271d80a 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OrganisationType, "ORGANISATION.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.organisationType(), "ORGANISATION.TYPE");
result.string(sql);
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
index 5eed0cbf94c..1f3ec844e7b 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/weakness.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js b/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
index 2ebed5250dc..2a130b4196c 100644
--- a/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
+++ b/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.PersonGender);
+result.string($KeywordRegistry.personGender());
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
index e6d8ad46e0f..2ca5eb7d193 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/gender.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.PersonGender, "PERSON.GENDER");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.personGender(), "PERSON.GENDER");
result.string(sql);
diff --git a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js
index 72863229e5c..dbfb722d579 100644
--- a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js
+++ b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js
@@ -4,6 +4,7 @@ import("system.db");
import("system.neon");
import("Keyword_lib");
import("Product_lib");
+import("KeywordRegistry_basic");
var condition = "";
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
@@ -23,7 +24,7 @@ var prods = db.table("select PRODUCTID, GROUPCODEID, PRODUCTNAME, PRODUCTCODE fr
var res = [];
for(var i = 0; i < prods.length; i++)
{
- res.push([prods[i][0], KeywordUtils.getViewValue($KeywordRegistry.get.ProductGroupcode, prods[i][1]) + " / " + prods[i][2] + " / " + prods[i][3]]);
+ res.push([prods[i][0], KeywordUtils.getViewValue($KeywordRegistry.productGroupcode(), prods[i][1]) + " / " + prods[i][2] + " / " + prods[i][3]]);
}
result.object(res);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa9..0881ceab580 100644
--- a/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
index c21537814b1..116859e4d94 100644
--- a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+++ b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
+result.string($KeywordRegistry.quantityUnit());
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
index f2dc8034380..80b33bbf4ed 100644
--- a/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
+++ b/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "PRODUCT.GROUPCODEID");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "PRODUCT.GROUPCODEID");
result.string(sql);
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
index 9a7de904279..fbb5feb1565 100644
--- a/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
+++ b/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "PRODUCT.UNIT");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "PRODUCT.UNIT");
result.string(sql);
diff --git a/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
index 0ef9cd25651..4c7780fc3a9 100644
--- a/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+++ b/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
+result.string($KeywordRegistry.currency());
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js b/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
index df8bbcf76e5..bdea9310b4c 100644
--- a/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
+++ b/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ProductPricelist);
+result.string($KeywordRegistry.productPricelist());
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
index 6cefa2f3b98..49249021849 100644
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "PRODUCTPRICE.CURRENCY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "PRODUCTPRICE.CURRENCY");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
index 2b365d5dbf8..e83ab1dfc88 100644
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductPricelist, "PRODUCTPRICE.PRICELIST");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productPricelist(), "PRODUCTPRICE.PRICELIST");
result.string(sql);
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
index e8da600c125..0fda06efff2 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPhase);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 164f16fcc53..a76a7275341 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPricePolitics);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 9688e9d0a75..cae1ead3876 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectStrenght);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 5eed0cbf94c..1f3ec844e7b 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js
index b855b77f902..cbd1c681941 100644
--- a/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.SalesprojectWonLost);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectWonLost());
\ 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
index 2b241686b07..d352cbd476f 100644
--- 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
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPricePolitics, "ORGANISATION.PRICE_POLITICS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.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
index 622c9e2e8e7..0071a532b79 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectStrenght, "ORGANISATION.STRENGTH");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.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
index 5eed0cbf94c..1f3ec844e7b 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWeakness, "ORGANISATION.WEAKNESS");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.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
index 2a00ab72fd1..09107aba695 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPhase, "SALESPROJECT.PHASE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT.PHASE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
index f3ca32ff036..588db217f86 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectWonLost, "SALESPROJECT_COMPETITION.REASON");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWonLost(), "SALESPROJECT_COMPETITION.REASON");
result.string(sql);
diff --git a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
index d7218938fa9..0881ceab580 100644
--- a/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+++ b/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
+result.string($KeywordRegistry.productGroupcode());
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js b/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
index a381b5188c6..a2590bfa96f 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
+++ b/entity/SalesprojectForecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESPROJECT_FORECAST.GROUPCODE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESPROJECT_FORECAST.GROUPCODE");
result.string(sql);
diff --git a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
index fcae12d10e0..7042000352a 100644
--- a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
+++ b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.SalesprojectMemberRole);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectMemberRole());
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
index c336643dcfc..18c379f4035 100644
--- a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectMemberRole, "SALESPROJECT_MEMBER.SALESPROJECT_ROLE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectMemberRole(), "SALESPROJECT_MEMBER.SALESPROJECT_ROLE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
index 5cda1338b7a..c2806676a54 100644
--- a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
+++ b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.SalesprojectSource);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectSource());
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
index 940b47fc5de..78804de1594 100644
--- a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectSource, "SALESPROJECT_SOURCE.SOURCE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectSource(), "SALESPROJECT_SOURCE.SOURCE");
result.string(sql);
diff --git a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
index 4463ef92a8d..148aaa91247 100644
--- a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectEstimation);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index e8da600c125..0fda06efff2 100644
--- a/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectPhase);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectPhase());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js
index 4eecf47c8cf..6ca842dd15d 100644
--- a/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.SalesprojectProbability);
\ No newline at end of file
+result.string($KeywordRegistry.salesprojectProbability());
\ 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
index 87fd3dd173c..9604353462b 100644
--- a/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
+++ b/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.SalesprojectState);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.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
index 4b115fd1165..eb8f932fddc 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectEstimation, "SALESPROJECT.ESTIMATIONVALUE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.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
index 2a00ab72fd1..09107aba695 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectPhase, "SALESPROJECT.PHASE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT.PHASE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
index a5769eccec4..f5ef49dc97e 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectProbability, "SALESPROJECT.PROBABILITY");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectProbability(), "SALESPROJECT.PROBABILITY");
result.string(sql);
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
index 3760bf66522..fd49eda303b 100644
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectState, "SALESPROJECT.STATE");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "SALESPROJECT.STATE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js b/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js
index e26a2604ef4..96b4ada951a 100644
--- a/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js
+++ b/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.StockWarehouse);
\ No newline at end of file
+result.string($KeywordRegistry.stockWarehouse());
\ No newline at end of file
diff --git a/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js b/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js
index ffecade2a1a..4ff8fe23b40 100644
--- a/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js
+++ b/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.StockWarehouse, "STOCK.WAREHOUSE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.stockWarehouse(), "STOCK.WAREHOUSE");
result.string(sql);
diff --git a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
index 875229a9877..8a4cee16039 100644
--- a/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
+++ b/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js
@@ -1,4 +1,5 @@
-import("system.result");
-import("Keyword_lib");
-
-result.string($KeywordRegistry.get.TaskPriority);
\ No newline at end of file
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js
index 580aeb3de0a..729ee3d1884 100644
--- a/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js
+++ b/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.TaskStatus);
\ No newline at end of file
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js b/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js
index 45a01452c07..308d10e9644 100644
--- a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js
+++ b/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.get.TaskType);
\ No newline at end of file
+result.string($KeywordRegistry.taskType());
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
index b1416e0d693..0b2c6568c32 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
@@ -1,5 +1,6 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskPriority, "TASK.PRIORITY");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskPriority(), "TASK.PRIORITY");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 4af15e0ec64..30eb95f5880 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskStatus, "TASK.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskStatus(), "TASK.STATUS");
result.string(sql);
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index a0b8bddfdcb..8f9ef6854e6 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -1,5 +1,6 @@
import("system.result");
import("Keyword_lib");
+import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.TaskType, "TASK.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskType(), "TASK.TYPE");
result.string(sql);
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index 74fa0b796d4..5e172901d9f 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -7,6 +7,7 @@ import("system.translate");
import("Data_lib");
import("Keyword_lib");
import("Money_lib");
+import("KeywordRegistry_basic");
var turnoverCategory = translate.text('Turnover');
var forecastCategory = translate.text('Forecast');
@@ -14,13 +15,13 @@ var forecastCategory = translate.text('Forecast');
// load data
var sumOfMonthTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, sum(NET + VAT) from SALESORDER group by year(SALESORDERDATE), month(SALESORDERDATE) order by yearNum, monthNum");
var sumOfMonthForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, sum(VOLUME * 1000) from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START) order by yearNum, monthNum");
-var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESORDERITEM.GROUPCODEID") + ") \n\
+var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "SALESORDERITEM.GROUPCODEID") + ") \n\
from SALESORDER \n\
join SALESORDERITEM on SALESORDERITEM.SALESORDER_ID = SALESORDER.SALESORDERID \n\
where SALESORDERITEM.OPTIONAL <> 1 \n\
group by year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE \n\
order by yearNum, monthNum"); // V--V--> there is no VAT/Discount in forecasts V-----> forecasts are grouped by grupcode and have always quantity 1
-var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000), 1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
+var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000), 1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
// build chartData
var rootNode = "";
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index a141d558465..ce5e562a291 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -1,4 +1,3 @@
-
/**
* provides static functionality for a registry of keywords
* The main reason for this is a convenient usage within jdito-code (autocomplete)
@@ -39,4 +38,15 @@ $KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource"};
$KeywordRegistry.salesorderState = function(){return "SalesorderState"};
$KeywordRegistry.salesprojectWonLost = function(){return "SalesprojectWonLost"};
$KeywordRegistry.stockWarehouse = function(){return "StockWarehouse"};
-$KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability"};
\ No newline at end of file
+$KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability"};
+$KeywordRegistry.activityCategory = function(){return "ActivityCategory"};
+$KeywordRegistry.addressType = function(){return "AddressType"};
+$KeywordRegistry.offerProbability = function(){return "OfferProbability"};
+$KeywordRegistry.communicationMedium = function(){return "CommunicationMedium"};
+$KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics"};
+$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness"};
+$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"};
+$KeywordRegistry.salesprojectEstimation = function(){return "SalesprojectEstimation"};
+$KeywordRegistry.salesprojectState = function(){return "SalesprojectState"};
+$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"};
+$KeywordRegistry.taskPriority = function(){return "TaskPriority"};
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 716a56fb2ae..fac87a5a41c 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -14,6 +14,7 @@ import("Report_lib");
import("OfferOrder_lib");
import("PostalAddress_lib");
import("Neon_lib");
+import("KeywordRegistry_basic");
/**
* Methods used by Offer.
@@ -190,7 +191,7 @@ OfferUtils.openOfferReport = function(pOfferID)
row[25], //offercode
text.formatDouble(row[26], translate.text("#,##0.00"), true), //vat
text.formatDouble(itemSum, translate.text("#,##0.00"), true), //itemsum
- KeywordUtils.getViewValue($KeywordRegistry.get.QuantityUnit, row[19]) //unittext
+ KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), row[19]) //unittext
];
});
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 793d7d0ecd7..4eb2065194e 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -6,6 +6,7 @@ import("Report_lib");
import("Sql_lib");
import("Keyword_lib");
import("PostalAddress_lib");
+import("KeywordRegistry_basic");
/**
* a static Utility class for the Org context.
@@ -151,7 +152,7 @@ OrgUtils.openOrgReport = function(pOrgId)
taskData.forEach(function (row)
{
- row[2] = KeywordUtils.getViewValue($KeywordRegistry.get.TaskStatus, row[2]);
+ row[2] = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), row[2]);
_joinArrayVals(row, 3, 2); //join FIRSTNAME and LASTNAME together
});
taskData = ReportData.begin(["SUBJECT", "INFOTEXT", "STATUS", "RESPONSIBLE"]).add(taskData);
--
GitLab