Rechnungsvorlage für AGB: Benutzbare Version, jedoch ohne merge der gleichen Einträge eines Tages
This commit is contained in:
@@ -247,6 +247,11 @@
|
||||
}
|
||||
|
||||
.items th {
|
||||
color: {{ weiss }};
|
||||
background-color: {{ hintergrund }}
|
||||
}
|
||||
|
||||
.items .td_th {
|
||||
color: {{ suppress }};
|
||||
border-bottom: 1px solid{{ suppress }};
|
||||
}
|
||||
@@ -255,6 +260,8 @@
|
||||
.items td {
|
||||
padding: 1mm 0.5mm;
|
||||
vertical-align: top;
|
||||
font-size: 9pt;
|
||||
border-bottom: 1px solid{{ suppress }};
|
||||
}
|
||||
|
||||
.t-nowrap {
|
||||
@@ -278,6 +285,11 @@
|
||||
background-color: {{ hintergrund_hell }};
|
||||
}
|
||||
|
||||
.tag-name {
|
||||
font-weight: bold;
|
||||
background-color: #F4F4F4;
|
||||
}
|
||||
|
||||
.project-total {
|
||||
font-weight: bold;
|
||||
}
|
||||
@@ -474,17 +486,7 @@ mpdf-->
|
||||
|
||||
<div class="introduction-text">
|
||||
<p>
|
||||
Sehr geehrte Damen und Herren,<br/>
|
||||
<br/>
|
||||
heute erhalten Sie die Rechnung für die von mir vom {{ invoice['query.begin'] }} bis
|
||||
zum {{ invoice['query.end'] }} erbrachten Leistungen. Bitte zahlen Sie die Rechnung pünktlich, spätestens
|
||||
jedoch bis zum {{ invoice['invoice.due_date'] }}.
|
||||
|
||||
{% block invoice_details_contact %}
|
||||
{% if invoice['user.email'] is not empty %}
|
||||
Bei Rückfragen erreichen Sie mich via E-Mail an {{ invoice['user.email'] }}.
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
<b>für den Zeitraum {{ invoice['query.begin'] }} - {{ invoice['query.end'] }} </b>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -492,11 +494,11 @@ mpdf-->
|
||||
<table cellpadding="0" cellspacing="0" width="100%" border="0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="t-center">{{ 'date'|trans }}</th>
|
||||
<th class="t-left">{{ 'description'|trans }}</th>
|
||||
<th class="t-right text-nowrap">Ticket</th>
|
||||
<th class="t-center text-nowrap">#</th>
|
||||
<th class="t-right text-nowrap">{{ 'total_rate'|trans }}</th>
|
||||
<th class="t-center"></th>
|
||||
<th class="t-left">Leistungsstunden</th>
|
||||
<th class="t-right text-nowrap"></th>
|
||||
<th class="t-center text-nowrap"></th>
|
||||
<th class="t-right text-nowrap"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -532,16 +534,6 @@ mpdf-->
|
||||
|
||||
{% for entry in entries %}
|
||||
<!-- only timesheets, rest will be 'Auslagen' later -->
|
||||
{% if entry['entry.tags'] != currentTag %}
|
||||
{% set currentTag = entry['entry.tags']}
|
||||
<tr>
|
||||
<td class="project-name"></td>
|
||||
<td class="project-name">{{ currentTag }}</td>
|
||||
<td class="project-name"></td>
|
||||
<td class="project-name"></td>
|
||||
<td class="project-name"></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{% if entry['entry.type'] == 'timesheet' %}
|
||||
{% if entry['entry.project_id'] == invoice[id ~ '.id'] %}
|
||||
@@ -549,6 +541,32 @@ mpdf-->
|
||||
{% set totalDuration = totalDuration + entry['entry.duration'] %}
|
||||
{% set pos = pos + 1 %}
|
||||
|
||||
|
||||
{% if entry['entry.tags'] != currentTag %}
|
||||
{% if entry['entry.tags'] != '' and entry['entry.tags'] is not empty %}
|
||||
{% set currentTag = entry['entry.tags'] %}
|
||||
{% else %}
|
||||
{% set currentTag = 'keine Tätigkeit angegeben' %}
|
||||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<td class="tag-name"></td>
|
||||
<td class="tag-name">{{ currentTag }}</td>
|
||||
<td class="tag-name"></td>
|
||||
<td class="tag-name"></td>
|
||||
<td class="tag-name"></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="td_th t-center">{{ 'date'|trans }}</td>
|
||||
<td class=" td_th t-left">{{ 'description'|trans }}</td>
|
||||
<td class="td_th t-right text-nowrap">Ticket</td>
|
||||
<td class="td_th t-center text-nowrap">#</td>
|
||||
<td class="td_th t-right text-nowrap">{{ 'total_rate'|trans }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
|
||||
<tr>
|
||||
<td class="t-nowrap t-center">{{ entry['entry.begin'] }}</td>
|
||||
<td class="t-left">
|
||||
|
||||
Reference in New Issue
Block a user