From a4accca217ebe720ff32fc4ff14f997f6ece4b8e Mon Sep 17 00:00:00 2001
From: "p.neub" <p.neub@adito.de>
Date: Tue, 23 Mar 2021 15:39:51 +0100
Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 1075789][Anpassungen
Vertriebsprojekt/Projektteam]
---
.../recordcontainers/db/conditionProcess.js | 2 +-
.../_____LANGUAGE_EXTRA.aod | 70 +++----------------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 20 ++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 30 +++-----
4 files changed, 38 insertions(+), 84 deletions(-)
diff --git a/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js b/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js
index 84a277abacd..0fcb8da638f 100644
--- a/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js
@@ -7,7 +7,7 @@ import("Sql_lib");
import("Keyword_lib");
var cond = newWhere("AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID", KeywordUtils.getCategoryIdByName($KeywordRegistry.MemberRole()));
-
+cond.and("AB_KEYWORD_ENTRY.ISACTIVE", "1");
var usageFilter = vars.get("$param.UsageFilter_param");
var subFilter = vars.get("$param.UsageSubFilter_param");
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 306d58a7e07..a147fbceb55 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -8139,86 +8139,32 @@
<entry>
<key>On site</key>
</entry>
- <entry>
- <key>Event Data</key>
- </entry>
- <entry>
- <key>On Site</key>
- </entry>
- <entry>
- <key>Event Type</key>
- </entry>
- <entry>
- <key>New child product</key>
- </entry>
- <entry>
- <key>Communication: Link</key>
- </entry>
- <entry>
- <key>Event Begin</key>
- </entry>
- <entry>
- <key>Communication: Phone</key>
- </entry>
- <entry>
- <key>Event</key>
- </entry>
- <entry>
- <key>other</key>
- </entry>
- <entry>
- <key>Communication: Mail</key>
- </entry>
- <entry>
- <key>Vacation</key>
- </entry>
- <entry>
- <key>Event End</key>
- </entry>
- <entry>
- <key>On site</key>
- </entry>
<entry>
<key>Price could not be determined</key>
</entry>
<entry>
- <key>Event Data</key>
- </entry>
- <entry>
- <key>On Site</key>
- </entry>
- <entry>
- <key>Event Type</key>
- </entry>
- <entry>
- <key>New child product</key>
+ <key>Volume(€)</key>
</entry>
<entry>
- <key>Communication: Link</key>
+ <key>Value is too small, the minimum is %0</key>
</entry>
<entry>
- <key>Event Begin</key>
+ <key>Invalid value</key>
</entry>
<entry>
- <key>Communication: Phone</key>
+ <key>Object not found</key>
</entry>
<entry>
- <key>Event</key>
+ <key>Value is too big, the maximum is %0</key>
</entry>
<entry>
- <key>other</key>
+ <key>Buying center and internal project team</key>
</entry>
<entry>
- <key>Communication: Mail</key>
+ <key>Feasibility</key>
</entry>
<entry>
- <key>Event End</key>
- </entry>
- <entry>
- <key>On site</key>
- </entry>
- <entry>
- <key>Volume(€)</key>
+ <key>Value must be an integer</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 86b67c980f3..263115c1901 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10749,6 +10749,26 @@ Bitte Datumseingabe prüfen</value>
<key>Feasibility</key>
<value>Machbarkeit</value>
</entry>
+ <entry>
+ <key>Initiator</key>
+ <value>Initiator</value>
+ </entry>
+ <entry>
+ <key>Influencer</key>
+ <value>Influencer</value>
+ </entry>
+ <entry>
+ <key>Buyer</key>
+ <value>Einkäufer</value>
+ </entry>
+ <entry>
+ <key>Internal Sales</key>
+ <value>Intern: Vertrieb</value>
+ </entry>
+ <entry>
+ <key>Internal responsible</key>
+ <value>Intern: Gebietsverantwortlich</value>
+ </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 2b283bd120f..bd409fc49c9 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -8221,43 +8221,31 @@
<key>Vacation</key>
</entry>
<entry>
- <key>On Site</key>
- </entry>
- <entry>
- <key>New child product</key>
- </entry>
- <entry>
- <key>Communication: Link</key>
- </entry>
- <entry>
- <key>Communication: Phone</key>
- </entry>
- <entry>
- <key>Communication: Mail</key>
+ <key>Price could not be determined</key>
</entry>
<entry>
- <key>Vacation</key>
+ <key>Volume(€)</key>
</entry>
<entry>
- <key>Price could not be determined</key>
+ <key>Value is too small, the minimum is %0</key>
</entry>
<entry>
- <key>On Site</key>
+ <key>Invalid value</key>
</entry>
<entry>
- <key>New child product</key>
+ <key>Object not found</key>
</entry>
<entry>
- <key>Communication: Link</key>
+ <key>Value is too big, the maximum is %0</key>
</entry>
<entry>
- <key>Communication: Phone</key>
+ <key>Buying center and internal project team</key>
</entry>
<entry>
- <key>Communication: Mail</key>
+ <key>Feasibility</key>
</entry>
<entry>
- <key>Volume(€)</key>
+ <key>Value must be an integer</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
--
GitLab