diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index f794c0c70e59b61746defe6485c29022ab483ccd..cc8a09c7a9d235b337a18948546a6e4dd7f8b03c 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -184,6 +184,58 @@
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/rowid/valueProcess.js</valueProcess>
     </entityField>
+    <entityOutgoingField>
+      <name>ActivityDocument_dfo</name>
+      <title>Documents</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>ActivityDocument_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
+    <entityOutgoingField>
+      <name>ActivityMainDocument_dfo</name>
+      <title>Maindocuments</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>ActivityMainDocuments_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Keyword_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentName_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e4bf7585b2ca4628118e46818683fc51bfcf1c5
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..06fe7d36324315ad85bfd6d0099c5aa6b2da98d4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..f39bb16bbc16cc7a0d9f39a6bc549c63a0f16d02
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e4bf7585b2ca4628118e46818683fc51bfcf1c5
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..06fe7d36324315ad85bfd6d0099c5aa6b2da98d4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..f39bb16bbc16cc7a0d9f39a6bc549c63a0f16d02
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..431fe9d5b2b2315607dc49c1191ff56d853a7d10
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("MAINDOCUMENT");
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 6344e8b46c426f904f61863096fb61d6bba69923..6aa654217083b99364e4b073f28d131c7c6b2931 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -231,6 +231,32 @@
         </entityDependency>
       </dependencies>
     </entityIncomingField>
+    <entityIncomingField>
+      <name>ActivityDocument_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>d57c0122-3227-4f98-b6a5-2ae45a0c5571</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>ActivityDocument_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityIncomingField>
+    <entityIncomingField>
+      <name>ActivityMainDocuments_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>056d9a73-c9cd-44f2-828b-e9742b66fa37</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>ActivityMainDocument_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityIncomingField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index bb37953370c86eeac1d9f214fe05f1f76ae8502f..983a1dc1ef0e8558b374b41c82f58f6899fa0401 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -19,5 +19,10 @@
       <entityField>#ENTITY</entityField>
       <view>ActivityDetail_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
+      <entityField>ActivityDocument_dfo</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 2542e87167d89ad681f2c83050baea58e033fd81..23802418fac09a7840b8fdd95c0e4b770509fd6b 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -34,5 +34,10 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <neonViewReference>
+      <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
+      <entityField>ActivityMainDocument_dfo</entityField>
+      <view>DocumentList_view</view>
+    </neonViewReference>
   </children>
 </neonView>