diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 163c51cdc7f2b176c26c5d0adcc87d19b6d59284..79f7324d86cd973eaf6c21897dafab7b5fe3603a 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -150,7 +150,6 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
- <description></description>
</entityParameter>
<entityParameter>
<name>CommMediumIds_param</name>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 1f12bff5323b79ed9f6edba8a2001ec3aafa0216..8700abafd4650353c8782fc1de41ff2a0d90d1f2 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -175,12 +175,6 @@
<fieldName>PersOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
- <entityDependency>
- <name>25e5cc50-0443-4e79-8690-a47197706936</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductOrg_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
<entityDependency>
<name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
<entityName>Salesproject_entity</entityName>
@@ -193,6 +187,12 @@
<fieldName>RelationOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
+ <entityDependency>
+ <name>8bc24adb-78f1-49bb-a41d-79fb29175b27</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
</dependencies>
</entityIncomingField>
<entityOutgoingField>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 2f11cd9cc86a1ad85016e03c4e1fb25573e5996c..d5854ec8bea302412390deefe3d9dbd1d344a51d 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -211,7 +211,7 @@
</children>
</entityOutgoingField>
<entityOutgoingField>
- <name>PersComm_dfo</name>
+ <name>PersComm_dfod</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 19315fb496ebce006bede20df351edf7967eba88..780b9c88b911720241a79d02e73dc471ff936e9c 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -241,28 +241,13 @@
<name>RELATION_ID</name>
<title>Developer</title>
<linkedContextProcess>%aditoprj%/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
- <outgoingField>ProductRelation_dfo</outgoingField>
+ <outgoingField>ProductOrg_dfo</outgoingField>
<displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
</onValueChangeTypes>
</entityField>
- <entityField>
- <name>RELATION_ORG_ID</name>
- </entityField>
- <entityField>
- <name>RELATION_PERS_ID</name>
- </entityField>
- <entityOutgoingField>
- <name>ProductRelation_dfo</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Relation_entity</entityName>
- <fieldName>ProductRelation_dfi</fieldName>
- </dependency>
- </entityOutgoingField>
<entityField>
<name>INFO</name>
<title>Description</title>
@@ -319,6 +304,9 @@
</entityParameter>
</children>
</entityOutgoingField>
+ <entityField>
+ <name>ORG_NAME</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -330,33 +318,26 @@
<onDBDelete>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>eeb4101a-56ed-4af7-815f-ad29aa8c2099</name>
+ <name>ce4af12f-66c7-43d2-aefe-512260f3b24b</name>
<tableName>PRODUCT</tableName>
<primaryKey>PRODUCTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>03a18aff-d666-4752-bec3-1b160ff9aaa8</name>
+ <name>774f098d-8c86-4f0a-8eab-de79a43b8609</name>
<tableName>RELATION</tableName>
<primaryKey>RELATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>6b5a5d3e-bab9-4afc-945c-d905aed59997</name>
+ <name>2120f83c-6e14-4683-a5ad-9d0c88970d57</name>
<tableName>ORG</tableName>
<primaryKey>ORGID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
- <linkInformation>
- <name>903d626f-a61c-439f-a026-04b38e845d2f</name>
- <tableName>PERS</tableName>
- <primaryKey>PERSID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
diff --git a/entity/Product_entity/entityfields/relation_id/displayValueProcess.js b/entity/Product_entity/entityfields/relation_id/displayValueProcess.js
index 5159f2ac23951196460df8dea03ebbd65be479f8..8dbc1f5a8b87703ad7437138c6d542a78c9d3a9b 100644
--- a/entity/Product_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Product_entity/entityfields/relation_id/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Relation_lib");
import("system.neon");
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string(vars.getString("$field.ORG_NAME"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
index 2c8672f45309b0e7948787e30a5e7da698a515e0..d94556cde2fcc04bf1405ee0446a14cdc3550cf2 100644
--- a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Relation_lib");
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
+result.string("Org_context");
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/fromClauseProcess.js b/entity/Product_entity/recordcontainers/db/fromClauseProcess.js
index 655daa896456bb0404f4fefe14f912019cd7ee9a..f9c66be1d8ee930c8f4c267e706a9b49dff94be1 100644
--- a/entity/Product_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Product_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
result.string("PRODUCT left join RELATION on RELATION.RELATIONID = PRODUCT.RELATION_ID \n\
-left join ORG on ORG.ORGID = RELATION.ORG_ID left join PERS on PERS.PERSID = RELATION.PERS_ID");
\ No newline at end of file
+left join ORG on ORG.ORGID = RELATION.ORG_ID");
\ No newline at end of file
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index a9b2399d5cbc4a10290c9bbc5630e590b5f50bc0..1d5751c905b33d584299c2e191256b4c8bf8dea0 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -90,19 +90,6 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</entityParameter>
</children>
</entityOutgoingField>
- <entityIncomingField>
- <name>ProductRelation_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>2537ae2b-ee99-41bd-9cd5-ec482cb20a56</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductRelation_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- </dependencies>
- </entityIncomingField>
<entityField>
<name>ORG_NAME</name>
<title>Organisation name</title>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 2198463d021e0835b7773d3f4d5a12808599223e..098b532dc3f4a43c63cd79edce810290099b0196 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1693,6 +1693,7 @@
</entry>
<entry>
<key>Note</key>
+ <value>Notiz</value>
</entry>
<entry>
<key>Senden per E-Mail</key>
diff --git a/neonContext/Prod2prod_context/Prod2prod_context.aod b/neonContext/Prod2prod_context/Prod2prod_context.aod
index 8fe7acd0c356bb0e99d87d2ca3046a4bfa373eeb..05f7f455117cfecc5885b0b0e2987ad736f3e48d 100644
--- a/neonContext/Prod2prod_context/Prod2prod_context.aod
+++ b/neonContext/Prod2prod_context/Prod2prod_context.aod
@@ -2,6 +2,7 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>Prod2prod_context</name>
<title></title>
+ <comment>Prod2Prod is mainly used for the parts list of products</comment>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>Prod2prodFilter_view</filterview>
<preview>Prod2prodPreview_view</preview>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 1186c6543584f8175bf581387622154fe72f52c9..4705e9d272b4f2845e80a84e3577a277da822ebf 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -34,6 +34,10 @@
<name>49e446b5-015e-45ad-9417-c5c50f9756f1</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>ce062531-603e-4c33-8a6b-935d2f07f516</name>
+ <entityField>ChosenAddress</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>447f5c6e-3653-49dd-ba8b-18c21a9bd6f9</name>
<entityField>ADDRESS</entityField>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 5f3cd04116445e9fd62ddbf97895509e70b16b77..0346e38139cea379a4b826288a0e56403dec3eaf 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -12,7 +12,6 @@
<name>OfferitemPreview_header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
- <descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
@@ -20,6 +19,10 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>3b207cf2-c621-4e7d-b7aa-32feace5fe04</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>9868560c-41c7-4641-b0f1-627a61b796b3</name>
<entityField>TotalPrice</entityField>