From 5906fed32f45ecce903b118603e6e058ffb26c37 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 4 Feb 2019 15:43:54 +0100
Subject: [PATCH] refactor dfo: Pers_entity
---
entity/Activity_entity/Activity_entity.aod | 2 +-
entity/Address_entity/Address_entity.aod | 4 +-
entity/Comm_entity/Comm_entity.aod | 6 +-
entity/Contract_entity/Contract_entity.aod | 2 +-
entity/Document_entity/Document_entity.aod | 2 +-
entity/Gender_keyword/Gender_keyword.aod | 2 +-
.../ObjectRelation_entity.aod | 2 +-
entity/Org_entity/Org_entity.aod | 14 ++--
entity/Pers_entity/Pers_entity.aod | 74 +++++++++----------
.../children/objectid_param/code.js | 0
.../children/rowid_param/code.js | 0
.../children/relid_param/code.js | 0
.../children/relid_param/code.js | 0
.../children/assignmentname_param/code.js | 0
.../children/assignmentrowid_param}/code.js | 0
.../children/assignmenttable_param/code.js | 0
.../children/commcategory_param/code.js | 0
.../children/relid_param/code.js | 0
.../children/anyobjectrowid_param/code.js | 0
.../children/anyobjecttype_param/code.js | 0
.../children/relationtype_param/code.js | 0
.../children/relid_param/code.js | 0
.../children/defaultaddressid_param/code.js | 0
.../children/relationtype_param/code.js | 0
.../children/relid_param/code.js | 0
.../children/commcategory_param/code.js | 0
.../children/relid_param}/code.js | 0
.../children/relid_param/code.js | 0
.../stateProcess.js | 0
.../Productprice_entity.aod | 2 +-
neonView/PersEdit_view/PersEdit_view.aod | 6 +-
neonView/PersMain_view/PersMain_view.aod | 8 +-
.../PersPreview_view/PersPreview_view.aod | 6 +-
.../init_activityDirection.xml | 12 +--
34 files changed, 69 insertions(+), 73 deletions(-)
rename entity/Pers_entity/entityfields/{persactivity_dfo => activities}/children/objectid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persactivity_dfo => activities}/children/rowid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perscomm_dfo => communications}/children/relid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perscommemail_dfo => contracts}/children/relid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persdocument_dfo => documents}/children/assignmentname_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perscommphone_dfo/children/relid_param => documents/children/assignmentrowid_param}/code.js (100%)
rename entity/Pers_entity/entityfields/{persdocument_dfo => documents}/children/assignmenttable_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perscommemail_dfo => emailcommunications}/children/commcategory_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perscontract_dfo => emailcommunications}/children/relid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{objectrelation_dfo => objectrelations}/children/anyobjectrowid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{objectrelation_dfo => objectrelations}/children/anyobjecttype_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persorgsaddresses_dfo => orgaddresses}/children/relationtype_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persorgsaddresses_dfo => orgaddresses}/children/relid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persaddress_dfo => persaddresses}/children/defaultaddressid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persaddress_dfo => persaddresses}/children/relationtype_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persaddress_dfo => persaddresses}/children/relid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perscommphone_dfo => phonecommunications}/children/commcategory_param/code.js (100%)
rename entity/Pers_entity/entityfields/{persdocument_dfo/children/assignmentrowid_param => phonecommunications/children/relid_param}/code.js (100%)
rename entity/Pers_entity/entityfields/{perspricelist_dfo => pricelists}/children/relid_param/code.js (100%)
rename entity/Pers_entity/entityfields/{perspricelist_dfo => pricelists}/stateProcess.js (100%)
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 8c51fc3a3e5..235b75ee7b5 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -74,7 +74,7 @@
<entityDependency>
<name>8931861c-bc1b-4545-a472-2020e2ca72e2</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersActivity_dfo</fieldName>
+ <fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 17311d7f23a..697644cbc25 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -110,7 +110,7 @@
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersAddress_dfo</fieldName>
+ <fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -136,7 +136,7 @@
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersOrgsAddresses_dfo</fieldName>
+ <fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 76a9af5c2f5..cf3f1fc5a86 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -89,7 +89,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>e54350c7-b9a6-4f7a-ac35-506922f3964b</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersComm_dfo</fieldName>
+ <fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -127,7 +127,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>2d615521-e9b9-463f-8e09-b5749b5484ff</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersCommPhone_dfo</fieldName>
+ <fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -139,7 +139,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>b1cc8f6a-e3c1-4d52-9fae-cf254ced5211</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersCommEmail_dfo</fieldName>
+ <fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 37dc06ecc11..acee4fb97a5 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -108,7 +108,7 @@
<entityDependency>
<name>2146b082-6377-4b34-be6b-3dad18885614</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersContract_dfo</fieldName>
+ <fieldName>Contracts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index eb561e9ebce..8e5155a650d 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -102,7 +102,7 @@
<entityDependency>
<name>b312a3cc-2689-4bf6-8a83-85f0c21ae61e</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersDocument_dfo</fieldName>
+ <fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 2b677c04718..eb61c8a4573 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -19,7 +19,7 @@
<entityDependency>
<name>3feb4002-8a56-4be8-adc7-5a81c3cb72c5</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersGender_dfo</fieldName>
+ <fieldName>Genders</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 3316abde941..8052eead090 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -206,7 +206,7 @@
<entityDependency>
<name>744259f7-3b08-4147-8376-3311b7a35712</name>
<entityName>Pers_entity</entityName>
- <fieldName>ObjectRelation_dfo</fieldName>
+ <fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index b8870370eda..8d0a43ad97b 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -172,12 +172,6 @@
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
- <entityDependency>
- <name>11f8e13a-d801-4bd6-829c-d334c49e9a4c</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersOrg_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
<entityName>Salesproject_entity</entityName>
@@ -300,6 +294,14 @@
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>72825dbe-c602-4c17-9aa8-546c4b61f2f9</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>Documents</name>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index c7a51e140e6..3db9e5e8496 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -107,7 +107,7 @@
</fields>
</entityFieldGroup>
<entityConsumer>
- <name>PersActivity_dfo</name>
+ <name>Activities</name>
<title>Activities</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -118,11 +118,11 @@
<children>
<entityParameter>
<name>RowId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persactivity_dfo/children/rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/activities/children/rowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persactivity_dfo/children/objectid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/activities/children/objectid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -152,7 +152,7 @@
<entityField>
<name>ORG_ID</name>
<title>Firma</title>
- <consumer>PersOrg_dfo</consumer>
+ <consumer>Organisations</consumer>
<linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="false" />
<searchable v="false" />
@@ -184,7 +184,7 @@
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
- <name>PersAddress_dfo</name>
+ <name>PersAddresses</name>
<title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -195,23 +195,23 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/persaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/persaddresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersComm_dfo</name>
+ <name>Communications</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -222,23 +222,23 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersOrg_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<selectionMode>SINGLE</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
- <name>PersContract_dfo</name>
+ <name>Contracts</name>
<title>Contracts</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -249,17 +249,17 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/contracts/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersPricelist_dfo</name>
+ <name>Pricelists</name>
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>AUTO</state>
- <stateProcess>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/Pers_entity/entityfields/pricelists/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
@@ -268,12 +268,12 @@
<children>
<entityParameter>
<name>RelID_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/pricelists/children/relid_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersGender_dfo</name>
+ <name>Genders</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -311,7 +311,7 @@
<possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityConsumer>
- <name>PersDocument_dfo</name>
+ <name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -322,15 +322,15 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -381,7 +381,7 @@
</dependencies>
</entityProvider>
<entityConsumer>
- <name>PersOrgsAddresses_dfo</name>
+ <name>OrgAddresses</name>
<title>Company Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<state>READONLY</state>
@@ -393,12 +393,12 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/orgaddresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -441,17 +441,17 @@
<entityField>
<name>STANDARD_EMAIL_COMM</name>
<title>E-Mail</title>
- <consumer>PersCommEmail_dfo</consumer>
+ <consumer>EmailCommunications</consumer>
<onValueChange>%aditoprj%/entity/Pers_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMM</name>
<title>Phone</title>
- <consumer>PersCommPhone_dfo</consumer>
+ <consumer>PhoneCommunications</consumer>
<onValueChange>%aditoprj%/entity/Pers_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
- <name>PersCommPhone_dfo</name>
+ <name>PhoneCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -461,16 +461,16 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>PersCommEmail_dfo</name>
+ <name>EmailCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -480,18 +480,18 @@
<children>
<entityParameter>
<name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
- <consumer>PersAddress_dfo</consumer>
+ <consumer>PersAddresses</consumer>
<displayValueProcess>%aditoprj%/entity/Pers_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
@@ -502,7 +502,7 @@
<iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityConsumer>
- <name>ObjectRelation_dfo</name>
+ <name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -514,11 +514,11 @@
<entityParameter>
<name>AnyObjectRowid_param</name>
<title></title>
- <code>%aditoprj%/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Pers_entity/entityfields/persactivity_dfo/children/objectid_param/code.js b/entity/Pers_entity/entityfields/activities/children/objectid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persactivity_dfo/children/objectid_param/code.js
rename to entity/Pers_entity/entityfields/activities/children/objectid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persactivity_dfo/children/rowid_param/code.js b/entity/Pers_entity/entityfields/activities/children/rowid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persactivity_dfo/children/rowid_param/code.js
rename to entity/Pers_entity/entityfields/activities/children/rowid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/communications/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/communications/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/contracts/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/contracts/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js b/entity/Pers_entity/entityfields/documents/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js
rename to entity/Pers_entity/entityfields/documents/children/assignmentname_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/documents/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/documents/children/assignmentrowid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js b/entity/Pers_entity/entityfields/documents/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js
rename to entity/Pers_entity/entityfields/documents/children/assignmenttable_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js b/entity/Pers_entity/entityfields/emailcommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js
rename to entity/Pers_entity/entityfields/emailcommunications/children/commcategory_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/emailcommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/emailcommunications/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js b/entity/Pers_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
rename to entity/Pers_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
diff --git a/entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js b/entity/Pers_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
rename to entity/Pers_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
diff --git a/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js b/entity/Pers_entity/entityfields/orgaddresses/children/relationtype_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js
rename to entity/Pers_entity/entityfields/orgaddresses/children/relationtype_param/code.js
diff --git a/entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/orgaddresses/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/orgaddresses/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js b/entity/Pers_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js
rename to entity/Pers_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js b/entity/Pers_entity/entityfields/persaddresses/children/relationtype_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js
rename to entity/Pers_entity/entityfields/persaddresses/children/relationtype_param/code.js
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/persaddresses/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/persaddresses/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js b/entity/Pers_entity/entityfields/phonecommunications/children/commcategory_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js
rename to entity/Pers_entity/entityfields/phonecommunications/children/commcategory_param/code.js
diff --git a/entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js b/entity/Pers_entity/entityfields/phonecommunications/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Pers_entity/entityfields/phonecommunications/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/pricelists/children/relid_param/code.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perspricelist_dfo/children/relid_param/code.js
rename to entity/Pers_entity/entityfields/pricelists/children/relid_param/code.js
diff --git a/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js b/entity/Pers_entity/entityfields/pricelists/stateProcess.js
similarity index 100%
rename from entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js
rename to entity/Pers_entity/entityfields/pricelists/stateProcess.js
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 2472e0ed4c4..b149b5d70da 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -162,7 +162,7 @@
<entityDependency>
<name>268bacb4-334d-42ba-9685-11e4854f0d85</name>
<entityName>Pers_entity</entityName>
- <fieldName>PersPricelist_dfo</fieldName>
+ <fieldName>Pricelists</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod
index 2617caa091f..131d5328b54 100644
--- a/neonView/PersEdit_view/PersEdit_view.aod
+++ b/neonView/PersEdit_view/PersEdit_view.aod
@@ -57,17 +57,17 @@
</genericViewTemplate>
<neonViewReference>
<name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
- <entityField>PersAddress_dfo</entityField>
+ <entityField>PersAddresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>5bfb64da-09d6-417d-a4b8-f5a2ffc1747e</name>
- <entityField>PersOrgsAddresses_dfo</entityField>
+ <entityField>OrgAddresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
- <entityField>PersComm_dfo</entityField>
+ <entityField>Communications</entityField>
<view>CommMultiEdit_view</view>
</neonViewReference>
</children>
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod
index 30375651ab1..20a0695a78d 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/PersMain_view/PersMain_view.aod
@@ -16,22 +16,22 @@
</neonViewReference>
<neonViewReference>
<name>d674b32c-0493-47ea-a51f-dff5d13d237d</name>
- <entityField>PersActivity_dfo</entityField>
+ <entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
- <entityField>PersDocument_dfo</entityField>
+ <entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>ec344a07-7b82-4c54-b06b-30ac5b8599f9</name>
- <entityField>PersContract_dfo</entityField>
+ <entityField>Contracts</entityField>
<view>ContractFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>726f10a6-dad6-4325-a73e-2d6caf0340db</name>
- <entityField>ObjectRelation_dfo</entityField>
+ <entityField>ObjectRelations</entityField>
<view>ObjectRelationFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index 8ab6116c914..479540068d8 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -17,17 +17,17 @@
</cardViewTemplate>
<neonViewReference>
<name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
- <entityField>PersComm_dfo</entityField>
+ <entityField>Communications</entityField>
<view>CommList_view</view>
</neonViewReference>
<neonViewReference>
<name>4c4b1e66-fdc2-469c-a553-244b6dbffbe0</name>
- <entityField>PersAddress_dfo</entityField>
+ <entityField>PersAddresses</entityField>
<view>AddressList_view</view>
</neonViewReference>
<neonViewReference>
<name>38bd1cc7-8b75-4755-8bb2-0177f02bbef5</name>
- <entityField>PersOrgsAddresses_dfo</entityField>
+ <entityField>OrgAddresses</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
index bdc4c0a6960..0fee931f04b 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
@@ -3,9 +3,7 @@
<changeSet author="j.goderbauer" id="d09ba6ae-3eae-48c0-9bb4-e93127e142ab">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-4b9e-b130-dde8b2b518ad"/>
- <column name="USER_NEW" value="system"/>
- <column name="DATE_NEW" valueDate="CURRENT_TIMESTAMP()"/>
-
+
<column name="KEYID" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
<column name="TITLE" value="Incoming"/>
<column name="CONTAINER" value="ActivityDirection"/>
@@ -15,9 +13,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6f4c6e49-36ca-4b91-ba83-c507203e1eac"/>
- <column name="USER_NEW" value="system"/>
- <column name="DATE_NEW" valueDate="CURRENT_TIMESTAMP()"/>
-
+
<column name="KEYID" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
<column name="TITLE" value="Outgoing"/>
<column name="CONTAINER" value="ActivityDirection"/>
@@ -27,9 +23,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-4835-b458-6751f137a941"/>
- <column name="USER_NEW" value="system"/>
- <column name="DATE_NEW" valueDate="CURRENT_TIMESTAMP()"/>
-
+
<column name="KEYID" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
<column name="TITLE" value="Internal"/>
<column name="CONTAINER" value="ActivityDirection"/>
--
GitLab