From 0a4462c30ca48ae28fbab5bdf6aa8ebdc8686a4d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 12 Feb 2019 14:00:33 +0100
Subject: [PATCH] RELATION -> CONTACT (folder changes)
---
aliasDefinition/Data_alias/Data_alias.aod | 6 +++---
.../indexsearchgroups/{org => organisation}/affectedIds.js | 0
.../indexsearchgroups/{org => organisation}/query.js | 0
.../indexsearchgroups/{org => organisation}/subQueries.js | 0
.../entityfields/addr_type/possibleItemsProcess.js | 2 +-
.../{relation_id => contact_id}/valueProcess.js | 0
.../{relation_id => contact_id}/valueProcess.js | 0
entity/Contact_entity/Contact_entity.aod | 6 +++---
.../{org_id => organisation_id}/linkedContextProcess.js | 0
.../{org_id => organisation_id}/onValueChange.js | 0
.../{org_id => organisation_id}/valueProcess.js | 0
.../{relation_id => contact_id}/displayValueProcess.js | 2 +-
.../{relation_id => contact_id}/documentation.adoc | 0
.../{relation_id => contact_id}/fieldIdProcess.js | 0
.../entityfields/contact_id}/linkedContextProcess.js | 2 +-
.../{relation_id => contact_id}/displayValueProcess.js | 2 +-
.../{relation_id => contact_id}/documentation.adoc | 0
.../entityfields/contact_id}/linkedContextProcess.js | 2 +-
.../{relation_id => contact_id}/onValueChange.js | 0
.../{relation_id => contact_id}/valueProcess.js | 0
.../entityfields/salesproject_id/mandatoryProcess.js | 2 +-
.../{relation_id => contact_id}/displayValueProcess.js | 2 +-
.../{relation_id => contact_id}/documentation.adoc | 0
.../entityfields/contact_id}/linkedContextProcess.js | 2 +-
.../{relation_id => contact_id}/onValueChange.js | 0
entity/Organisation_entity/Organisation_entity.aod | 4 ++--
.../entityfields/{relationid => contactid}/valueProcess.js | 0
.../{org_id => organisation_id}/valueProcess.js | 0
.../entityfields/{orgid => organisationid}/valueProcess.js | 0
.../{relation_id => contact_id}/displayValueProcess.js | 2 +-
.../{relation_id => contact_id}/linkedContextProcess.js | 2 +-
.../{relation_id => contact_id}/valueProcess.js | 0
entity/Relation_entity/entityfields/image/valueProcess.js | 2 +-
.../entityfields/relationtype/valueProcess.js | 2 +-
.../recordcontainers/db/fromClauseProcess.js | 2 +-
.../expression.js | 0
.../expression.js | 0
.../expression.js | 0
.../expression.js | 0
.../struct/{create_relation.xml => create_contact.xml} | 0
.../Relation_lib.aod => Contact_lib/Contact_lib.aod} | 4 ++--
process/{Relation_lib => Contact_lib}/process.js | 0
process/PostalAddress_lib/process.js | 2 +-
43 files changed, 24 insertions(+), 24 deletions(-)
rename aliasDefinition/Data_alias/indexsearchgroups/{org => organisation}/affectedIds.js (100%)
rename aliasDefinition/Data_alias/indexsearchgroups/{org => organisation}/query.js (100%)
rename aliasDefinition/Data_alias/indexsearchgroups/{org => organisation}/subQueries.js (100%)
rename entity/Address_entity/entityfields/{relation_id => contact_id}/valueProcess.js (100%)
rename entity/Communication_entity/entityfields/{relation_id => contact_id}/valueProcess.js (100%)
rename entity/Contact_entity/entityfields/{org_id => organisation_id}/linkedContextProcess.js (100%)
rename entity/Contact_entity/entityfields/{org_id => organisation_id}/onValueChange.js (100%)
rename entity/Contact_entity/entityfields/{org_id => organisation_id}/valueProcess.js (100%)
rename entity/Contract_entity/entityfields/{relation_id => contact_id}/displayValueProcess.js (87%)
rename entity/Contract_entity/entityfields/{relation_id => contact_id}/documentation.adoc (100%)
rename entity/Contract_entity/entityfields/{relation_id => contact_id}/fieldIdProcess.js (100%)
rename entity/{Order_entity/entityfields/relation_id => Contract_entity/entityfields/contact_id}/linkedContextProcess.js (85%)
rename entity/Offer_entity/entityfields/{relation_id => contact_id}/displayValueProcess.js (87%)
rename entity/Offer_entity/entityfields/{relation_id => contact_id}/documentation.adoc (100%)
rename entity/{Contract_entity/entityfields/relation_id => Offer_entity/entityfields/contact_id}/linkedContextProcess.js (85%)
rename entity/Offer_entity/entityfields/{relation_id => contact_id}/onValueChange.js (100%)
rename entity/Offer_entity/entityfields/{relation_id => contact_id}/valueProcess.js (100%)
rename entity/Order_entity/entityfields/{relation_id => contact_id}/displayValueProcess.js (87%)
rename entity/Order_entity/entityfields/{relation_id => contact_id}/documentation.adoc (100%)
rename entity/{Offer_entity/entityfields/relation_id => Order_entity/entityfields/contact_id}/linkedContextProcess.js (85%)
rename entity/Order_entity/entityfields/{relation_id => contact_id}/onValueChange.js (100%)
rename entity/Organisation_entity/entityfields/{relationid => contactid}/valueProcess.js (100%)
rename entity/Organisation_entity/entityfields/{org_id => organisation_id}/valueProcess.js (100%)
rename entity/Organisation_entity/entityfields/{orgid => organisationid}/valueProcess.js (100%)
rename entity/Product_entity/entityfields/{relation_id => contact_id}/displayValueProcess.js (83%)
rename entity/Product_entity/entityfields/{relation_id => contact_id}/linkedContextProcess.js (83%)
rename entity/Productprice_entity/entityfields/{relation_id => contact_id}/valueProcess.js (100%)
rename entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/{relation_id.displayvalue => contact_id.displayvalue}/expression.js (100%)
rename entity/Task_entity/recordcontainers/db/recordfieldmappings/{editor_relation_id.displayvalue => editor_contact_id.displayvalue}/expression.js (100%)
rename entity/Task_entity/recordcontainers/db/recordfieldmappings/{requestor_relation_id.displayvalue => requestor_contact_id.displayvalue}/expression.js (100%)
rename entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/{relation_id.displayvalue => contact_id.displayvalue}/expression.js (100%)
rename others/db_changes/data_alias/struct/{create_relation.xml => create_contact.xml} (100%)
rename process/{Relation_lib/Relation_lib.aod => Contact_lib/Contact_lib.aod} (79%)
rename process/{Relation_lib => Contact_lib}/process.js (100%)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 63b72c50225..2bdae69edea 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4378,8 +4378,8 @@
<idColumn>CONTACTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
- <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/query.js</query>
- <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js</subQueries>
+ <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js</query>
+ <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js</subQueries>
<resultContextNeon>Organisation_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
@@ -4387,7 +4387,7 @@
<element>CONTACT</element>
<element>ORGANISATION</element>
</affectedTables>
- <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js</affectedIds>
+ <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js</affectedIds>
</indexSearchGroup>
<indexSearchGroup>
<name>PERS</name>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
similarity index 100%
rename from aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js
rename to aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
similarity index 100%
rename from aliasDefinition/Data_alias/indexsearchgroups/org/query.js
rename to aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
similarity index 100%
rename from aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js
rename to aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
diff --git a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
index 917d258620a..c61071b9bb7 100644
--- a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
+++ b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.result");
import("system.neon");
import("Keyword_lib");
-import("Relation_lib");
+import("Contact_lib");
if (vars.exists("$param.RelationType_param") && parseInt(vars.get("$param.RelationType_param"))) {
var type = parseInt(vars.get("$param.RelationType_param"));
diff --git a/entity/Address_entity/entityfields/relation_id/valueProcess.js b/entity/Address_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Address_entity/entityfields/relation_id/valueProcess.js
rename to entity/Address_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Communication_entity/entityfields/relation_id/valueProcess.js b/entity/Communication_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Communication_entity/entityfields/relation_id/valueProcess.js
rename to entity/Communication_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index d58abd622a0..4f24e7a4e82 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -127,11 +127,11 @@
<name>ORGANISATION_ID</name>
<title>Firma</title>
<consumer>Organisations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
+ <linkedContextProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="false" />
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/org_id/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/org_id/onValueChange.js</onValueChange>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>PersAddresses</name>
diff --git a/entity/Contact_entity/entityfields/org_id/linkedContextProcess.js b/entity/Contact_entity/entityfields/organisation_id/linkedContextProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/org_id/linkedContextProcess.js
rename to entity/Contact_entity/entityfields/organisation_id/linkedContextProcess.js
diff --git a/entity/Contact_entity/entityfields/org_id/onValueChange.js b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
similarity index 100%
rename from entity/Contact_entity/entityfields/org_id/onValueChange.js
rename to entity/Contact_entity/entityfields/organisation_id/onValueChange.js
diff --git a/entity/Contact_entity/entityfields/org_id/valueProcess.js b/entity/Contact_entity/entityfields/organisation_id/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/org_id/valueProcess.js
rename to entity/Contact_entity/entityfields/organisation_id/valueProcess.js
diff --git a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js b/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
similarity index 87%
rename from entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
index fb79547a4a1..5badfc772a9 100644
--- a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/relation_id/documentation.adoc b/entity/Contract_entity/entityfields/contact_id/documentation.adoc
similarity index 100%
rename from entity/Contract_entity/entityfields/relation_id/documentation.adoc
rename to entity/Contract_entity/entityfields/contact_id/documentation.adoc
diff --git a/entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js b/entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
similarity index 100%
rename from entity/Contract_entity/entityfields/relation_id/fieldIdProcess.js
rename to entity/Contract_entity/entityfields/contact_id/fieldIdProcess.js
diff --git a/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 85%
rename from entity/Order_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
index 6c368f92a7d..242297cdf0e 100644
--- a/entity/Order_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/displayValueProcess.js b/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
similarity index 87%
rename from entity/Offer_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
index 74315bcd708..ef417d00db9 100644
--- a/entity/Offer_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
diff --git a/entity/Offer_entity/entityfields/relation_id/documentation.adoc b/entity/Offer_entity/entityfields/contact_id/documentation.adoc
similarity index 100%
rename from entity/Offer_entity/entityfields/relation_id/documentation.adoc
rename to entity/Offer_entity/entityfields/contact_id/documentation.adoc
diff --git a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 85%
rename from entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
index 6c368f92a7d..242297cdf0e 100644
--- a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
similarity index 100%
rename from entity/Offer_entity/entityfields/relation_id/onValueChange.js
rename to entity/Offer_entity/entityfields/contact_id/onValueChange.js
diff --git a/entity/Offer_entity/entityfields/relation_id/valueProcess.js b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/relation_id/valueProcess.js
rename to entity/Offer_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
index c6e621e351c..709b88689ea 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
@@ -1,6 +1,6 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
var type = RelationUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERS_ID"), vars.get("$field.CONTACT_ORG_ID"));
diff --git a/entity/Order_entity/entityfields/relation_id/displayValueProcess.js b/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
similarity index 87%
rename from entity/Order_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Order_entity/entityfields/contact_id/displayValueProcess.js
index fb79547a4a1..5badfc772a9 100644
--- a/entity/Order_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/relation_id/documentation.adoc b/entity/Order_entity/entityfields/contact_id/documentation.adoc
similarity index 100%
rename from entity/Order_entity/entityfields/relation_id/documentation.adoc
rename to entity/Order_entity/entityfields/contact_id/documentation.adoc
diff --git a/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 85%
rename from entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
index 6c368f92a7d..242297cdf0e 100644
--- a/entity/Offer_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/relation_id/onValueChange.js b/entity/Order_entity/entityfields/contact_id/onValueChange.js
similarity index 100%
rename from entity/Order_entity/entityfields/relation_id/onValueChange.js
rename to entity/Order_entity/entityfields/contact_id/onValueChange.js
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 97ca55bc467..40455b2b8b1 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -27,7 +27,7 @@
<entityField>
<name>ORGANISATIONID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
@@ -38,7 +38,7 @@
<entityField>
<name>ORGANISATION_ID</name>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/org_id/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CONTACTID</name>
diff --git a/entity/Organisation_entity/entityfields/relationid/valueProcess.js b/entity/Organisation_entity/entityfields/contactid/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/relationid/valueProcess.js
rename to entity/Organisation_entity/entityfields/contactid/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/org_id/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_id/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/org_id/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisation_id/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/orgid/valueProcess.js b/entity/Organisation_entity/entityfields/organisationid/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/orgid/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisationid/valueProcess.js
diff --git a/entity/Product_entity/entityfields/relation_id/displayValueProcess.js b/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
similarity index 83%
rename from entity/Product_entity/entityfields/relation_id/displayValueProcess.js
rename to entity/Product_entity/entityfields/contact_id/displayValueProcess.js
index 8dbc1f5a8b8..6ed363112cd 100644
--- a/entity/Product_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Relation_lib");
+import("Contact_lib");
import("system.neon");
result.string(vars.getString("$field.ORG_NAME"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
similarity index 83%
rename from entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
rename to entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
index a7bd9107631..c52e323fc90 100644
--- a/entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
@@ -1,6 +1,6 @@
import("system.vars");
import("system.result");
-import("Relation_lib");
+import("Contact_lib");
if(vars.get("$field.CONTACT_ID"))
result.string("Organisation_context");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/relation_id/valueProcess.js b/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
similarity index 100%
rename from entity/Productprice_entity/entityfields/relation_id/valueProcess.js
rename to entity/Productprice_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Relation_entity/entityfields/image/valueProcess.js b/entity/Relation_entity/entityfields/image/valueProcess.js
index bcd36563dcf..7bb57f2663c 100644
--- a/entity/Relation_entity/entityfields/image/valueProcess.js
+++ b/entity/Relation_entity/entityfields/image/valueProcess.js
@@ -3,7 +3,7 @@ import("system.neon");
import("system.vars");
import("Pers_lib");
import("Organisation_lib");
-import("Relation_lib");
+import("Contact_lib");
if (vars.get("$field.relationType") == 1) // 1 == org, 2 == pers, 3 == pers
{
diff --git a/entity/Relation_entity/entityfields/relationtype/valueProcess.js b/entity/Relation_entity/entityfields/relationtype/valueProcess.js
index 8ca1312eeb7..6c1ed60cf91 100644
--- a/entity/Relation_entity/entityfields/relationtype/valueProcess.js
+++ b/entity/Relation_entity/entityfields/relationtype/valueProcess.js
@@ -1,5 +1,5 @@
import("system.result");
import("system.vars");
-import("Relation_lib")
+import("Contact_lib")
result.object(RelationUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERS_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js b/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js
index 83aeff7fbfe..754b510a957 100644
--- a/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
import("system.result");
-import("Relation_lib")
+import("Contact_lib")
result.string(RelationUtils.getFullRelationFromString());
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
rename to entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_relation_id.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_relation_id.displayvalue/expression.js
rename to entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_relation_id.displayvalue/expression.js b/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_relation_id.displayvalue/expression.js
rename to entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
diff --git a/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js b/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
rename to entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
diff --git a/others/db_changes/data_alias/struct/create_relation.xml b/others/db_changes/data_alias/struct/create_contact.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_relation.xml
rename to others/db_changes/data_alias/struct/create_contact.xml
diff --git a/process/Relation_lib/Relation_lib.aod b/process/Contact_lib/Contact_lib.aod
similarity index 79%
rename from process/Relation_lib/Relation_lib.aod
rename to process/Contact_lib/Contact_lib.aod
index 730af257292..013ac727a88 100644
--- a/process/Relation_lib/Relation_lib.aod
+++ b/process/Contact_lib/Contact_lib.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
- <name>Relation_lib</name>
+ <name>Contact_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Relation_lib/process.js</process>
+ <process>%aditoprj%/process/Contact_lib/process.js</process>
<variants>
<element>LIBRARY</element>
</variants>
diff --git a/process/Relation_lib/process.js b/process/Contact_lib/process.js
similarity index 100%
rename from process/Relation_lib/process.js
rename to process/Contact_lib/process.js
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 4a1e2149104..e9b10ff30f7 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -1,6 +1,6 @@
import("system.db");
import("Sql_lib");
-import("Relation_lib");
+import("Contact_lib");
import("Keyword_lib");
/**
* Methods for addresses.
--
GitLab