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

use timesheet description in invoices (#1079)

Browse Source
This commit is contained in:
Kevin Papst
2019-09-04 10:54:21 +02:00
committed by GitHub
parent 93ab3d5666
commit 49e1a1c410
15 changed files with 51 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/invoice/renderer/default.html.twig
View File

@@ -75,9 +75,9 @@
{% endif %}
<tr>
<td>{{ entry.begin|date_short }}</td>
<td>
<td contenteditable="true">
{% if entry.description is not empty %}
{{ entry.description }}
{{ entry.description|nl2br }}
{% else %}
{{ entry.activity.name }} / {{ entry.project.name }}
{% endif %}

2
templates/invoice/renderer/freelancer.html.twig
View File

@@ -90,7 +90,7 @@
<tr>
<td contenteditable="true">
{% if entry.description is not empty %}
{{ entry.description }}
{{ entry.description|nl2br }}
{% else %}
{{ entry.activity.name }} / {{ entry.project.name }}
{% endif %}

4
templates/invoice/renderer/timesheet.html.twig
View File

@@ -72,9 +72,9 @@
{% if model.query.user is empty %}
<td>{{ widgets.username(entry.user) }}</td>
{% endif %}
<td>
<td contenteditable="true">
{% if entry.description is not empty %}
{{ entry.description }}
{{ entry.description|nl2br }}
{% else %}
{{ entry.activity.name }} / {{ entry.project.name }}
{% endif %}