From 3ed17019f4c6c5d3c4ef03795f48aa512bc36c1b Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 4 Feb 2019 15:51:05 +0100
Subject: [PATCH] refactor dfi: Org_entity
---
entity/Org_entity/Org_entity.aod | 40 +++++++++----------
entity/Product_entity/Product_entity.aod | 4 +-
.../SalesprojectCompetition_entity.aod | 4 +-
.../Salesproject_entity.aod | 4 +-
4 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index b507bc9d65d..7a83f6ffaf0 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -185,9 +185,9 @@
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>8bc24adb-78f1-49bb-a41d-79fb29175b27</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductOrg_dfo</fieldName>
+ <name>120c8bfb-1b03-408d-97e7-88e3b7249c53</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -299,6 +299,21 @@
<name>72825dbe-c602-4c17-9aa8-546c4b61f2f9</name>
<entityName>Pers_entity</entityName>
<fieldName>Organisations</fieldName>
+ <name>bfc777ca-e30a-4d86-acff-f72370b986f2</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f78c0ca6-7939-4a0e-903e-0fbbbf512e76</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1fa399a8-8c0c-470f-94a8-6c748293d93d</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>CompetitionOrg_lookup_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -350,25 +365,6 @@
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
</entityActionField>
- <entityProvider>
- <name>SalesprojectCompetitionOrg_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>f6e7b80e-64a9-4d4b-bbe7-dbb40bb35135</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>14301a6c-7144-4d1b-800e-e4ca733769bb</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>CompetitionOrg_lookup_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
<entityField>
<name>PRICE_POLITICS</name>
<title>Price politics</title>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index e69f07ee8bd..d367312e29e 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -100,12 +100,12 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentsalespriceid/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
- <name>ProductOrg_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityProvider>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 122ae4d6b54..cdc5edb7d7e 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -98,7 +98,7 @@
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfi</fieldName>
+ <fieldName>Org_dfi</fieldName>
</dependency>
<children>
<entityParameter>
@@ -130,7 +130,7 @@
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfi</fieldName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
</entityFields>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 4a0b31d0a28..6280a3d0138 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -119,12 +119,12 @@
<contentTypeProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js</contentTypeProcess>
</entityField>
<entityConsumer>
- <name>SalesprojectOrg_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityField>
--
GitLab