diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index cb8830eabf03ce44753b6cb3e6fe099e044ba2c6..9bd2ba65f2445f24b1b4eec30ef259add764f87c 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 dc6911a47dcdb5878761b4acce0cf39578f79631..920aa2a024d7e4432a6925e683fa38708e2307ef 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 c75ed2e07a54223b07e665c8958c0691eacbad2c..2aceae7741f32af228a32482bd52d764c8735447 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>