Skip to content
Snippets Groups Projects
Commit 73f99911 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch 'sales_2001780_order_net_aggregate' into '2021.2'

[Projekt: xRM-Sales][TicketNr.: 2001780][Beleg: Summe 'Betrag Netto' beim Gruppieren ist immer 0]

See merge request xrm/basic!1480
parents 21a1a8e2 82890ff2
No related branches found
No related tags found
No related merge requests found
...@@ -1044,6 +1044,11 @@ ...@@ -1044,6 +1044,11 @@
</entityParameter> </entityParameter>
</children> </children>
</entityConsumer> </entityConsumer>
<entityAggregateField>
<name>NET_aggregate</name>
<parentField>NET</parentField>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/net_aggregate/displayValueProcess.js</displayValueProcess>
</entityAggregateField>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
...@@ -1268,6 +1273,11 @@ ...@@ -1268,6 +1273,11 @@
<name>DISCOUNTED_VAT.value</name> <name>DISCOUNTED_VAT.value</name>
<recordfield>SALESORDER.DISCOUNTED_VAT</recordfield> <recordfield>SALESORDER.DISCOUNTED_VAT</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>NET_aggregate.value</name>
<recordfield>SALESORDER.NET</recordfield>
<aggregateType>SUM</aggregateType>
</aggregateFieldDbMapping>
</recordFieldMappings> </recordFieldMappings>
<linkInformation> <linkInformation>
<linkInformation> <linkInformation>
......
import("system.result");
import("system.vars");
import("system.translate");
import("Util_lib");
import("KeywordRegistry_basic");
// TODO: add multicurrency support
result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), $KeywordRegistry.currency$eur()));
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
<neonTreeTableColumn> <neonTreeTableColumn>
<name>7873c2f2-0dc4-4c54-814a-df970eddea65</name> <name>7873c2f2-0dc4-4c54-814a-df970eddea65</name>
<entityField>NET</entityField> <entityField>NET</entityField>
<aggregateEntityField>NET_aggregate</aggregateEntityField>
</neonTreeTableColumn> </neonTreeTableColumn>
</columns> </columns>
</treeTableViewTemplate> </treeTableViewTemplate>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment