jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added order number to projects #107 (#108)

Browse Source
This commit is contained in:
Kevin Papst
2018-01-25 21:42:18 +01:00
committed by GitHub
parent 7f5b5ac254
commit 1958bb9d09
11 changed files with 76 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/invoice/print.html.twig → templates/invoice/renderer/print.html.twig
View File

@@ -36,8 +36,13 @@
<b>{{ 'invoice.number'|trans }}: {{ model.numberGenerator.invoiceNumber }}</b>
</p>
<p contenteditable="true">
<b>{{ 'invoice.due_days'|trans }}:</b> {{ model.dueDate|date(kimai_context.date_1) }}<br>
{% if model.customer.number is not empty %}<b>{{ 'label.customer_number'|trans }}:</b> {{ model.customer.number }}<br>{% endif %}
<b>{{ 'invoice.due_days'|trans }}:</b> {{ model.dueDate|date(kimai_context.date_1) }}
{% if model.customer.number is not empty %}
<br><b>{{ 'label.customer_number'|trans }}:</b> {{ model.customer.number }}
{% endif %}
{% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
<br><b>{{ 'label.order_number'|trans }}:</b> {{ model.query.project.orderNumber }}
{% endif %}
</p>
</div>
</div>

8
templates/invoice/timesheet.html.twig → templates/invoice/renderer/timesheet.html.twig
View File

@@ -32,6 +32,14 @@
{{ model.customer.name }} / {{ model.customer.contact }}
</td>
</tr>
{% if model.query.project is not empty and model.query.project.orderNumber is not empty %}
<tr>
<th>{{ 'label.order_number'|trans }}</th>
<td contenteditable="true">
{{ model.query.project.orderNumber }}
</td>
</tr>
{% endif %}
</table>
</div>
</div>