refactor Product entity

entity/Document_entity/Document_entity.aod

@@ -161,7 +161,7 @@
         <entityDependency>
           <name>31a82406-7a61-49d9-b75b-731040614ecb</name>
           <entityName>Product_entity</entityName>
-          <fieldName>ProductDocument_dfo</fieldName>
+          <fieldName>Documents</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
@@ -198,7 +198,7 @@
         <entityDependency>
           <name>8366d11d-4c46-4410-b255-6d196229a534</name>
           <entityName>Product_entity</entityName>
-          <fieldName>ProductMainDocuments_dfo</fieldName>
+          <fieldName>MainDocuments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>

entity/Organisation_entity/Organisation_entity.aod

@@ -263,21 +263,6 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>Products</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Product_entity</entityName>
-        <fieldName>OrgProduct_dfi</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>relationId_param</name>
-          <code>%aditoprj%/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js</code>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityConsumer>
       <name>Productprices</name>
       <title>Conditions</title>

entity/Organisation_entity/entityfields/products/children/relationid_param/code.js

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

entity/Prod2prod_entity/Prod2prod_entity.aod

@@ -83,7 +83,7 @@
         <entityDependency>
           <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
           <entityName>Product_entity</entityName>
-          <fieldName>ProductProd2prod_dfo</fieldName>
+          <fieldName>ProductLinks</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>

entity/Product_entity/Product_entity.aod

@@ -108,28 +108,8 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
-    <entityProvider>
-      <name>OrgProduct_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>49cbec11-7d2e-4898-b63f-2e36aac9181e</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>Products</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
-    <entityParameter>
-      <name>relationId_param</name>
-      <expose v="true" />
-      <triggerRecalculation v="true" />
-      <mandatory v="false" />
-      <description>PARAMETER</description>
-    </entityParameter>
     <entityConsumer>
-      <name>ProductProductprice_dfo</name>
+      <name>Productprices</name>
       <title>Price list</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -140,25 +120,12 @@
       <children>
         <entityParameter>
           <name>ProductId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productproductprice_dfo/children/productid_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityProvider>
-      <name>Product_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>15dd9e6b-f551-452f-adce-53d7031ed468</name>
-          <entityName>Productprice_entity</entityName>
-          <fieldName>ProductpriceProduct_dfo</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
     <entityConsumer>
-      <name>ProductStock_dfo</name>
+      <name>Stock</name>
       <title>Stock</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <selectionMode>SINGLE</selectionMode>
@@ -170,7 +137,7 @@
       <children>
         <entityParameter>
           <name>ProductId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/stock/children/productid_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -184,7 +151,7 @@
       </onValueChangeTypes>
     </entityField>
     <entityConsumer>
-      <name>ProductStockCount_dfo</name>
+      <name>StockCount</name>
       <title>Stock</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <state>READONLY</state>
@@ -196,30 +163,16 @@
       <children>
         <entityParameter>
           <name>ProductId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productstockcount_dfo/children/productid_param/code.js</code>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityConsumer>
-      <name>ProductProductpriceCurr_dfo</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Productprice_entity</entityName>
-        <fieldName>ProductProductprice_dfi</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ProductId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productproductpricecurr_dfo/children/productid_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/stockcount/children/productid_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
     <entityProvider>
       <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
     </entityProvider>
     <entityConsumer>
-      <name>ProductProd2prod_dfo</name>
+      <name>ProductLinks</name>
       <title>Parts list</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -230,7 +183,7 @@
       <children>
         <entityParameter>
           <name>ProductId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productprod2prod_dfo/children/productid_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/productlinks/children/productid_param/code.js</code>
           <expose v="true" />
           <triggerRecalculation v="true" />
           <mandatory v="true" />
@@ -254,7 +207,7 @@
       <contentType>LONG_TEXT</contentType>
     </entityField>
     <entityConsumer>
-      <name>ProductDocument_dfo</name>
+      <name>Documents</name>
       <title>Documents</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
@@ -265,20 +218,20 @@
       <children>
         <entityParameter>
           <name>AssignmentName_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productdocument_dfo/children/assignmentname_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentname_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentRowId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productdocument_dfo/children/assignmentrowid_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentTable_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productdocument_dfo/children/assignmenttable_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
-      <name>ProductMainDocuments_dfo</name>
+      <name>MainDocuments</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -288,15 +241,15 @@
       <children>
         <entityParameter>
           <name>AssignmentName_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmentname_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentRowId_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmentrowid_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>AssignmentTable_param</name>
-          <code>%aditoprj%/entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmenttable_param/code.js</code>
+          <code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
         </entityParameter>
         <entityParameter>
           <name>Keyword_param</name>

entity/Product_entity/entityfields/productstockcount_dfo/children/productid_param/code.js

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

entity/Productprice_entity/Productprice_entity.aod

@@ -116,13 +116,7 @@
         <entityDependency>
           <name>72e12036-8c56-4cc7-a86e-fc4b0d743825</name>
           <entityName>Product_entity</entityName>
-          <fieldName>ProductProductprice_dfo</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>5a15f01e-07eb-49e4-85c7-9ec643d65627</name>
-          <entityName>Product_entity</entityName>
-          <fieldName>ProductProductpriceCurr_dfo</fieldName>
+          <fieldName>Productprices</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
@@ -173,7 +167,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Product_entity</entityName>
-        <fieldName>Product_dfi</fieldName>
+        <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
     <entityField>

entity/Stock_entity/Stock_entity.aod

@@ -74,13 +74,13 @@
         <entityDependency>
           <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
           <entityName>Product_entity</entityName>
-          <fieldName>ProductStock_dfo</fieldName>
+          <fieldName>Stock</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>
           <name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
           <entityName>Product_entity</entityName>
-          <fieldName>ProductStockCount_dfo</fieldName>
+          <fieldName>StockCount</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>

neonView/ProductMain_view/ProductMain_view.aod

@@ -21,17 +21,17 @@
     </neonViewReference>
     <neonViewReference>
       <name>7f416115-ff89-45ca-be10-ed568cac266c</name>
-      <entityField>ProductProd2prod_dfo</entityField>
+      <entityField>ProductLinks</entityField>
       <view>Prod2prodFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>11c4c5a0-27fa-4748-a6c6-3a667d2f3d8f</name>
-      <entityField>ProductProductprice_dfo</entityField>
+      <entityField>Productprices</entityField>
       <view>ProductpriceFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>616f7cc3-93e7-41ee-8d38-027dd3d4b299</name>
-      <entityField>ProductDocument_dfo</entityField>
+      <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
   </children>

neonView/ProductPreview_view/ProductPreview_view.aod

@@ -64,7 +64,7 @@
     </genericViewTemplate>
     <neonViewReference>
       <name>cf0f8792-3f4a-435d-b04c-16843e3f1cd4</name>
-      <entityField>ProductMainDocuments_dfo</entityField>
+      <entityField>tMainDocuments</entityField>
       <view>DocumentList_view</view>
     </neonViewReference>
   </children>