From ac884b78fd34488197c3530e7726f7df877d0850 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 1 Mar 2019 13:57:51 +0100
Subject: [PATCH] #1035506 Salesproject refactor

---
 .../entityfields/pricelist/displayValueProcess.js           | 3 ++-
 .../SalesprojectCompetition_entity.aod                      | 2 +-
 .../SalesprojectMember_entity/SalesprojectMember_entity.aod | 2 --
 language/_____LANGUAGE_de/_____LANGUAGE_de.aod              | 6 ++++++
 language/_____LANGUAGE_en/_____LANGUAGE_en.aod              | 3 +++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js b/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js
index 4324035174a..52760cd3ada 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 5499baa0226..c576024ce1c 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 2ec01ce4699..78e5cabbaa8 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 c296a6d5b73..4baa4574a45 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 647509f8eef..2706834c9bd 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>
-- 
GitLab