Merge branch 'translate-fields'
Replace average by net values.
Merge branch 'nets-in-chart' into develop