diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index eacc26c820a8b3ec3be816a1054b40319c649946..1e00f2f90676f860e360e232a09ee04379443403 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/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>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index aace10d6ea8cab01d520fe1a1f62523c1f9ea2e5..8720bda671ef7f999de26059f246aefd4d835c62 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/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>
diff --git a/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js b/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js
deleted file mode 100644
index aa257b8b78ed72ce888626a9fa22a890e3c9bf17..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/products/children/relationid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 9521bd14881118aa7e07c9a2ecf10187e3763f89..cb2a5560c4b4334bcdc80e5310d82acdc1df4ba9 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/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>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 30a7a8a37530846fce1369bd4c6510bf5a035eea..7ac1019d84f5ed6b7959d40edf904835386193d1 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/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>
diff --git a/entity/Product_entity/entityfields/productdocument_dfo/children/assignmentname_param/code.js b/entity/Product_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productdocument_dfo/children/assignmentname_param/code.js
rename to entity/Product_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Product_entity/entityfields/productdocument_dfo/children/assignmentrowid_param/code.js b/entity/Product_entity/entityfields/documents/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productdocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Product_entity/entityfields/documents/children/assignmentrowid_param/code.js
diff --git a/entity/Product_entity/entityfields/productdocument_dfo/children/assignmenttable_param/code.js b/entity/Product_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productdocument_dfo/children/assignmenttable_param/code.js
rename to entity/Product_entity/entityfields/documents/children/assignmenttable_param/code.js
diff --git a/entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmentname_param/code.js b/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmentname_param/code.js
rename to entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/code.js
diff --git a/entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmentrowid_param/code.js b/entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmentrowid_param/code.js
rename to entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmenttable_param/code.js b/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productmaindocuments_dfo/children/assignmenttable_param/code.js
rename to entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
diff --git a/entity/Product_entity/entityfields/productprod2prod_dfo/children/productid_param/code.js b/entity/Product_entity/entityfields/productlinks/children/productid_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productprod2prod_dfo/children/productid_param/code.js
rename to entity/Product_entity/entityfields/productlinks/children/productid_param/code.js
diff --git a/entity/Product_entity/entityfields/productproductprice_dfo/children/productid_param/code.js b/entity/Product_entity/entityfields/productprices/children/productid_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productproductprice_dfo/children/productid_param/code.js
rename to entity/Product_entity/entityfields/productprices/children/productid_param/code.js
diff --git a/entity/Product_entity/entityfields/productstockcount_dfo/children/productid_param/code.js b/entity/Product_entity/entityfields/productstockcount_dfo/children/productid_param/code.js
deleted file mode 100644
index 24f19f37786781bff6661183f3fcd8ae8d1efb45..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/productstockcount_dfo/children/productid_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/productproductpricecurr_dfo/children/productid_param/code.js b/entity/Product_entity/entityfields/stock/children/productid_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productproductpricecurr_dfo/children/productid_param/code.js
rename to entity/Product_entity/entityfields/stock/children/productid_param/code.js
diff --git a/entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js b/entity/Product_entity/entityfields/stockcount/children/productid_param/code.js
similarity index 100%
rename from entity/Product_entity/entityfields/productstock_dfo/children/productid_param/code.js
rename to entity/Product_entity/entityfields/stockcount/children/productid_param/code.js
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 536a6a6474c6daa3c795106c71557aa66ecac2c7..76cef64dda8b2fa5fee33e8a8252369c079c44a0 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/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>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index b97ba754d620a995e7c0f1b4b58bf3628dbc55bb..f11f70cd926bfecf59aebd3a9ab0c048bd1ffad6 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/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>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index ed3001e38040cba7052e3f1b740a3baad5e792d9..3f6aabdbf743965da9ddabdb20a96ae73ccd2325 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/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>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 61cfc5fdce80c3c4abd355cf08ef6ccaded95c04..cbe7601b0ca998189525b3978c6cf2c11bcf3e7f 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/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>