diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 2f315b2bdf7a2ebb78b52174c24752b6f6a4e855..36bb09f2bc7da635bd0c1668b6bf90ed384bf17d 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -137,7 +137,7 @@
<entityDependency>
<name>8867e012-ed4e-4c34-9c1f-402acf910190</name>
<entityName>Offer_entity</entityName>
- <fieldName>OfferDocument_dfo</fieldName>
+ <fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -186,7 +186,7 @@
<entityDependency>
<name>ff2d676c-7dd0-47ad-b7f2-ce35b0546e9f</name>
<entityName>Offer_entity</entityName>
- <fieldName>OfferMainDocuments_dfo</fieldName>
+ <fieldName>MainDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index c6cd79da727f04364128658ff82bacfaa482d64b..d11148795b3021c571ea6188f02a77a835c6e3d6 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -59,7 +59,7 @@
<name>RELATION_ID</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/relation_id/documentation.adoc</documentation>
<title>Connection</title>
- <consumer>OfferRelation_dfo</consumer>
+ <consumer>OfferRelations</consumer>
<linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/relation_id/valueProcess.js</valueProcess>
@@ -72,7 +72,7 @@
<entityField>
<name>SALESPROJECT_ID</name>
<title>Salesproject</title>
- <consumer>OfferSalesproject_dfo</consumer>
+ <consumer>OfferSalesprojects</consumer>
<linkedContext>Salesproject_context</linkedContext>
<mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js</mandatoryProcess>
<state>INVISIBLE</state>
@@ -115,7 +115,7 @@
<title>Footer text</title>
</entityField>
<entityConsumer>
- <name>OfferOfferitem_dfo</name>
+ <name>Offeritems</name>
<title>Offeritems</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<description></description>
@@ -127,27 +127,27 @@
<children>
<entityParameter>
<name>OfferId_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerofferitem_dfo/children/offerid_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerid_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>Currency_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerofferitem_dfo/children/currency_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currency_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationId_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerofferitem_dfo/children/relationid_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>OfferStatus_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerofferitem_dfo/children/offerstatus_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
@@ -176,11 +176,11 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>SalesprojectOffer_dfi</name>
+ <name>SalesprojectOffers</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -242,7 +242,7 @@
<name>RelationId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
@@ -260,7 +260,7 @@
<searchable v="false" />
</entityField>
<entityConsumer>
- <name>OfferRelation_dfo</name>
+ <name>OfferRelations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -269,7 +269,7 @@
</dependency>
</entityConsumer>
<entityConsumer>
- <name>OfferDocument_dfo</name>
+ <name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -280,20 +280,20 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>OfferMainDocuments_dfo</name>
+ <name>MainDocuments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -303,15 +303,15 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
<entityParameter>
<name>Keyword_param</name>
@@ -319,7 +319,7 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>OfferSalesproject_dfo</name>
+ <name>OfferSalesprojects</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmentname_param/code.js b/entity/Offer_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmentname_param/code.js
rename to entity/Offer_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmentrowid_param/code.js b/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/code.js
diff --git a/entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmenttable_param/code.js b/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerdocument_dfo/children/assignmenttable_param/code.js
rename to entity/Offer_entity/entityfields/documents/children/assignmenttable_param/code.js
diff --git a/entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmentname_param/code.js b/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmentname_param/code.js
rename to entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/code.js
diff --git a/entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmentrowid_param/code.js b/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmentrowid_param/code.js
rename to entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmenttable_param/code.js b/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offermaindocuments_dfo/children/assignmenttable_param/code.js
rename to entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
diff --git a/entity/Offer_entity/entityfields/offerofferitem_dfo/children/currency_param/code.js b/entity/Offer_entity/entityfields/offeritems/children/currency_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerofferitem_dfo/children/currency_param/code.js
rename to entity/Offer_entity/entityfields/offeritems/children/currency_param/code.js
diff --git a/entity/Offer_entity/entityfields/offerofferitem_dfo/children/offerid_param/code.js b/entity/Offer_entity/entityfields/offeritems/children/offerid_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerofferitem_dfo/children/offerid_param/code.js
rename to entity/Offer_entity/entityfields/offeritems/children/offerid_param/code.js
diff --git a/entity/Offer_entity/entityfields/offerofferitem_dfo/children/offerstatus_param/code.js b/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/code.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerofferitem_dfo/children/offerstatus_param/code.js
rename to entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/code.js
diff --git a/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js b/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5cee65a3ba3e16976d5f7d3952da23c73ef54da
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offeritems/children/relationid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 1fd83eabae384d08d7cb5b58f382c0554dd6af00..aba0a88d351f20a2fbf158d4d822e2c100bd1213 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -155,7 +155,7 @@
<entityDependency>
<name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
<entityName>Offer_entity</entityName>
- <fieldName>OfferOfferitem_dfo</fieldName>
+ <fieldName>Offeritems</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index 4499c12f984a0cd8bd9ce8a83966215057974f72..aa57bcdf25d5350f2d8d4eec5d9c95c3ac3b5879 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -123,7 +123,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<entityDependency>
<name>26d3e9ec-5a60-4108-b699-b8ba566f4832</name>
<entityName>Offer_entity</entityName>
- <fieldName>OfferRelation_dfo</fieldName>
+ <fieldName>OfferRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 3109225050ad96dc1df9dbb08f0bd1712da9e597..762434c0b842f40e32a7a9f5160618fa61227c18 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -13,7 +13,7 @@
<entityDependency>
<name>525fd920-ea50-45d6-97a8-20e0aaaa830c</name>
<entityName>Offer_entity</entityName>
- <fieldName>OfferSalesproject_dfo</fieldName>
+ <fieldName>OfferSalesprojects</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -207,7 +207,7 @@
<dependency>
<name>dependency</name>
<entityName>Offer_entity</entityName>
- <fieldName>SalesprojectOffer_dfi</fieldName>
+ <fieldName>SalesprojectOffers</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 5c83f5e936d2c289179fe3bbe7996af5c641c35b..8930aa3c381c72f41c10dd01b59dfe4afad91ee4 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -68,7 +68,7 @@
</genericViewTemplate>
<neonViewReference>
<name>f84b65ca-f1dd-4dda-8321-1eef10ad0ecc</name>
- <entityField>OfferOfferitem_dfo</entityField>
+ <entityField>Offeritems</entityField>
<view>OfferitemMultiEdit_view</view>
</neonViewReference>
</children>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index f25f05c8d5839b09a93d25f92d5866c59d1a4abc..5b736ba58050f5d14a8e2640c98b9c9cd89f666b 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -21,12 +21,12 @@
</neonViewReference>
<neonViewReference>
<name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
- <entityField>OfferOfferitem_dfo</entityField>
+ <entityField>Offeritems</entityField>
<view>OfferitemFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>e96f2fec-1a98-4380-895a-82ab78ba408a</name>
- <entityField>OfferDocument_dfo</entityField>
+ <entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 4705e9d272b4f2845e80a84e3577a277da822ebf..c40c127a0d1075855c220f5090da92de3a8b686e 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -85,7 +85,7 @@
</genericViewTemplate>
<neonViewReference>
<name>b5e6c1b7-8a34-45a5-b4b6-9f61bda485fd</name>
- <entityField>OfferMainDocuments_dfo</entityField>
+ <entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>