diff --git a/templates/reporting/report_user_list_export.html.twig b/templates/reporting/report_user_list_export.html.twig
index 0716cb40..acbc1327 100644
--- a/templates/reporting/report_user_list_export.html.twig
+++ b/templates/reporting/report_user_list_export.html.twig
@@ -1,4 +1,4 @@
-{% embed 'reporting/user_list_period_data.html.twig' %}
+{% embed 'reporting/user_list_period_data.html.twig' with {'showAccountNumber': true, 'stats': stats, 'dataType': dataType, 'period_attribute': period_attribute} only %}
{% set dataTypeFormat = '' %}
{% if dataType == 'rate' or dataType == 'internalRate' %}
{% set dataTypeFormat = ' data-format="' ~ constant('App\\Export\\Base\\AbstractSpreadsheetRenderer::RATE_FORMAT_NO_CURRENCY') ~ '"' %}
diff --git a/templates/reporting/report_user_list_monthly_export.html.twig b/templates/reporting/report_user_list_monthly_export.html.twig
index 698ceecf..70aa146e 100644
--- a/templates/reporting/report_user_list_monthly_export.html.twig
+++ b/templates/reporting/report_user_list_monthly_export.html.twig
@@ -1,4 +1,4 @@
-{% embed 'reporting/user_list_period_data.html.twig' %}
+{% embed 'reporting/user_list_period_data.html.twig' with {'showAccountNumber': true, 'stats': stats, 'dataType': dataType, 'period_attribute': period_attribute} only %}
{% set dataTypeFormat = '' %}
{% if dataType == 'rate' or dataType == 'internalRate' %}
{% set dataTypeFormat = ' data-format="' ~ constant('App\\Export\\Base\\AbstractSpreadsheetRenderer::RATE_FORMAT_NO_CURRENCY') ~ '"' %}
diff --git a/templates/reporting/user_list_period_data.html.twig b/templates/reporting/user_list_period_data.html.twig
index 289edbce..5ecb08d5 100644
--- a/templates/reporting/user_list_period_data.html.twig
+++ b/templates/reporting/user_list_period_data.html.twig
@@ -4,6 +4,7 @@
{%- set totalsDuration = {} -%}
{%- set totalsInternalRate = {} -%}
{%- set totalsRate = {} -%}
+{%- set showAccountNumber = showAccountNumber is defined ? showAccountNumber : false -%}
{% if dataType == 'rate' %}
{% set dataTypeTitle = 'stats.amountTotal' %}
{% elseif dataType == 'internalRate' %}
@@ -15,6 +16,9 @@
+ {% if showAccountNumber %}
+ {{ 'label.account_number'|trans }}
+ {% endif %}
{{ dataTypeTitle|trans }}
{% for column in stats.0.getDateTimes() %}
{% block period_name %}{% endblock %}
@@ -37,6 +41,9 @@
{{ label_dot(userPeriod.user.displayName, userPeriod.user.color) }}
{% endblock %}
+ {% if showAccountNumber %}
+ {{ userPeriod.user.accountNumber }}
+ {% endif %}
{% for period in attribute(userPeriod, period_attribute) %}
{% if period.totalDuration > 0 %}
{% set usersTotalDuration = usersTotalDuration + period.totalDuration %}
@@ -55,7 +62,7 @@
{% set totalsInternalRate = totalsInternalRate|merge({(reportDateKey): (totalsInternalRate[reportDateKey] + period.totalInternalRate)}) %}
{% set totalsRate = totalsRate|merge({(reportDateKey): (totalsRate[reportDateKey] + period.totalRate)}) %}
{% endfor %}
-
+
{% if dataType == 'rate' %}
{% block total_rate_user %}{% endblock %}
{% elseif dataType == 'internalRate' %}
@@ -63,7 +70,7 @@
{% else %}
{% block total_duration_user %}{% endblock %}
{% endif %}
-
+
{% for period in attribute(userPeriod, period_attribute) %}
{% if period.totalDuration > 0 or period.totalRate > 0 or period.totalInternalRate > 0 %}
@@ -82,7 +89,10 @@