| + |
{{ 'invoice.to'|trans }}
{{ model.customer.company|default(model.customer.name) }} @@ -57,14 +57,6 @@ mpdf--> {{ 'label.vat_id'|trans }}: {{ model.customer.vatId }} {% endif %} - {% if model.customer.number is not empty %} - - {{ 'label.number'|trans }}: {{ model.customer.number }} - {% endif %} - {% if model.query.project is not empty and model.query.project.orderNumber is not empty %} - - {{ 'label.orderNumber'|trans }}: {{ model.query.project.orderNumber }} - {% endif %} |
{{ 'invoice.from'|trans }} @@ -82,12 +74,24 @@ mpdf--> |
- {{ 'invoice.number'|trans }}:
+ {{ 'invoice.number'|trans }}:
{{ model.invoiceNumber }}
- {{ 'invoice.due_days'|trans }}:
+ {{ 'invoice.due_days'|trans }}:
{{ model.dueDate|date_short }}
+
+ {% if model.customer.number is not empty %}
+
+ {{ 'label.number'|trans }}:
+ {{ model.customer.number }}
+ {% endif %}
+
+ {% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
+
+ {{ 'label.orderNumber'|trans }}:
+ {{ model.query.project.orderNumber }}
+ {% endif %}
| {{ model.template.company }} – {{ model.template.address|nl2str(' – ') }} + {% if model.template.vatId is not empty %} + – {{ 'label.vat_id'|trans }}: {{ model.template.vatId }} + {% endif %} | {{ 'export.page_of'|trans({'%page%': '{PAGENO}', '%pages%': '{nb}'}) }} @@ -56,39 +59,43 @@ mpdf--> |
{{ model.customer.company|default(model.customer.name) }} {{ model.customer.address|nl2br }} - {% if model.customer.vatId is not empty %} - - {{ 'label.vat_id'|trans }}: {{ model.customer.vatId }} - {% endif %} |
+ {% set classLeft = 'text-left' %}
+ {% set classRight = 'text-right text-nowrap padding-left' %}
| {% set teamHiddenId = 'team_' ~ team.id ~ '_hiddenUser' ~ random() %} {% set counter = 0 %} - {% for member in members|sort((a, b) => a.teamlead < b.teamlead) %} + {% for member in members|sort((a, b) => b.teamlead <=> a.teamlead) %} {% set user = member.user %} {% if member.teamlead %} {{ _self.user_avatar(user, ('label.teamlead'|trans ~ ': ' ~ user.displayName), 'teamlead') }} diff --git a/templates/reporting/project_details.html.twig b/templates/reporting/project_details.html.twig index 633877ad..a5be3180 100644 --- a/templates/reporting/project_details.html.twig +++ b/templates/reporting/project_details.html.twig @@ -158,7 +158,7 @@ {% endfor %} |