RelationType -> ContactType

entity/Address_entity/Address_entity.aod

@@ -82,8 +82,8 @@
       </dependencies>
       <children>
         <entityParameter>
-          <name>RelationType_param</name>
-          <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js</code>
+          <name>ContactType_param</name>
+          <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code>
           <expose v="true" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
         </entityParameter>
@@ -109,8 +109,8 @@
       </dependencies>
       <children>
         <entityParameter>
-          <name>RelationType_param</name>
-          <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js</code>
+          <name>ContactType_param</name>
+          <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code>
           <expose v="true" />
           <triggerRecalculation v="true" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
@@ -144,8 +144,8 @@
       </dependencies>
       <children>
         <entityParameter>
-          <name>RelationType_param</name>
-          <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/relationtype_param/code.js</code>
+          <name>ContactType_param</name>
+          <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code>
           <expose v="true" />
           <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
         </entityParameter>
@@ -165,10 +165,10 @@
       <description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
     </entityParameter>
     <entityParameter>
-      <name>RelationType_param</name>
+      <name>ContactType_param</name>
       <expose v="true" />
       <mandatory v="true" />
-      <documentation>%aditoprj%/entity/Address_entity/entityfields/relationtype_param/documentation.adoc</documentation>
+      <documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
   </entityFields>

entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js

@@ -5,8 +5,8 @@ import("system.neon");
 import("Keyword_lib");
 import("Contact_lib");
 
-if (vars.exists("$param.RelationType_param") && parseInt(vars.get("$param.RelationType_param"))) {
-    var type = parseInt(vars.get("$param.RelationType_param"));
+if (vars.exists("$param.ContactType_param") && parseInt(vars.get("$param.ContactType_param"))) {
+    var type = parseInt(vars.get("$param.ContactType_param"));
     var fields = [];
     //logging.log(type)
     switch (type) {

entity/Address_entity/entityfields/contacttype_param/documentation.adoc

+We could calculate the contactType with the contact, but this does not work if we are in pers-new / org-new.
+So we have to provide the contact type...
\ No newline at end of file

entity/Address_entity/entityfields/relationtype_param/documentation.adoc

-We could calculate the relationtype with the contact, but this does not work if we are in pers-new / org-new.
-So we have to provide the contact type...
\ No newline at end of file

entity/AnyContact_entity/AnyContact_entity.aod

@@ -53,12 +53,12 @@
       <searchable v="false" />
     </entityField>
     <entityField>
-      <name>relationType</name>
+      <name>contactType</name>
       <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERS_ID.
 See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       <contentType>NUMBER</contentType>
       <searchable v="false" />
-      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/relationtype/valueProcess.js</valueProcess>
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>Contact</name>

entity/AnyContact_entity/entityfields/image/valueProcess.js

@@ -5,7 +5,7 @@ import("Pers_lib");
 import("Organisation_lib");
 import("Contact_lib");
 
-if (vars.get("$field.relationType") == 1) // 1 == org, 2 == pers, 3 == pers
+if (vars.get("$field.contactType") == 1) // 1 == org, 2 == pers, 3 == pers
 {
     result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
 }