From 950c34eb50b40630f72de25381aee7d9558fe9c6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 7 Dec 2018 14:07:54 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1029627][Preview
Kontakt: Standard-Kommunikationsadresse] unified different commviews
---
entity/Comm_entity/Comm_entity.aod | 331 +++---
entity/Comm_entity/conditionProcess.js | 27 -
.../medium_id/possibleItemsProcess.js | 26 +-
entity/Comm_entity/orderClauseProcess.js | 4 -
.../recordcontainers/db/conditionProcess.js | 33 +-
entity/Org_entity/Org_entity.aod | 1018 ++++++++---------
.../mediumcategoriesfilter_param/code.js | 4 -
.../children/relid_param/code.js | 4 -
.../mediumcategoriesfilter_param/code.js | 4 -
.../children/relid_param/code.js | 4 -
.../mediumcategoriesfilter_param/code.js | 4 -
.../children/relid_param/code.js | 4 -
entity/Pers_entity/Pers_entity.aod | 68 +-
.../mediumcategoriesfilter_param/code.js | 4 -
.../children/relid_param/code.js | 4 -
.../mediumcategoriesfilter_param/code.js | 4 -
.../children/relid_param/code.js | 4 -
.../mediumcategoriesfilter_param/code.js | 4 -
.../children/relid_param/code.js | 4 -
neonView/OrgPreview_view/OrgPreview_view.aod | 20 +-
.../PersPreview_view/PersPreview_view.aod | 20 +-
21 files changed, 670 insertions(+), 925 deletions(-)
delete mode 100644 entity/Comm_entity/conditionProcess.js
delete mode 100644 entity/Comm_entity/orderClauseProcess.js
delete mode 100644 entity/Org_entity/entityfields/orgcommemail_dfo/children/mediumcategoriesfilter_param/code.js
delete mode 100644 entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js
delete mode 100644 entity/Org_entity/entityfields/orgcommothers_dfo/children/mediumcategoriesfilter_param/code.js
delete mode 100644 entity/Org_entity/entityfields/orgcommothers_dfo/children/relid_param/code.js
delete mode 100644 entity/Org_entity/entityfields/orgcommphone_dfo/children/mediumcategoriesfilter_param/code.js
delete mode 100644 entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js
delete mode 100644 entity/Pers_entity/entityfields/perscommemail_dfo/children/mediumcategoriesfilter_param/code.js
delete mode 100644 entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js
delete mode 100644 entity/Pers_entity/entityfields/perscommothers_dfo/children/mediumcategoriesfilter_param/code.js
delete mode 100644 entity/Pers_entity/entityfields/perscommothers_dfo/children/relid_param/code.js
delete mode 100644 entity/Pers_entity/entityfields/perscommphone_dfo/children/mediumcategoriesfilter_param/code.js
delete mode 100644 entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 607793a048c..3a13fb3ddd2 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -1,162 +1,169 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
- <name>Comm_entity</name>
- <title>Communication</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainerType>DB</recordContainerType>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Comm_entity/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Comm_entity/orderClauseProcess.js</orderClauseProcess>
- <recordContainer>db</recordContainer>
- <linkInformation>
- <linkInformation>
- <name>54875441-f1b0-47d1-9fa6-c1927863f3e3</name>
- <tableName>COMM</tableName>
- <primaryKey>COMMID</primaryKey>
- <isUIDTable v="true" />
- </linkInformation>
- </linkInformation>
- <entityFields>
- <entityField>
- <name>ADDR</name>
- <title>${COMM_ADDRESS}</title>
- <tableName>COMM</tableName>
- <columnName>ADDR</columnName>
- <contentTypeProcess>%aditoprj%/entity/Comm_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
- <onValidation>%aditoprj%/entity/Comm_entity/entityfields/addr/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>COMMID</name>
- <tableName>COMM</tableName>
- <columnName>COMMID</columnName>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/commid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <tableName>COMM</tableName>
- <columnName>DATE_EDIT</columnName>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <tableName>COMM</tableName>
- <columnName>DATE_NEW</columnName>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>MEDIUM_ID</name>
- <title>Medium</title>
- <tableName>COMM</tableName>
- <columnName>MEDIUM_ID</columnName>
- <possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>RELATION_ID</name>
- <tableName>COMM</tableName>
- <columnName>RELATION_ID</columnName>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/relation_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STANDARD</name>
- <tableName>COMM</tableName>
- <columnName>STANDARD</columnName>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <tableName>COMM</tableName>
- <columnName>USER_EDIT</columnName>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <tableName>COMM</tableName>
- <columnName>USER_NEW</columnName>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>RelId_param</name>
- <expose v="true" />
- <description>This parameter is used for specifing a related &quot;RELATIONID&quot; to a COMM-entry.
-Usually this is used for filtering COMM-entires by a specified contact or creating a new entry that is related to a contact.</description>
- </entityParameter>
- <entityField>
- <name>IS_STANDARD</name>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/is_standard/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>This param is used for filtering the categories of MEDIUM_IDs. For example share mobile-phone and in-house-telephone the same category (it&apos;s a telephone-number).
-So, for only showing telephone-types you&apos;ve to specify this parameter with it&apos;s phone-number-category.
-</description>
- </entityParameter>
- <entityIncomingField>
- <name>#INCOMING</name>
- <recordContainer>db</recordContainer>
- </entityIncomingField>
- <entityParameter>
- <name>RelationsMainCountry_param</name>
- <code>%aditoprj%/entity/Comm_entity/entityfields/relationsmaincountry_param/code.js</code>
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Comm_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Comm_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>e3567770-187a-4366-bb87-fb22ff7ff257</name>
- <tableName>COMM</tableName>
- <primaryKey>COMMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDR.value</name>
- <value>COMM.ADDR</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MEDIUM_ID.value</name>
- <value>COMM.MEDIUM_ID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COMMID.value</name>
- <value>COMM.COMMID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>RELATION_ID.value</name>
- <value>COMM.RELATION_ID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <value>COMM.DATE_EDIT</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STANDARD.value</name>
- <value>COMM.STANDARD</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <value>COMM.DATE_NEW</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <value>COMM.USER_EDIT</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <value>COMM.USER_NEW</value>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
+ <name>Comm_entity</name>
+ <title>Communication</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>DB</recordContainerType>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>ADDR</name>
+ <title>${COMM_ADDRESS}</title>
+ <tableName>COMM</tableName>
+ <columnName>ADDR</columnName>
+ <contentTypeProcess>%aditoprj%/entity/Comm_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
+ <onValidation>%aditoprj%/entity/Comm_entity/entityfields/addr/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>COMMID</name>
+ <tableName>COMM</tableName>
+ <columnName>COMMID</columnName>
+ <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/commid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <tableName>COMM</tableName>
+ <columnName>DATE_EDIT</columnName>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <tableName>COMM</tableName>
+ <columnName>DATE_NEW</columnName>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>MEDIUM_ID</name>
+ <title>Medium</title>
+ <tableName>COMM</tableName>
+ <columnName>MEDIUM_ID</columnName>
+ <possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>RELATION_ID</name>
+ <tableName>COMM</tableName>
+ <columnName>RELATION_ID</columnName>
+ <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STANDARD</name>
+ <tableName>COMM</tableName>
+ <columnName>STANDARD</columnName>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <tableName>COMM</tableName>
+ <columnName>USER_EDIT</columnName>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <tableName>COMM</tableName>
+ <columnName>USER_NEW</columnName>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>RelId_param</name>
+ <expose v="true" />
+ <description>This parameter is used for specifing a related &quot;RELATIONID&quot; to a COMM-entry.
+Usually this is used for filtering COMM-entires by a specified contact or creating a new entry that is related to a contact.</description>
+ </entityParameter>
+ <entityField>
+ <name>IS_STANDARD</name>
+ <contentType>BOOLEAN</contentType>
+ <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+ </entityField>
+ <entityIncomingField>
+ <name>#INCOMING</name>
+ <recordContainer>db</recordContainer>
+ </entityIncomingField>
+ <entityParameter>
+ <name>RelationsMainCountry_param</name>
+ <code>%aditoprj%/entity/Comm_entity/entityfields/relationsmaincountry_param/code.js</code>
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityIncomingField>
+ <name>OrgComm_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
+ <entityName>Org_entity</entityName>
+ <fieldName>OrgComm_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ <entityIncomingField>
+ <name>PersComm_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>e54350c7-b9a6-4f7a-ac35-506922f3964b</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>PersComm_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Comm_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Comm_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>e3567770-187a-4366-bb87-fb22ff7ff257</name>
+ <tableName>COMM</tableName>
+ <primaryKey>COMMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDR.value</name>
+ <value>COMM.ADDR</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MEDIUM_ID.value</name>
+ <value>COMM.MEDIUM_ID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>COMMID.value</name>
+ <value>COMM.COMMID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RELATION_ID.value</name>
+ <value>COMM.RELATION_ID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <value>COMM.DATE_EDIT</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD.value</name>
+ <value>COMM.STANDARD</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <value>COMM.DATE_NEW</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <value>COMM.USER_EDIT</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <value>COMM.USER_NEW</value>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Comm_entity/conditionProcess.js b/entity/Comm_entity/conditionProcess.js
deleted file mode 100644
index 5bf7469f85c..00000000000
--- a/entity/Comm_entity/conditionProcess.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-import("Keyword_lib");
-
-var relId, cond;
-cond = new SqlCondition();
-
-cond.andPrepareVars("COMM.RELATION_ID", "$param.RelId_param");
-
-if (vars.exists("$param.MediumCategoriesFilter_param")){
- mediumCategories = vars.get("$param.MediumCategoriesFilter_param");
- if (mediumCategories != null && mediumCategories != "") {
- mediumCategories = text.decodeMS(mediumCategories);
- var kwd = KeywordUtils.createKeyword("COMM.MEDIUM");
- kwd.filter(function(id, name, customs){
- return mediumCategories.indexOf(customs.category) > -1;
- });
- mediumIds = kwd.toArray("id");
- if (mediumIds.length == 0)
- throw new Error();//TODO: add message
-
- cond.and("COMM.MEDIUM_ID in (" + mediumIds.join(", ") + ")");
- }
-}
-
-result.string(db.translateCondition(cond.build("1 = 2")));
\ No newline at end of file
diff --git a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
index abec3313396..4cdb3f37796 100644
--- a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
+++ b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
@@ -1,19 +1,7 @@
-import("system.text");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-
-var mediumCategories, kwd, items;
-
-if (vars.exists("$param.MediumCategoriesFilter_param") && (mediumCategories = vars.get("$param.MediumCategoriesFilter_param")) != ""){
- mediumCategories = text.decodeMS(mediumCategories);
- kwd = KeywordUtils.createKeyword("COMM.MEDIUM");
- kwd.filter(function(id, name, customs){
- return mediumCategories.indexOf(customs.category) > -1;
- });
- items = kwd.toArray();
-}
-else {
- items = KeywordUtils.getStandardArray("COMM.MEDIUM");
-}
-result.object(items);
+import("system.text");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+var items = KeywordUtils.getStandardArray("COMM.MEDIUM");
+result.object(items);
diff --git a/entity/Comm_entity/orderClauseProcess.js b/entity/Comm_entity/orderClauseProcess.js
deleted file mode 100644
index abc10fd9cec..00000000000
--- a/entity/Comm_entity/orderClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({"COMM.MEDIUM_ID": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/Comm_entity/recordcontainers/db/conditionProcess.js b/entity/Comm_entity/recordcontainers/db/conditionProcess.js
index 56359a39d6f..23d8172fec6 100644
--- a/entity/Comm_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Comm_entity/recordcontainers/db/conditionProcess.js
@@ -1,27 +1,8 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-import("Keyword_lib");
-
-var relId, cond;
-cond = new SqlCondition();
-
-cond.andPrepareVars("COMM.RELATION_ID", "$param.RelId_param");
-
-if (vars.exists("$param.MediumCategoriesFilter_param")){
- mediumCategories = vars.get("$param.MediumCategoriesFilter_param");
- if (mediumCategories != null && mediumCategories != "") {
- mediumCategories = text.decodeMS(mediumCategories);
- var kwd = KeywordUtils.createKeyword("COMM.MEDIUM");
- kwd.filter(function(id, name, customs){
- return mediumCategories.indexOf(customs.category) > -1;
- });
- mediumIds = kwd.toArray("id");
- if (mediumIds.length == 0)
- throw new Error();//TODO: add message
-
- cond.and("COMM.MEDIUM_ID in (" + mediumIds.join(", ") + ")");
- }
-}
-
+import("system.db");
+import("system.result");
+import("Sql_lib");
+import("Keyword_lib");
+
+var cond = new SqlCondition();
+cond.andPrepareVars("COMM.RELATION_ID", "$param.RelId_param");
result.string(db.translateCondition([cond.toString("1 = 2"), cond.preparedValues]));
\ No newline at end of file
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 8c227a8a2f1..95e0a9b1663 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -1,542 +1,476 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
- <name>Org_entity</name>
- <title>Company</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainerType>DB</recordContainerType>
- <iconId>VAADIN:BUILDING</iconId>
- <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess>
- <titleProcess>%aditoprj%/entity/Org_entity/titleProcess.js</titleProcess>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Org_entity/fromClauseProcess.js</fromClauseProcess>
- <recordContainer>db</recordContainer>
- <linkInformation>
- <linkInformation>
- <name>e6da0207-83ee-4d87-86e3-46871ea92bb2</name>
- <tableName>ORG</tableName>
- <primaryKey>ORGID</primaryKey>
- <isUIDTable v="true" />
- </linkInformation>
- <linkInformation>
- <name>63a3a2f1-fcfb-4a16-869b-37c983a5248e</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
- </linkInformation>
- </linkInformation>
- <entityFields>
- <entityField>
- <name>CUSTOMERCODE</name>
- <title>Customercode</title>
- <tableName>ORG</tableName>
- <columnName>CUSTOMERCODE</columnName>
- <contentType>TEXT</contentType>
- </entityField>
- <entityField>
- <name>ORG_DATE_EDIT</name>
- <tableName>ORG</tableName>
- <columnName>DATE_EDIT</columnName>
- <contentType>DATE</contentType>
- <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ORG_DATE_NEW</name>
- <tableName>ORG</tableName>
- <columnName>DATE_NEW</columnName>
- <contentType>DATE</contentType>
- <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>INFO</name>
- <title>Information</title>
- <tableName>ORG</tableName>
- <columnName>INFO</columnName>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>NAME</name>
- <title>Name</title>
- <tableName>ORG</tableName>
- <columnName>NAME</columnName>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>ORGID</name>
- <tableName>ORG</tableName>
- <columnName>ORGID</columnName>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/orgid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ORG_USER_EDIT</name>
- <tableName>ORG</tableName>
- <columnName>USER_EDIT</columnName>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ORG_USER_NEW</name>
- <tableName>ORG</tableName>
- <columnName>USER_NEW</columnName>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>REL_DATE_EDIT</name>
- <tableName>RELATION</tableName>
- <columnName>DATE_EDIT</columnName>
- <contentType>DATE</contentType>
- <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>REL_DATE_NEW</name>
- <tableName>RELATION</tableName>
- <columnName>DATE_NEW</columnName>
- <contentType>DATE</contentType>
- <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LANGUAGE</name>
- <title>Language</title>
- <tableName>RELATION</tableName>
- <columnName>LANGUAGE</columnName>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
- <selectionMode>SINGLE</selectionMode>
- </entityField>
- <entityField>
- <name>ORG_ID</name>
- <tableName>RELATION</tableName>
- <columnName>ORG_ID</columnName>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>RELATIONID</name>
- <tableName>RELATION</tableName>
- <columnName>RELATIONID</columnName>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>STATUS</name>
- <title>Status</title>
- <tableName>RELATION</tableName>
- <columnName>STATUS</columnName>
- <contentType>TEXT</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>REL_USER_EDIT</name>
- <tableName>RELATION</tableName>
- <columnName>USER_EDIT</columnName>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>REL_USER_NEW</name>
- <tableName>RELATION</tableName>
- <columnName>USER_NEW</columnName>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TYPE</name>
- <title>Type</title>
- <tableName>ORG</tableName>
- <columnName>TYPE</columnName>
- <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
- <searchable v="false" />
- </entityField>
- <entityOutgoingField>
- <name>OrgHistory_dfo</name>
- <title>Histories</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>History_entity</entityName>
- <fieldName>OrgHistory_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RowId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orghistory_dfo/children/rowid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>PersOrg_dfo</name>
- <title>Contacts</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersOrg_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>OrgId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/persorg_dfo/children/orgid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityFieldGroup>
- <name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Org_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
- <description>FIELDGROUP</description>
- <fields>
- <element>CUSTOMERCODE</element>
- </fields>
- </entityFieldGroup>
- <entityIncomingField>
- <name>Org_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>11f8e13a-d801-4bd6-829c-d334c49e9a4c</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersOrg_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>5132d22f-8e82-4ab6-bc3b-5cddcbf09661</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractOrg_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>25e5cc50-0443-4e79-8690-a47197706936</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductOrg_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectOrg_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
- <entityName>Relation_entity</entityName>
- <fieldName>RelationOrg_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- </dependencies>
- </entityIncomingField>
- <entityOutgoingField>
- <name>OrgAddress_dfo</name>
- <title>Addresses</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrgAddress_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>StandardAddressId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/standardaddressid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityField>
- <name>ADDRESS_ID</name>
- <tableName>RELATION</tableName>
- <columnName>ADDRESS_ID</columnName>
- <searchable v="false" />
- </entityField>
- <entityOutgoingField>
- <name>OrgComm_dfo</name>
- <title>Communication</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>OrgCommEmail_dfo</name>
- <title>Communication E-Mail</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommemail_dfo/children/mediumcategoriesfilter_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>OrgCommPhone_dfo</name>
- <title>Communication Phone</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommphone_dfo/children/mediumcategoriesfilter_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>OrgCommOthers_dfo</name>
- <title>Communication Other</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommothers_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcommothers_dfo/children/mediumcategoriesfilter_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>OrgContract_dfo</name>
- <title>Contracts</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Contract_entity</entityName>
- <fieldName>OrgContract_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>OrgProduct_dfo</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/Org_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js</code>
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>OrgProductprice_dfo</name>
- <title>Conditions</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>OrgProductprice_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelID_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js</code>
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityIncomingField>
- <name>#INCOMING</name>
- </entityIncomingField>
- <entityOutgoingField>
- <name>OrgDocument_dfo</name>
- <title>Documents</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>OrgDocument_dfi</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js</code>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js</code>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js</code>
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityIncomingField>
- <name>RelationOrg_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- </entityIncomingField>
- <entityParameter>
- <name>relationId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Org_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Org_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>ff0fa64f-4d73-49b3-bc02-02018392e838</name>
- <tableName>ORG</tableName>
- <primaryKey>ORGID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>e3033b6f-966e-415a-9390-c61d5a1b19fc</name>
- <tableName>RELATION</tableName>
- <primaryKey>RELATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDRESS_ID.value</name>
- <value>RELATION.ADDRESS_ID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CUSTOMERCODE.value</name>
- <value>ORG.CUSTOMERCODE</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <value>ORG.INFO</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <value>RELATION.LANGUAGE</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NAME.value</name>
- <value>ORG.NAME</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_DATE_EDIT.value</name>
- <value>ORG.DATE_EDIT</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_DATE_NEW.value</name>
- <value>ORG.DATE_NEW</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGID.value</name>
- <value>ORG.ORGID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_USER_EDIT.value</name>
- <value>ORG.USER_EDIT</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_USER_NEW.value</name>
- <value>ORG.USER_NEW</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_ID.value</name>
- <value>RELATION.ORG_ID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REL_DATE_EDIT.value</name>
- <value>RELATION.DATE_EDIT</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REL_DATE_NEW.value</name>
- <value>RELATION.DATE_NEW</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REL_USER_EDIT.value</name>
- <value>RELATION.USER_EDIT</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REL_USER_NEW.value</name>
- <value>RELATION.USER_NEW</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>RELATIONID.value</name>
- <value>RELATION.RELATIONID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.value</name>
- <value>RELATION.STATUS</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <value>ORG.TYPE</value>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
+ <name>Org_entity</name>
+ <title>Company</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainerType>DB</recordContainerType>
+ <iconId>VAADIN:BUILDING</iconId>
+ <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess>
+ <titleProcess>%aditoprj%/entity/Org_entity/titleProcess.js</titleProcess>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Org_entity/fromClauseProcess.js</fromClauseProcess>
+ <recordContainer>db</recordContainer>
+ <linkInformation>
+ <linkInformation>
+ <name>e6da0207-83ee-4d87-86e3-46871ea92bb2</name>
+ <tableName>ORG</tableName>
+ <primaryKey>ORGID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>63a3a2f1-fcfb-4a16-869b-37c983a5248e</name>
+ <tableName>RELATION</tableName>
+ <primaryKey>RELATIONID</primaryKey>
+ </linkInformation>
+ </linkInformation>
+ <entityFields>
+ <entityField>
+ <name>CUSTOMERCODE</name>
+ <title>Customercode</title>
+ <tableName>ORG</tableName>
+ <columnName>CUSTOMERCODE</columnName>
+ <contentType>TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>ORG_DATE_EDIT</name>
+ <tableName>ORG</tableName>
+ <columnName>DATE_EDIT</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ORG_DATE_NEW</name>
+ <tableName>ORG</tableName>
+ <columnName>DATE_NEW</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Information</title>
+ <tableName>ORG</tableName>
+ <columnName>INFO</columnName>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>NAME</name>
+ <title>Name</title>
+ <tableName>ORG</tableName>
+ <columnName>NAME</columnName>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>ORGID</name>
+ <tableName>ORG</tableName>
+ <columnName>ORGID</columnName>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/orgid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ORG_USER_EDIT</name>
+ <tableName>ORG</tableName>
+ <columnName>USER_EDIT</columnName>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ORG_USER_NEW</name>
+ <tableName>ORG</tableName>
+ <columnName>USER_NEW</columnName>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>REL_DATE_EDIT</name>
+ <tableName>RELATION</tableName>
+ <columnName>DATE_EDIT</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>REL_DATE_NEW</name>
+ <tableName>RELATION</tableName>
+ <columnName>DATE_NEW</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <title>Language</title>
+ <tableName>RELATION</tableName>
+ <columnName>LANGUAGE</columnName>
+ <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+ <selectionMode>SINGLE</selectionMode>
+ </entityField>
+ <entityField>
+ <name>ORG_ID</name>
+ <tableName>RELATION</tableName>
+ <columnName>ORG_ID</columnName>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>RELATIONID</name>
+ <tableName>RELATION</tableName>
+ <columnName>RELATIONID</columnName>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>STATUS</name>
+ <title>Status</title>
+ <tableName>RELATION</tableName>
+ <columnName>STATUS</columnName>
+ <contentType>TEXT</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>REL_USER_EDIT</name>
+ <tableName>RELATION</tableName>
+ <columnName>USER_EDIT</columnName>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>REL_USER_NEW</name>
+ <tableName>RELATION</tableName>
+ <columnName>USER_NEW</columnName>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ <title>Type</title>
+ <tableName>ORG</tableName>
+ <columnName>TYPE</columnName>
+ <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
+ <searchable v="false" />
+ </entityField>
+ <entityOutgoingField>
+ <name>OrgHistory_dfo</name>
+ <title>Histories</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>History_entity</entityName>
+ <fieldName>OrgHistory_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orghistory_dfo/children/rowid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityOutgoingField>
+ <name>PersOrg_dfo</name>
+ <title>Contacts</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>PersOrg_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OrgId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/persorg_dfo/children/orgid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>CUSTOMERCODE</element>
+ </fields>
+ </entityFieldGroup>
+ <entityIncomingField>
+ <name>Org_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>11f8e13a-d801-4bd6-829c-d334c49e9a4c</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>PersOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5132d22f-8e82-4ab6-bc3b-5cddcbf09661</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>25e5cc50-0443-4e79-8690-a47197706936</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
+ <entityName>Relation_entity</entityName>
+ <fieldName>RelationOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ <entityOutgoingField>
+ <name>OrgAddress_dfo</name>
+ <title>Addresses</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrgAddress_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RelId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>StandardAddressId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/standardaddressid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityField>
+ <name>ADDRESS_ID</name>
+ <tableName>RELATION</tableName>
+ <columnName>ADDRESS_ID</columnName>
+ <searchable v="false" />
+ </entityField>
+ <entityOutgoingField>
+ <name>OrgComm_dfo</name>
+ <title>Communication</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Comm_entity</entityName>
+ <fieldName>OrgComm_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RelId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityOutgoingField>
+ <name>OrgContract_dfo</name>
+ <title>Contracts</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>OrgContract_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RelId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityOutgoingField>
+ <name>OrgProduct_dfo</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/Org_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityOutgoingField>
+ <name>OrgProductprice_dfo</name>
+ <title>Conditions</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>OrgProductprice_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RelID_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityIncomingField>
+ <name>#INCOMING</name>
+ </entityIncomingField>
+ <entityOutgoingField>
+ <name>OrgDocument_dfo</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>OrgDocument_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityIncomingField>
+ <name>RelationOrg_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ </entityIncomingField>
+ <entityParameter>
+ <name>relationId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Org_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Org_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>ff0fa64f-4d73-49b3-bc02-02018392e838</name>
+ <tableName>ORG</tableName>
+ <primaryKey>ORGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>e3033b6f-966e-415a-9390-c61d5a1b19fc</name>
+ <tableName>RELATION</tableName>
+ <primaryKey>RELATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.value</name>
+ <value>RELATION.ADDRESS_ID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CUSTOMERCODE.value</name>
+ <value>ORG.CUSTOMERCODE</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <value>ORG.INFO</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <value>RELATION.LANGUAGE</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME.value</name>
+ <value>ORG.NAME</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_DATE_EDIT.value</name>
+ <value>ORG.DATE_EDIT</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_DATE_NEW.value</name>
+ <value>ORG.DATE_NEW</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGID.value</name>
+ <value>ORG.ORGID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_USER_EDIT.value</name>
+ <value>ORG.USER_EDIT</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_USER_NEW.value</name>
+ <value>ORG.USER_NEW</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_ID.value</name>
+ <value>RELATION.ORG_ID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REL_DATE_EDIT.value</name>
+ <value>RELATION.DATE_EDIT</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REL_DATE_NEW.value</name>
+ <value>RELATION.DATE_NEW</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REL_USER_EDIT.value</name>
+ <value>RELATION.USER_EDIT</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REL_USER_NEW.value</name>
+ <value>RELATION.USER_NEW</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RELATIONID.value</name>
+ <value>RELATION.RELATIONID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <value>RELATION.STATUS</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <value>ORG.TYPE</value>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Org_entity/entityfields/orgcommemail_dfo/children/mediumcategoriesfilter_param/code.js b/entity/Org_entity/entityfields/orgcommemail_dfo/children/mediumcategoriesfilter_param/code.js
deleted file mode 100644
index aaff61e4c88..00000000000
--- a/entity/Org_entity/entityfields/orgcommemail_dfo/children/mediumcategoriesfilter_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.text");
-import("system.result");
-
-result.string(text.encodeMS(["EMAIL"]));
diff --git a/entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js b/entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js
deleted file mode 100644
index c618e8d6e5c..00000000000
--- a/entity/Org_entity/entityfields/orgcommemail_dfo/children/relid_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/Org_entity/entityfields/orgcommothers_dfo/children/mediumcategoriesfilter_param/code.js b/entity/Org_entity/entityfields/orgcommothers_dfo/children/mediumcategoriesfilter_param/code.js
deleted file mode 100644
index 4f54b7ffc8a..00000000000
--- a/entity/Org_entity/entityfields/orgcommothers_dfo/children/mediumcategoriesfilter_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.text");
-import("system.result");
-
-result.string(text.encodeMS(["OTHER"]));
diff --git a/entity/Org_entity/entityfields/orgcommothers_dfo/children/relid_param/code.js b/entity/Org_entity/entityfields/orgcommothers_dfo/children/relid_param/code.js
deleted file mode 100644
index c618e8d6e5c..00000000000
--- a/entity/Org_entity/entityfields/orgcommothers_dfo/children/relid_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/Org_entity/entityfields/orgcommphone_dfo/children/mediumcategoriesfilter_param/code.js b/entity/Org_entity/entityfields/orgcommphone_dfo/children/mediumcategoriesfilter_param/code.js
deleted file mode 100644
index 10d8f95a842..00000000000
--- a/entity/Org_entity/entityfields/orgcommphone_dfo/children/mediumcategoriesfilter_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.text");
-import("system.result");
-
-result.string(text.encodeMS(["PHONE"]));
diff --git a/entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js b/entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js
deleted file mode 100644
index c618e8d6e5c..00000000000
--- a/entity/Org_entity/entityfields/orgcommphone_dfo/children/relid_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/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index bacbbccbeeb..e18b7ebe4a8 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -258,7 +258,7 @@
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
+ <fieldName>PersComm_dfi</fieldName>
</dependency>
<children>
<entityParameter>
@@ -307,72 +307,6 @@
<fieldName>Org_dfi</fieldName>
</dependency>
</entityOutgoingField>
- <entityOutgoingField>
- <name>PersCommPhone_dfo</name>
- <title>Communication Phone</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommphone_dfo/children/mediumcategoriesfilter_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>PersCommEmail_dfo</name>
- <title>Communication E-Mail</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommemail_dfo/children/mediumcategoriesfilter_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
- <entityOutgoingField>
- <name>PersCommOthers_dfo</name>
- <title>Communication Other</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Comm_entity</entityName>
- <fieldName>#INCOMING</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RelId_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommothers_dfo/children/relid_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>MediumCategoriesFilter_param</name>
- <code>%aditoprj%/entity/Pers_entity/entityfields/perscommothers_dfo/children/mediumcategoriesfilter_param/code.js</code>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityOutgoingField>
<entityOutgoingField>
<name>PersContract_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
diff --git a/entity/Pers_entity/entityfields/perscommemail_dfo/children/mediumcategoriesfilter_param/code.js b/entity/Pers_entity/entityfields/perscommemail_dfo/children/mediumcategoriesfilter_param/code.js
deleted file mode 100644
index aaff61e4c88..00000000000
--- a/entity/Pers_entity/entityfields/perscommemail_dfo/children/mediumcategoriesfilter_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.text");
-import("system.result");
-
-result.string(text.encodeMS(["EMAIL"]));
diff --git a/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js
deleted file mode 100644
index c618e8d6e5c..00000000000
--- a/entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_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/Pers_entity/entityfields/perscommothers_dfo/children/mediumcategoriesfilter_param/code.js b/entity/Pers_entity/entityfields/perscommothers_dfo/children/mediumcategoriesfilter_param/code.js
deleted file mode 100644
index 4f54b7ffc8a..00000000000
--- a/entity/Pers_entity/entityfields/perscommothers_dfo/children/mediumcategoriesfilter_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.text");
-import("system.result");
-
-result.string(text.encodeMS(["OTHER"]));
diff --git a/entity/Pers_entity/entityfields/perscommothers_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/perscommothers_dfo/children/relid_param/code.js
deleted file mode 100644
index c618e8d6e5c..00000000000
--- a/entity/Pers_entity/entityfields/perscommothers_dfo/children/relid_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/Pers_entity/entityfields/perscommphone_dfo/children/mediumcategoriesfilter_param/code.js b/entity/Pers_entity/entityfields/perscommphone_dfo/children/mediumcategoriesfilter_param/code.js
deleted file mode 100644
index 10d8f95a842..00000000000
--- a/entity/Pers_entity/entityfields/perscommphone_dfo/children/mediumcategoriesfilter_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.text");
-import("system.result");
-
-result.string(text.encodeMS(["PHONE"]));
diff --git a/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js
deleted file mode 100644
index c618e8d6e5c..00000000000
--- a/entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_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/neonView/OrgPreview_view/OrgPreview_view.aod b/neonView/OrgPreview_view/OrgPreview_view.aod
index dfa831fca34..5c8c95c6d94 100644
--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrgPreview_view/OrgPreview_view.aod
@@ -15,6 +15,11 @@
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <neonViewReference>
+ <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
+ <entityField>OrgComm_dfo</entityField>
+ <view>CommList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
<entityField>OrgAddress_dfo</entityField>
@@ -43,20 +48,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>7b3f1253-f671-4cf4-83ec-81e229910014</name>
- <entityField>OrgCommEmail_dfo</entityField>
- <view>CommList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>23f420cb-fd45-433f-b385-55a49e98744f</name>
- <entityField>OrgCommPhone_dfo</entityField>
- <view>CommList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c45d71cf-b81f-4d75-876d-7f9c26b1eb12</name>
- <entityField>OrgCommOthers_dfo</entityField>
- <view>CommList_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index c391c2986c3..43001905ea5 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -15,6 +15,11 @@
<descriptionField>ORG_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <neonViewReference>
+ <name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
+ <entityField>PersComm_dfo</entityField>
+ <view>CommList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>4c4b1e66-fdc2-469c-a553-244b6dbffbe0</name>
<entityField>PersAddress_dfo</entityField>
@@ -25,21 +30,6 @@
<entityField>OrgAddress_dfo</entityField>
<view>AddressList_view</view>
</neonViewReference>
- <neonViewReference>
- <name>45aae3a7-b04e-460f-a68d-8a40c6181528</name>
- <entityField>PersCommEmail_dfo</entityField>
- <view>CommList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>83e51f10-a205-409b-9780-a7ee14104cc1</name>
- <entityField>PersCommPhone_dfo</entityField>
- <view>CommList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>1dbf2020-a0e9-4f22-a1d7-aad60c9ec7d4</name>
- <entityField>PersCommOthers_dfo</entityField>
- <view>CommList_view</view>
- </neonViewReference>
<genericViewTemplate>
<name>PersInfo_template</name>
<showDrawer v="true" />
--
GitLab