Merge branch 'marketing_sl_1079499_orgCommunicationSettings' into '2021.0'

1079499 communication settings in organisation

See merge request xrm/basic!881

entity/CommunicationSettings_entity/CommunicationSettings_entity.aod

@@ -24,6 +24,12 @@
           <fieldName>ContactCommunicationSettings</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>f94ce98a-46e1-4666-a7ef-2685baa3fcae</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>ContactCommunicationSettings</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>

entity/Organisation_entity/Organisation_entity.aod

@@ -1481,6 +1481,20 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>ContactCommunicationSettings</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CommunicationSettings_entity</entityName>
+        <fieldName>SettingsForContact</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js

+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file

neonContext/Organisation/Organisation.aod

@@ -71,5 +71,9 @@
       <name>d9091127-4ad7-46bb-ba5f-988aa84c52b5</name>
       <view>OrganisationPlanningTurnoverChart_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>a6132e66-81b6-4350-a398-0d9d9c1bbafd</name>
+      <view>OrganisationMarketing_view</view>
+    </neonViewReference>
   </references>
 </neonContext>

neonView/OrganisationMain_view/OrganisationMain_view.aod

@@ -80,5 +80,10 @@
       <entityField>Duplicates</entityField>
       <view>DuplicateOrganisationFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationMarketing_view</view>
+    </neonViewReference>
   </children>
 </neonView>

neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>OrganisationMarketing_view</name>
+  <title>Advertising</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>0561b125-ac76-4ee1-829c-8fd954204f7d</name>
+      <entityField>ContactCommunicationSettings</entityField>
+      <view>CommunicationSettingsFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>