diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
index 0841eef8f6460bdc336baaaceb6eab057d601e87..8262731b75b6a2217d60e0be416960aadf233864 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
@@ -174,7 +174,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
- <column name="INFO" value="Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut"/>
+ <column name="INFO" value="<p>Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut</p> "/>
<column name="RESPONSIBLE" value="Admin"/>
<column name="SUBJECT" value="Einladung Messe"/>
<column name="USER_NEW" value="Admin"/>
@@ -412,7 +412,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-12T02:02:52"/>
- <column name="INFO" value="Terminvorschlag gesendet. Aufgabe gestellt"/>
+ <column name="INFO" value="<p>Terminvorschlag gesendet. Aufgabe gestellt</p> "/>
<column name="RESPONSIBLE" value="Admin"/>
<column name="SUBJECT" value="Präsentation: Terminvorschlag"/>
<column name="USER_NEW" value="Admin"/>
@@ -484,7 +484,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
- <column name="INFO" value="Angebot nachfassen, wir liegen vor Wettbewerb"/>
+ <column name="INFO" value="<p>Angebot nachfassen, wir liegen vor Wettbewerb</p> "/>
<column name="RESPONSIBLE" value="Admin"/>
<column name="SUBJECT" value="Angebot nachfassen"/>
<column name="USER_NEW" value="Admin"/>
@@ -700,7 +700,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-02-22T03:41:22"/>
- <column name="INFO" value="erworben von Roboterabteilung"/>
+ <column name="INFO" value="<p>erworben von Roboterabteilung</p> "/>
<column name="RESPONSIBLE" value="Admin"/>
<column name="SUBJECT" value="Kauf der Maschine von KUKA, Augsburg"/>
<column name="USER_NEW" value="Admin"/>
@@ -711,7 +711,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
- <column name="INFO" value="Spezifikation ausgefüllt und abgeschickt"/>
+ <column name="INFO" value="<p>Spezifikation ausgefüllt und abgeschickt</p> "/>
<column name="RESPONSIBLE" value="Admin"/>
<column name="SUBJECT" value="Muster"/>
<column name="USER_NEW" value="Admin"/>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 81e7a7e32838e48bfb03d11c1f19887ef8cabc30..ddbbc5bc0918b30506c6eeb149e695d904e12a09 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -22,7 +22,7 @@
</entityField>
<entityField>
<name>GROUPCODE</name>
- <title>Product</title>
+ <title>Product Group</title>
<consumer>KeywordProductGroupcodes</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index fa1caa6ca248d3abbb7da01ba1ee8db2d9fbbf5b..55ac5773b3cb1302c26846d766e066c70d64222f 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -2,6 +2,7 @@ import("system.db");
import("system.translate");
import("system.result");
import("system.vars");
+import("system.neon");
import("ObjectRelation_lib");
import("Context_lib");
import("Sql_lib");
@@ -238,9 +239,15 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
onConditionForRelationTypeJoin = newWhere("AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum)
.and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
.and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
- .and("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId)
.andIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", pObjectRelationId || null); // set id to null, as only null works with .andIfSet
+ // wird benoetigt zum Bearbeiten
+ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ onConditionForRelationTypeJoin.and("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID", pObjectId);
+ else
+ onConditionForRelationTypeJoin.and("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId);
+
+
// exclude previous node
if (!pPrevId)
onConditionForRelationTypeJoin.and("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID is not null");
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d2f136356913dc5ed1ab126b38dce5e40e165ddd..87871e04a0b855f31100bc83b883457f13f11d72 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -24,7 +24,7 @@
</entityField>
<entityField>
<name>GROUPCODEID</name>
- <title>Product group</title>
+ <title>Product Group</title>
<consumer>KeywordProductGroupcodes</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index 2c31f603738fa26bdd6e905718259e6545517b64..412433f0950fd8d93d64fee60e73c9d96b126e4f 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -77,7 +77,7 @@
</entityField>
<entityField>
<name>GROUP</name>
- <title>Product group</title>
+ <title>Product Group</title>
</entityField>
<entityField>
<name>FORECASTPRICE</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 105398a706ff0386ecf6d5bce687eb9c36da69be..ee00b16f3d6133e3ef370e383e87e3abef6b16fb 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6761,6 +6761,15 @@
<entry>
<key>set New</key>
</entry>
+ <entry>
+ <key>Product Group</key>
+ </entry>
+ <entry>
+ <key>Version %0</key>
+ </entry>
+ <entry>
+ <key>data</key>
+ </entry>
<entry>
<key>Offer No.</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 6975e70487dbd3250e2b76293bf4b690a2703613..7dd5d2d36f49bffcd5aea44659df52f988a76f78 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8667,6 +8667,16 @@ Bitte Datumseingabe prüfen</value>
<key>set New</key>
<value>Neu setzen</value>
</entry>
+ <entry>
+ <key>Product Group</key>
+ <value>Produktgruppe</value>
+ </entry>
+ <entry>
+ <key>Version %0</key>
+ </entry>
+ <entry>
+ <key>data</key>
+ </entry>
<entry>
<key>Offer No.</key>
<value>Angebots Nr.</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index a395b703c587a2094728d8f0496b0533b29995a9..06a6494ca0a53643c3a58a6b8e3abbfd68f8dd2c 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6826,6 +6826,15 @@
<entry>
<key>set New</key>
</entry>
+ <entry>
+ <key>Product Group</key>
+ </entry>
+ <entry>
+ <key>Version %0</key>
+ </entry>
+ <entry>
+ <key>data</key>
+ </entry>
<entry>
<key>Offer No.</key>
</entry>