Activity - entry date can be changed

entity/Activity_entity/Activity_entity.aod

@@ -677,13 +677,9 @@
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>entryDateTimelineDate.value</name>
-          <recordfield>ACTIVITY.ENTRYDATE</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>entryDateDateFormat.value</name>
-          <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+          <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrydatedateformat.value/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>

entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrydatedateformat.value/expression.js

+import("system.result");
+
+// In this case the expression is used instead of the recordField property, because the database field is
+// already linked to another entity field. Otherwise, that would cause problems with updates.
+result.string("ACTIVITY.ENTRYDATE");
\ No newline at end of file