From f53c8a3f601ecf441f1d7c6509e3d2dbc82da8f7 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Fri, 17 Sep 2021 07:51:58 +0000
Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 1085392][VT-Projekt
Balkenansicht Y-Achsen fehlen]
---
entity/Salesproject_entity/Salesproject_entity.aod | 3 ++-
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++--
.../SalesprojectFilter_view.aod | 11 ++++++++---
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index cb8830eabf..9bd2ba65f2 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -864,10 +864,11 @@
</entityParameter>
<entityField>
<name>volumeWeighted</name>
- <title>Weighted(€)</title>
+ <title>Volume Weighted(€)</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeweighted/valueProcess.js</valueProcess>
</entityField>
<entityAggregateField>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index dc6911a47d..920aa2a024 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2056,8 +2056,8 @@
<value>Volumen(€)</value>
</entry>
<entry>
- <key>Weighted(€)</key>
- <value>Gewichtet(€)</value>
+ <key>Volume Weighted(€)</key>
+ <value>Volumen Gewichtet(€)</value>
</entry>
<entry>
<key>by translated name</key>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index c75ed2e07a..2aceae7741 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -201,13 +201,18 @@
<dynamicMultiDataChartViewTemplate>
<name>DynamicMultiDataChart</name>
<chartType>COLUMN</chartType>
- <yAxisLabel>Count</yAxisLabel>
+ <yAxisLabel>Euro</yAxisLabel>
<entityField>#ENTITY</entityField>
<columns>
<neonDynamicMultiDataChartColumn>
<name>170e3be6-41e5-4e75-b772-a97312e83268</name>
- <entityField>COUNT</entityField>
- <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
+ <entityField>VOLUME</entityField>
+ <aggregateEntityField>VOLUME_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>b6b2a5fd-48f8-4bdb-ba2b-93189529ccb9</name>
+ <entityField>volumeWeighted</entityField>
+ <aggregateEntityField>volumeWeighted_aggregate</aggregateEntityField>
</neonDynamicMultiDataChartColumn>
</columns>
</dynamicMultiDataChartViewTemplate>
--
GitLab