refactor Order entity

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>

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>

entity/Order_entity/entityfields/orderitems/children/relationid_param/code.js

+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.RELATION_ID"));
\ No newline at end of file

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>

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>

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>

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>

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>

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>