diff --git a/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js b/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js index 4324035174a181b6e47009366d4d47156f5c0229..52760cd3adac917421e8cf7e5a045a6d6ce30d67 100644 --- a/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js +++ b/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js @@ -6,6 +6,7 @@ import("system.logging"); import("Keyword_lib"); import("Sql_lib"); import("system.text"); +import("KeywordRegistry_basic"); var pricelistname = vars.get("$field.PRICELIST").trim(); if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !pricelistname) @@ -18,5 +19,5 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !pricelistname) } else { - result.string(KeywordUtils.getViewValue($KeywordRegistry.get.ProductPricelist, vars.get("$field.PRICELIST"))); + result.string(KeywordUtils.getViewValue($KeywordRegistry.productPricelist(), vars.get("$field.PRICELIST"))); } \ No newline at end of file diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod index 5499baa022634247984a2941246147ae77183d41..c576024ce1ce7a626fbe9d26bb7efb6420713168 100644 --- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod +++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod @@ -101,7 +101,7 @@ </entityConsumer> <entityField> <name>ORG_PRICE_POLITICS</name> - <title>Price Politics</title> + <title>Price politics</title> <consumer>KeywordPrice_Politics</consumer> </entityField> <entityField> diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod index 2ec01ce4699a5800b560e5a4c20b668edfb21784..78e5cabbaa80a8758e3052a662f5767fe5e21991 100644 --- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod +++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod @@ -30,8 +30,6 @@ <entityProvider> <name>SalesprojectMembers</name> <fieldType>DEPENDENCY_IN</fieldType> - <targetContextField>TARGETCONTEXT</targetContextField> - <targetIdField>CONTACT_ID</targetIdField> <recordContainer>db</recordContainer> <dependencies> <entityDependency> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index c296a6d5b7327fc7b1164cd4ed027063141a5314..4baa4574a45806c0993e401a200959da763462fa 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -1932,6 +1932,7 @@ </entry> <entry> <key>Pieces</key> + <value>Stück</value> </entry> <entry> <key>Heard Island and McDonald Islands</key> @@ -2245,6 +2246,7 @@ </entry> <entry> <key>Kgs</key> + <value>Kg</value> </entry> <entry> <key>Australia</key> @@ -2317,6 +2319,7 @@ </entry> <entry> <key>Hours</key> + <value>Stunden</value> </entry> <entry> <key>Special price list1</key> @@ -2763,6 +2766,9 @@ <entry> <key>the specified key has to be unique for that container but does already exist</key> </entry> + <entry> + <key>Estimation</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 647509f8eefbab504f14212ed4ae93b23ffc269e..2706834c9bd2202b6fc5a8db92a380eec72a3c64 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -2406,6 +2406,9 @@ <entry> <key>the specified key has to be unique for that container but does already exist</key> </entry> + <entry> + <key>Estimation</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language>