diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1dec1aa85bef5a13dc275ea364fb088f5d318e70..a2b16be80bfd354f0ee9e3c13a56a50bd4b8606c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -278,12 +278,6 @@
<title>Email</title>
<consumer>EmailCommunications</consumer>
<onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- <element>RECORD</element>
- </onValueChangeTypes>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
@@ -1026,28 +1020,10 @@
<entityField>
<name>STANDARD_COUNTRY</name>
</entityField>
- <entityField>
- <name>IndexCommunication</name>
- </entityField>
- <entityField>
- <name>IndexAddress</name>
- </entityField>
- <entityField>
- <name>IndexCountry</name>
- </entityField>
- <entityField>
- <name>IndexZIP</name>
- </entityField>
- <entityField>
- <name>IndexCity</name>
- </entityField>
<entityParameter>
<name>OnlyOwnSupervised_param</name>
<expose v="true" />
</entityParameter>
- <entityField>
- <name>IndexCommPhone</name>
- </entityField>
<entityConsumer>
<name>SelfDuplicatesUncached</name>
<dependency>
@@ -1090,6 +1066,15 @@
<color>$priority-high-color</color>
<displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityField>
+ <name>STANDARD_ADDRESS</name>
+ </entityField>
+ <entityField>
+ <name>STANDARD_ZIP</name>
+ </entityField>
+ <entityField>
+ <name>STANDARD_CITY</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1272,6 +1257,18 @@
<name>COMMRESTRICTIONS_ACTIVE.value</name>
<expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_ADDRESS.value</name>
+ <recordfield>ADDRESS.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_CITY.value</name>
+ <recordfield>ADDRESS.CITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_ZIP.value</name>
+ <recordfield>ADDRESS.ZIP</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
@@ -1315,7 +1312,7 @@
<additionalFieldNameAliases />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexAddress.value</name>
+ <name>STANDARD_ADDRESS.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>address</element>
@@ -1323,15 +1320,15 @@
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCountry.value</name>
- <indexFieldType>COMMUNICATION</indexFieldType>
+ <name>STANDARD_COUNTRY.value</name>
+ <indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>country</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexZIP.value</name>
+ <name>STANDARD_ZIP.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>zip</element>
@@ -1339,7 +1336,7 @@
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCity.value</name>
+ <name>STANDARD_CITY.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>city</element>
@@ -1347,15 +1344,15 @@
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCommunication.value</name>
+ <name>STANDARD_EMAIL_COMMUNICATION.value</name>
<indexFieldType>COMMUNICATION</indexFieldType>
<additionalFieldNameAliases>
- <element>comm</element>
+ <element>email</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCommPhone.value</name>
+ <name>STANDARD_PHONE_COMMUNICATION.value</name>
<indexFieldType>TELEPHONE</indexFieldType>
<additionalFieldNameAliases>
<element>phone</element>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index be93a1f209dc0ca771a75e168a283e9f14b16091..97ac58a3b085ad921a69bfcf25abe7ad3d66a706 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -382,11 +382,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>E-Mail</title>
<consumer>EmailCommunications</consumer>
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
@@ -1096,33 +1091,15 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<expose v="true" />
<mandatory v="false" />
</entityParameter>
- <entityField>
- <name>IndexCommunication</name>
- </entityField>
- <entityField>
- <name>IndexAddress</name>
- </entityField>
- <entityField>
- <name>IndexCountry</name>
- </entityField>
- <entityField>
- <name>IndexZIP</name>
- </entityField>
- <entityField>
- <name>IndexCity</name>
- </entityField>
<entityField>
<name>STANDARD_COUNTRY</name>
+ <title>Country</title>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/standard_country/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OnlyOwnSupervised_param</name>
<expose v="true" />
</entityParameter>
- <entityField>
- <name>IndexCommPhone</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/indexcommphone/valueProcess.js</valueProcess>
- </entityField>
<entityConsumer>
<name>SelfDuplicatesUncached</name>
<dependency>
@@ -1154,6 +1131,18 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<color>$priority-high-color</color>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityField>
+ <name>STANDRAD_ZIP</name>
+ <title>ZIP</title>
+ </entityField>
+ <entityField>
+ <name>STANDRAD_ADDRESS</name>
+ <title>Address</title>
+ </entityField>
+ <entityField>
+ <name>STANDRAD_CITY</name>
+ <title>City</title>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1410,6 +1399,18 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>COMMRESTRICTIONS_ACTIVE.value</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDRAD_ADDRESS.value</name>
+ <recordfield>ADDRESS.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDRAD_CITY.value</name>
+ <recordfield>ADDRESS.CITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDRAD_ZIP.value</name>
+ <recordfield>ADDRESS.ZIP</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
@@ -1466,7 +1467,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<indexFieldType>PROPER_NAME</indexFieldType>
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexAddress.value</name>
+ <name>STANDRAD_ADDRESS.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>address</element>
@@ -1474,7 +1475,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCountry.value</name>
+ <name>STANDARD_COUNTRY.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>country</element>
@@ -1482,7 +1483,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexZIP.value</name>
+ <name>STANDRAD_ZIP.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>zip</element>
@@ -1490,7 +1491,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCity.value</name>
+ <name>STANDRAD_CITY.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>city</element>
@@ -1498,15 +1499,15 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCommunication.value</name>
+ <name>STANDARD_EMAIL_COMMUNICATION.value</name>
<indexFieldType>COMMUNICATION</indexFieldType>
<additionalFieldNameAliases>
- <element>comm</element>
+ <element>email</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
- <name>IndexCommPhone.value</name>
+ <name>STANDARD_PHONE_COMMUNICATION.value</name>
<indexFieldType>TELEPHONE</indexFieldType>
<additionalFieldNameAliases>
<element>phone</element>
diff --git a/entity/Person_entity/entityfields/indexcommphone/valueProcess.js b/entity/Person_entity/entityfields/indexcommphone/valueProcess.js
deleted file mode 100644
index e921110334e39aa7b5230eab100f6532fb77bf03..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/indexcommphone/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.LASTNAME"));
\ No newline at end of file