diff --git a/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod b/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod
index 060d3e16f7181a02024785e4d96ddccf246828cb..849768b872a9a9a551be334ff3f16ed8b92177c7 100644
--- a/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod
+++ b/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod
@@ -13,7 +13,6 @@
</entityProvider>
<entityField>
<name>BASETEMPLATE</name>
- <documentation>%aditoprj%/entity/BulkMailAddMosaico_entity/entityfields/basetemplate/documentation.adoc</documentation>
<title>Base Template</title>
<consumer>BaseTemplates</consumer>
<mandatory v="true" />
diff --git a/entity/BulkMailAddMosaico_entity/entityfields/basetemplate/documentation.adoc b/entity/BulkMailAddMosaico_entity/entityfields/basetemplate/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 9c27f55d0e35e6dbd3bb55d9421490d2eba42cee..ce1dcd2d2b93817595ec64e9fb98930a9641e821 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -140,7 +140,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/contactid_param/valueProcess.js b/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/BulkMailRecipient_entity/entityfields/emailadresses/children/contactid_param/valueProcess.js
rename to entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objectrowid_param/valueProcess.js
diff --git a/entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js b/entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js
deleted file mode 100644
index 02a585f840c78bfdcc768640e146bd2f4b41f008..0000000000000000000000000000000000000000
--- a/entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("Communication_lib");
-
-var res = CommUtil.getStandardSubSqlMail(newWhere("COMMUNICATION.OBJECT_ROWID = CAMPAIGNPARTICIPANT.CONTACT_ID"));
-result.string(res);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js b/entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js
deleted file mode 100644
index b13adb6ad2bc89f776b5ad17a811005e1050f85d..0000000000000000000000000000000000000000
--- a/entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Communication_lib");
-import("Sql_lib");
-
-var res = CommUtil.getStandardSubSqlPhone(newWhere("COMMUNICATION.OBJECT_ROWID = CAMPAIGNPARTICIPANT.CONTACT_ID"));
-result.string(res);
\ No newline at end of file
diff --git a/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod b/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
index 09c1b1f163590a4b87975c546d1b0b3eefcff964..70f720c867d5ac532bbb25fbca73b340d4fcb614 100644
--- a/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
+++ b/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
@@ -38,7 +38,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/CommunicationChannel_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/CommunicationChannel_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
diff --git a/entity/CommunicationChannel_entity/entityfields/communications/children/contactid_param/valueProcess.js b/entity/CommunicationChannel_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/CommunicationChannel_entity/entityfields/communications/children/contactid_param/valueProcess.js
rename to entity/CommunicationChannel_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 565d3921eaab206b52bfddaf1b5d9d8942e3fa74..2a213495799d2b98b1d3ca7c2569eac79e2d911e 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -112,7 +112,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js b/entity/Contact_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js
rename to entity/Contact_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 251966de8bb6b5ce37f621f12ef926876cb48ba1..a0cadd346d20865cfda8187a876031e0438b2adc 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -21,6 +21,7 @@
<name>DATE_EDIT</name>
<title>Date edit</title>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_edit/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -34,6 +35,7 @@
<name>DATE_NEW</name>
<title>Date new</title>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
@@ -156,6 +158,7 @@
<consumer>DocumentTemplateTypeCategory</consumer>
<groupable v="true" />
<mandatory v="false" />
+ <mandatoryProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/valueProcess.js</valueProcess>
@@ -185,6 +188,7 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>DOCUMENTTEMPLATEID</targetIdField>
<targetConsumerProcess></targetConsumerProcess>
+ <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc</documentation>
<titlePlural>Attachments</titlePlural>
<recordContainer>db</recordContainer>
</entityProvider>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 0d84fb418b8436537e6150f437b18d810de445f7..b1abb1054b0a3408ead52765e83fe12a44685f59 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -69,7 +69,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Email_entity/entityfields/emailaddresses/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js b/entity/Email_entity/entityfields/emailaddresses/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js
rename to entity/Email_entity/entityfields/emailaddresses/children/objectrowid_param/valueProcess.js
diff --git a/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/recordfieldmappings/firstname.value/expression.js b/entity/EmployeeGroupContactRelation_entity/recordcontainers/db/recordfieldmappings/firstname.value/expression.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
deleted file mode 100644
index be49d03de451c24366fc615db9b981efb4e15661..0000000000000000000000000000000000000000
--- a/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$param.ExportTemplateId_param"))
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
deleted file mode 100644
index 001cc890f029455658cd08a1d8ad7ce8259f24d7..0000000000000000000000000000000000000000
--- a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuses/children/exporttemplateid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$param.ExportTemplateId_param"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index b7e6a4514f4757c27c5f3a644d7c77ba45735870..d4536cb37340c25d6ad3eb0c1754568c63b2a2b7 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -71,7 +71,7 @@
<children>
<entityParameter>
<name>ExportTemplateId_param</name>
- <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplateid_param/valueProcess.js</valueProcess>
<expose v="true" />
<documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc</documentation>
</entityParameter>
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplateid_param/valueProcess.js
similarity index 100%
rename from entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js
rename to entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplateid_param/valueProcess.js
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 14b2acae39a42b62fc932748530717996b75abd9..f97ab95bb4136fd635014cafee0f106c96050ceb 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -135,6 +135,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>HASCOMMRESTRICTION.value</name>
+ <expression>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/recordfieldmappings/hascommrestriction.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TARGETCONTEXT.value</name>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index f643a48c17d2e1816a4d216ddb1bd29b0914af43..6d54fee291ba6cbef29a204fc49dd2b791f839be 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -442,7 +442,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_CONTACT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_id.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TARGET_ID.value</name>
diff --git a/entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_id.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_id.displayvalue/expression.js
rename to entity/Member_entity/recordcontainers/db/recordfieldmappings/organisation_contact_id.displayvalue/expression.js
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 2850082bcecedf1ece32bd765809b586205ca1cb..2aad89b6a15c54afff194a99f57c64328c5de320 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -213,7 +213,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
<entityParameter>
@@ -299,7 +299,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
@@ -314,7 +314,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
diff --git a/entity/Organisation_entity/entityfields/communications/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/communications/children/contactid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/emailcommunications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/emailcommunications/children/objectrowid_param/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/phonecommunications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/phonecommunications/children/objectrowid_param/valueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 21f986d098665b5a4f883e265f61501348085166..7d02e10cb30b270f78b9c54e723ebaf89f91a11e 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -208,7 +208,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
@@ -419,7 +419,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
@@ -441,7 +441,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
diff --git a/entity/Person_entity/entityfields/communications/children/contactid_param/valueProcess.js b/entity/Person_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/communications/children/contactid_param/valueProcess.js
rename to entity/Person_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
diff --git a/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js b/entity/Person_entity/entityfields/emailcommunications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js
rename to entity/Person_entity/entityfields/emailcommunications/children/objectrowid_param/valueProcess.js
diff --git a/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js b/entity/Person_entity/entityfields/phonecommunications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js
rename to entity/Person_entity/entityfields/phonecommunications/children/objectrowid_param/valueProcess.js
diff --git a/entity/SlaveAdministrationIntervall_entity/SlaveAdministrationIntervall_entity.aod b/entity/SlaveAdministrationIntervall_entity/SlaveAdministrationIntervall_entity.aod
index 9941eb285e4684819392ea35df7f07cb982e48f1..0e6f8e9f9c3b2bb44861e9328bbd7762484be473 100644
--- a/entity/SlaveAdministrationIntervall_entity/SlaveAdministrationIntervall_entity.aod
+++ b/entity/SlaveAdministrationIntervall_entity/SlaveAdministrationIntervall_entity.aod
@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<grantCreate v="false" />
<grantDelete v="false" />
+ <recordContainer>dbless</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/ticket_editor_contact_id.displayvalue/expression.js
similarity index 100%
rename from entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js
rename to entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/ticket_editor_contact_id.displayvalue/expression.js
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js
deleted file mode 100644
index 6efa7822f9266fa11c60814281afd569b55d8be7..0000000000000000000000000000000000000000
--- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var cond = SqlMaskingUtils.prototype.isNull("WEBLINK.USER_EDIT", "WEBLINK.USER_NEW");
-
-result.string(cond);
\ No newline at end of file
diff --git a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod b/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
index 6a4016ee43e0333bc490dbb74dc4a47bae9722f1..bd050b03d2c60f1bba5b232f219c3342d43773e5 100644
--- a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
+++ b/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
@@ -13,7 +13,7 @@
<children>
<neonViewReference>
<name>929f4179-21b1-4246-a3f7-9fd8a1994592</name>
- <entityField>Duplicates</entityField>
+ <entityField>DuplicatesPerson</entityField>
<view>DuplicateEdit_view</view>
</neonViewReference>
<genericViewTemplate>