Merge branch '#1066647-OfferCharts' into '2020.2.0'

#1066647 offer charts

See merge request xrm/basic!434

entity/Offer_entity/Offer_entity.aod

@@ -1292,13 +1292,17 @@
         </aggregateFieldDbMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
-          <recordfield>OFFER.OFFER_ID</recordfield>
+          <recordfield>OFFER.OFFERID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
         <aggregateFieldDbMapping>
           <name>PROBABILITY_aggregate.value</name>
           <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js</expression>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>OFFER_ID.value</name>
+          <recordfield>OFFER.OFFER_ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -7269,6 +7269,15 @@
     <entry>
       <key>Favoritegroup</key>
     </entry>
+    <entry>
+      <key>Count Chart</key>
+    </entry>
+    <entry>
+      <key>Sum Chart</key>
+    </entry>
+    <entry>
+      <key>Probability Chart</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -9642,6 +9642,18 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>FavoriteGroup</key>
     </entry>
+    <entry>
+      <key>Count Chart</key>
+      <value>Anzahl Diagramm</value>
+    </entry>
+    <entry>
+      <key>Sum Chart</key>
+      <value>Summen Diagramm</value>
+    </entry>
+    <entry>
+      <key>Probability Chart</key>
+      <value>Wahrscheinlichkeit Diagramm</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -7350,6 +7350,15 @@
     <entry>
       <key>Favoritegroup</key>
     </entry>
+    <entry>
+      <key>Count Chart</key>
+    </entry>
+    <entry>
+      <key>Sum Chart</key>
+    </entry>
+    <entry>
+      <key>Probability Chart</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

neonView/OfferFilter_view/OfferFilter_view.aod

@@ -140,7 +140,12 @@
       <name>DynamicMultiDataChartCount</name>
       <chartType>COLUMN</chartType>
       <yAxisLabel>Count</yAxisLabel>
+      <shareParent v="false" />
       <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <title>Count Chart</title>
       <columns>
         <neonDynamicMultiDataChartColumn>
           <name>4bbc9650-47fd-4a59-8e1e-bb60ceb85795</name>
@@ -153,7 +158,12 @@
       <name>DynamicMultiDataChartSum</name>
       <chartType>COLUMN</chartType>
       <yAxisLabel>Total in euros</yAxisLabel>
+      <shareParent v="false" />
       <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <title>Sum Chart</title>
       <columns>
         <neonDynamicMultiDataChartColumn>
           <name>e5d14506-5205-43d0-89cb-416bf6debd25</name>
@@ -162,5 +172,23 @@
         </neonDynamicMultiDataChartColumn>
       </columns>
     </dynamicMultiDataChartViewTemplate>
+    <dynamicMultiDataChartViewTemplate>
+      <name>DynamicMultiDataChartProb</name>
+      <chartType>COLUMN</chartType>
+      <yAxisLabel>Total in euros</yAxisLabel>
+      <shareParent v="false" />
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <title>Probability Chart</title>
+      <columns>
+        <neonDynamicMultiDataChartColumn>
+          <name>e5d14506-5205-43d0-89cb-416bf6debd25</name>
+          <entityField>PROBABILITY</entityField>
+          <aggregateEntityField>PROBABILITY_aggregate</aggregateEntityField>
+        </neonDynamicMultiDataChartColumn>
+      </columns>
+    </dynamicMultiDataChartViewTemplate>
   </children>
 </neonView>