diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 36bb09f2bc7da635bd0c1668b6bf90ed384bf17d..eacc26c820a8b3ec3be816a1054b40319c649946 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -143,7 +143,7 @@
<entityDependency>
<name>af4d109a-9265-4119-926e-b1fef4b3a2b3</name>
<entityName>Order_entity</entityName>
- <fieldName>OrderDocument_dfo</fieldName>
+ <fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -192,7 +192,7 @@
<entityDependency>
<name>75c1875c-5cb6-4cae-8bc7-82c45a2934e5</name>
<entityName>Order_entity</entityName>
- <fieldName>OrderMainDocuments_dfo</fieldName>
+ <fieldName>MainDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 017e5bf32667c28d76769b614fb0f9e31016d35e..bfcee650be76b2caea521510db2139c7e8ec2f48 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -54,7 +54,7 @@
<name>RELATION_ID</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/relation_id/documentation.adoc</documentation>
<title>Connection</title>
- <consumer>OrderRelation_dfo</consumer>
+ <consumer>Relations</consumer>
<linkedContextProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/relation_id/displayValueProcess.js</displayValueProcess>
@@ -66,7 +66,7 @@
<entityField>
<name>SALESPROJECT_ID</name>
<title>Salesproject</title>
- <consumer>OrderSalesproject_dfo</consumer>
+ <consumer>Salesprojects</consumer>
<linkedContext>Salesproject_context</linkedContext>
<mandatory v="true" />
<state>INVISIBLE</state>
@@ -109,7 +109,7 @@
<title>Footer text</title>
</entityField>
<entityConsumer>
- <name>OrderOrderitem_dfo</name>
+ <name>Orderitems</name>
<title>Orderitems</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<description></description>
@@ -121,27 +121,27 @@
<children>
<entityParameter>
<name>OrderId_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderorderitem_dfo/children/orderid_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderid_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>Currency_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderorderitem_dfo/children/currency_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/currency_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationId_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderorderitem_dfo/children/relationid_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>OrderStatus_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderorderitem_dfo/children/orderstatus_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderstatus_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
@@ -234,7 +234,7 @@
<name>RELATION_PERS_ID</name>
</entityField>
<entityConsumer>
- <name>OrderRelation_dfo</name>
+ <name>Relations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -243,7 +243,7 @@
</dependency>
</entityConsumer>
<entityConsumer>
- <name>OrderDocument_dfo</name>
+ <name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -254,20 +254,20 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderdocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderdocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/orderdocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>OrderMainDocuments_dfo</name>
+ <name>MainDocuments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -277,15 +277,15 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
<entityParameter>
<name>Keyword_param</name>
@@ -293,7 +293,7 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>OrderSalesproject_dfo</name>
+ <name>Salesprojects</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Order_entity/entityfields/orderdocument_dfo/children/assignmentname_param/code.js b/entity/Order_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/orderdocument_dfo/children/assignmentname_param/code.js
rename to entity/Order_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Order_entity/entityfields/orderdocument_dfo/children/assignmentrowid_param/code.js b/entity/Order_entity/entityfields/documents/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/orderdocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Order_entity/entityfields/documents/children/assignmentrowid_param/code.js
diff --git a/entity/Order_entity/entityfields/orderdocument_dfo/children/assignmenttable_param/code.js b/entity/Order_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/orderdocument_dfo/children/assignmenttable_param/code.js
rename to entity/Order_entity/entityfields/documents/children/assignmenttable_param/code.js
diff --git a/entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmentname_param/code.js b/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmentname_param/code.js
rename to entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js
diff --git a/entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmentrowid_param/code.js b/entity/Order_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmentrowid_param/code.js
rename to entity/Order_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmenttable_param/code.js b/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/ordermaindocuments_dfo/children/assignmenttable_param/code.js
rename to entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
diff --git a/entity/Order_entity/entityfields/orderorderitem_dfo/children/currency_param/code.js b/entity/Order_entity/entityfields/orderitems/children/currency_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/orderorderitem_dfo/children/currency_param/code.js
rename to entity/Order_entity/entityfields/orderitems/children/currency_param/code.js
diff --git a/entity/Order_entity/entityfields/orderorderitem_dfo/children/orderid_param/code.js b/entity/Order_entity/entityfields/orderitems/children/orderid_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/orderorderitem_dfo/children/orderid_param/code.js
rename to entity/Order_entity/entityfields/orderitems/children/orderid_param/code.js
diff --git a/entity/Order_entity/entityfields/orderorderitem_dfo/children/orderstatus_param/code.js b/entity/Order_entity/entityfields/orderitems/children/orderstatus_param/code.js
similarity index 100%
rename from entity/Order_entity/entityfields/orderorderitem_dfo/children/orderstatus_param/code.js
rename to entity/Order_entity/entityfields/orderitems/children/orderstatus_param/code.js
diff --git a/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js b/entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5cee65a3ba3e16976d5f7d3952da23c73ef54da
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderitems/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/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 7b9723a7d1811a77755b98b4e068028c7f8b5ab1..d637c9c992a6644b28e6d8aeaf39bc07ce7ac3c3 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -156,13 +156,13 @@
<entityDependency>
<name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
<entityName>Order_entity</entityName>
- <fieldName>OrderOrderitem_dfo</fieldName>
+ <fieldName>Orderitems</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
<entityName>Order_entity</entityName>
- <fieldName>OrderOrderitem_dfo</fieldName>
+ <fieldName>Orderitems</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index aa57bcdf25d5350f2d8d4eec5d9c95c3ac3b5879..1bdd6c3363d2174caa59009a82754ae330dbfb7e 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -136,7 +136,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<entityDependency>
<name>95e6a926-a5f0-458e-b918-03ad0f4f1fc0</name>
<entityName>Order_entity</entityName>
- <fieldName>OrderRelation_dfo</fieldName>
+ <fieldName>Relations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 762434c0b842f40e32a7a9f5160618fa61227c18..7db036a4601a76c858c29d315b98a01b6bbe7fd2 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -19,7 +19,7 @@
<entityDependency>
<name>497657f7-ebd7-4c9c-b8ab-da447a1556e5</name>
<entityName>Order_entity</entityName>
- <fieldName>OrderSalesproject_dfo</fieldName>
+ <fieldName>Salesprojects</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 32eb3e2702d39e40b55480f4a9d407515aac156d..f37f205ee435eebacb5d09d891bd6a0ba712a58d 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -56,7 +56,7 @@
</genericViewTemplate>
<neonViewReference>
<name>25834609-fb89-4439-8531-b7d80ce0ddce</name>
- <entityField>OrderOrderitem_dfo</entityField>
+ <entityField>Orderitems</entityField>
<view>OrderitemMultiEdit_view</view>
</neonViewReference>
</children>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index 21a00601d0b11264618622aae96bb2a90594b0f5..e5d693958f3765bf175d06e20bd9ef119333a843 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -16,7 +16,7 @@
</neonViewReference>
<neonViewReference>
<name>f5455f3f-0743-47d1-bcb7-f2e83526e329</name>
- <entityField>OrderOrderitem_dfo</entityField>
+ <entityField>Orderitems</entityField>
<view>OrderitemFilter_view</view>
</neonViewReference>
<neonViewReference>
@@ -26,7 +26,7 @@
</neonViewReference>
<neonViewReference>
<name>b3014999-da86-45ae-86ae-feb738d62906</name>
- <entityField>OrderDocument_dfo</entityField>
+ <entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 687729825ed9452fc8c03730fb390682c044ca97..c46246b466983c716591d3a455f1593131028e97 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -73,7 +73,7 @@
</genericViewTemplate>
<neonViewReference>
<name>b9166f18-c98c-4011-ba03-99e619b090c1</name>
- <entityField>OrderDocument_dfo</entityField>
+ <entityField>Documents</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>