From b6a223c0751b3949ebaa5cf7bd9a17bc1f911fff Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 8 Feb 2019 11:07:22 +0100
Subject: [PATCH] refactor fixes
---
entity/Activity_entity/Activity_entity.aod | 3 --
entity/Address_entity/Address_entity.aod | 1 +
.../children/relationtype_param/code.js | 3 +-
.../Communication_entity.aod | 2 +-
entity/Contact_entity/Contact_entity.aod | 14 -------
entity/Contract_entity/Contract_entity.aod | 3 --
entity/Offer_entity/Offer_entity.aod | 5 +--
entity/Order_entity/Order_entity.aod | 3 --
.../Organisation_entity.aod | 11 -----
.../children/relationtype_param/code.js | 3 --
entity/Product_entity/Product_entity.aod | 3 --
entity/Relation_entity/Relation_entity.aod | 8 ----
.../children/commcategory_param/code.js | 2 -
.../children/commcategory_param/code.js | 2 -
.../SalesprojectClassification_entity.aod | 2 +-
.../SalesprojectCompetition_entity.aod | 2 +-
.../SalesprojectCycle_entity.aod | 2 +-
.../SalesprojectForecast_entity.aod | 2 +-
.../SalesprojectMember_entity.aod | 2 +-
.../SalesprojectSource_entity.aod | 2 +-
.../Salesproject_entity.aod | 40 +++++++++----------
.../children/anyobjectrowid_param/code.js | 0
.../children/anyobjecttype_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/salesprojectid_param/code.js | 0
.../children/objectid_param/code.js | 0
.../children/rowid_param/code.js | 0
.../Timetracking_entity.aod | 2 +-
.../SalesprojectMain_view.aod | 18 ++++-----
34 files changed, 41 insertions(+), 94 deletions(-)
delete mode 100644 entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js
delete mode 100644 entity/Relation_entity/entityfields/emailcommunications/children/commcategory_param/code.js
delete mode 100644 entity/Relation_entity/entityfields/phonecommunications/children/commcategory_param/code.js
rename entity/Salesproject_entity/entityfields/{objectrelation_dfo => objectrelations}/children/anyobjectrowid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{objectrelation_dfo => objectrelations}/children/anyobjecttype_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectclassification_dfo => salesprojectclassifications}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectcompetition_dfo => salesprojectcompetitions}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectcycle_dfo => salesprojectcycles}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectforecast_dfo => salesprojectforecasts}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectmember_dfo => salesprojectmembers}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectoffer_dfo => salesprojectoffers}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojectsource_dfo => salesprojectsources}/children/salesprojectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojecttimetracking_dfo => timetrackings}/children/objectid_param/code.js (100%)
rename entity/Salesproject_entity/entityfields/{salesprojecttimetracking_dfo => timetrackings}/children/rowid_param/code.js (100%)
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 592e9d563a..071f87605c 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -138,9 +138,6 @@
<fieldName>MainDocuments</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>Keyword_param</name>
- </entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index ad9f32d1a9..0e325ef4e8 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -128,6 +128,7 @@
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js</code>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
diff --git a/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js b/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js
index ee2a3d7dfb..03b4a10fd0 100644
--- a/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js
+++ b/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.result");
-
+logging.log("hui")
result.object(2);
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 6e870d0371..7dc3bf9262 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -89,7 +89,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<children>
<entityParameter>
<name>CommCategory_param</name>
- <expose v="false" />
+ <expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 52d13f4048..578fc8c518 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -203,10 +203,6 @@
<code>%aditoprj%/entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
- <entityParameter>
- <name>RelationType_param</name>
- <triggerRecalculation v="true" />
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -405,10 +401,6 @@
<code>%aditoprj%/entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
- <entityParameter>
- <name>RelationType_param</name>
- <triggerRecalculation v="true" />
- </entityParameter>
</children>
</entityConsumer>
<entityField>
@@ -459,9 +451,6 @@
<name>RelId_param</name>
<code>%aditoprj%/entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>CommCategory_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -478,9 +467,6 @@
<name>RelId_param</name>
<code>%aditoprj%/entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>CommCategory_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index f19fa6541f..fc265886ad 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -224,9 +224,6 @@
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>Keyword_param</name>
- </entityParameter>
</children>
</entityConsumer>
</entityFields>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 54faf29935..89bf00057a 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -187,7 +187,7 @@
<entityDependency>
<name>208c1273-d438-4263-a466-a4490b5e319a</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectOffer_dfo</fieldName>
+ <fieldName>SalesprojectOffers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -313,9 +313,6 @@
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>Keyword_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index d2ab7dc889..deb5b54789 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -287,9 +287,6 @@
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>Keyword_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index cbb819decd..3eee6d8d10 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -212,11 +212,6 @@
<code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
- <entityParameter>
- <name>RelationType_param</name>
- <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
</children>
</entityConsumer>
<entityField>
@@ -403,9 +398,6 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<name>RelId_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>CommCategory_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -421,9 +413,6 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<name>RelId_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>CommCategory_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityActionField>
diff --git a/entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js b/entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js
deleted file mode 100644
index 85a095aeb8..0000000000
--- a/entity/Organisation_entity/entityfields/addresses/children/relationtype_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(1);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 649536363c..43f969a979 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -251,9 +251,6 @@
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
- <entityParameter>
- <name>Keyword_param</name>
- </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index 99088b218d..8bead7ef53 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -136,10 +136,6 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<fieldName>EmailCommunications</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>CommCategory_param</name>
- <code>%aditoprj%/entity/Relation_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code>
- </entityParameter>
<entityParameter>
<name>RelId_param</name>
<code>%aditoprj%/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
@@ -155,10 +151,6 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<fieldName>PhoneCommunications</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>CommCategory_param</name>
- <code>%aditoprj%/entity/Relation_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code>
- </entityParameter>
<entityParameter>
<name>RelId_param</name>
<code>%aditoprj%/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
diff --git a/entity/Relation_entity/entityfields/emailcommunications/children/commcategory_param/code.js b/entity/Relation_entity/entityfields/emailcommunications/children/commcategory_param/code.js
deleted file mode 100644
index 4c564fa3fa..0000000000
--- a/entity/Relation_entity/entityfields/emailcommunications/children/commcategory_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("EMAIL");
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/phonecommunications/children/commcategory_param/code.js b/entity/Relation_entity/entityfields/phonecommunications/children/commcategory_param/code.js
deleted file mode 100644
index 9220a2c453..0000000000
--- a/entity/Relation_entity/entityfields/phonecommunications/children/commcategory_param/code.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string("PHONE");
\ No newline at end of file
diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
index 2f1ed91f4f..ad34c89ad9 100644
--- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
+++ b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
@@ -41,7 +41,7 @@
<entityDependency>
<name>a56beadb-61a5-4065-a64a-f9f136dd4996</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectClassification_dfo</fieldName>
+ <fieldName>SalesprojectClassifications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 8a93881239..032b437f01 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -69,7 +69,7 @@
<entityDependency>
<name>c6884f8d-283b-4338-830f-b20dda9b8aa5</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectCompetition_dfo</fieldName>
+ <fieldName>SalesprojectCompetitions</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index 0524adc3d5..6848f17d67 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -72,7 +72,7 @@
<entityDependency>
<name>b05e2bdf-5d8b-4ba2-8dba-a8560c255470</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectCycle_dfo</fieldName>
+ <fieldName>SalesprojectCycles</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 0664e524be..498f2f509a 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -73,7 +73,7 @@
<entityDependency>
<name>a3d7f5e9-465c-4ded-9220-3569b63925ab</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectForecast_dfo</fieldName>
+ <fieldName>SalesprojectForecasts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 0ea7ef2dbb..d09ecea2c6 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -55,7 +55,7 @@
<entityDependency>
<name>c33d46e7-a7be-4548-a036-0ac58888504c</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectMember_dfo</fieldName>
+ <fieldName>SalesprojectMembers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 3e20ba2503..1b606cf32c 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -16,7 +16,7 @@
<entityDependency>
<name>c1628437-2813-464f-b91c-71b1c6bb63a4</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectSource_dfo</fieldName>
+ <fieldName>SalesprojectSources</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 31770156d0..596801eee7 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -133,7 +133,7 @@
<possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityConsumer>
- <name>SalesprojectSource_dfo</name>
+ <name>SalesprojectSources</name>
<title>Source</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -144,13 +144,13 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsource_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectCycle_dfo</name>
+ <name>SalesprojectCycles</name>
<title>Milestone</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -161,13 +161,13 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcycle_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcycles/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectForecast_dfo</name>
+ <name>SalesprojectForecasts</name>
<title>Forecast</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -178,13 +178,13 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecast_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectCompetition_dfo</name>
+ <name>SalesprojectCompetitions</name>
<title>Competition</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -195,13 +195,13 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcompetition_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectOffer_dfo</name>
+ <name>SalesprojectOffers</name>
<title>Offer</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -212,7 +212,7 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffer_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -239,7 +239,7 @@
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectMember_dfo</name>
+ <name>SalesprojectMembers</name>
<title>${SALESPROJECT_MEMBER}</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -250,13 +250,13 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmember_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>SalesprojectClassification_dfo</name>
+ <name>SalesprojectClassifications</name>
<title>Classification</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -267,7 +267,7 @@
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectclassification_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -280,7 +280,7 @@
<onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
</entityActionField>
<entityConsumer>
- <name>SalesprojectTimetracking_dfo</name>
+ <name>Timetrackings</name>
<title>Timetracking</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -291,12 +291,12 @@
<children>
<entityParameter>
<name>ObjectId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojecttimetracking_dfo/children/objectid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/objectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RowId_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojecttimetracking_dfo/children/rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -307,7 +307,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>ObjectRelation_dfo</name>
+ <name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -318,11 +318,11 @@
<children>
<entityParameter>
<name>AnyObjectRowid_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Salesproject_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
rename to entity/Salesproject_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
rename to entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectclassification_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectclassification_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectcompetition_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectcompetition_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectcycle_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectcycles/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectcycle_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectcycles/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectforecast_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectforecast_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectmember_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectmember_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectoffer_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectoffer_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojectsource_dfo/children/salesprojectid_param/code.js b/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojectsource_dfo/children/salesprojectid_param/code.js
rename to entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojecttimetracking_dfo/children/objectid_param/code.js b/entity/Salesproject_entity/entityfields/timetrackings/children/objectid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojecttimetracking_dfo/children/objectid_param/code.js
rename to entity/Salesproject_entity/entityfields/timetrackings/children/objectid_param/code.js
diff --git a/entity/Salesproject_entity/entityfields/salesprojecttimetracking_dfo/children/rowid_param/code.js b/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/code.js
similarity index 100%
rename from entity/Salesproject_entity/entityfields/salesprojecttimetracking_dfo/children/rowid_param/code.js
rename to entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/code.js
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 55fe3c6efc..43c7a13c3c 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -82,7 +82,7 @@
<entityDependency>
<name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectTimetracking_dfo</fieldName>
+ <fieldName>Timetrackings</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 5a39f33825..780310e873 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -21,47 +21,47 @@
</neonViewReference>
<neonViewReference>
<name>138f1ee7-f23b-4de9-a4c7-b4db870b57e9</name>
- <entityField>SalesprojectCycle_dfo</entityField>
+ <entityField>SalesprojectCycles</entityField>
<view>SalesprojectCycleFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
- <entityField>SalesprojectCompetition_dfo</entityField>
+ <entityField>SalesprojectCompetitions</entityField>
<view>SalesprojectCompetitionFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>4e126e3b-6a11-4229-becf-62268ce2df64</name>
- <entityField>SalesprojectSource_dfo</entityField>
+ <entityField>SalesprojectSources</entityField>
<view>SalesprojectSourceFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>b1deae1b-c39a-48bd-9221-ed4153ee8ec9</name>
- <entityField>SalesprojectOffer_dfo</entityField>
+ <entityField>SalesprojectOffers</entityField>
<view>OfferFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>dafb2a9c-c192-46e2-a233-0799b694ed7d</name>
- <entityField>SalesprojectMember_dfo</entityField>
+ <entityField>SalesprojectMembers</entityField>
<view>SalesprojectMemberFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>a989abee-e88b-46b1-a78b-b16fa11de634</name>
- <entityField>SalesprojectClassification_dfo</entityField>
+ <entityField>SalesprojectClassifications</entityField>
<view>SalesprojectClassificationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>0acc61f5-f61a-4c93-a4fb-e5ae44a71dae</name>
- <entityField>SalesprojectForecast_dfo</entityField>
+ <entityField>SalesprojectForecasts</entityField>
<view>SalesprojectForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>c0027b4d-c014-4053-a595-daad9a73ad5c</name>
- <entityField>SalesprojectTimetracking_dfo</entityField>
+ <entityField>Timetrackings</entityField>
<view>TimetrackingFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>d02bf839-1901-4ca1-bcee-245ee9512fe2</name>
- <entityField>ObjectRelation_dfo</entityField>
+ <entityField>ObjectRelations</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
</children>
--
GitLab