added global activities (#259)

2018-11-06 23:10:34 +01:00
parent c66dfbc653
commit db7de3aac1
70 changed files with 1168 additions and 264 deletions
--- a/templates/invoice/renderer/default.html.twig
+++ b/templates/invoice/renderer/default.html.twig
@@ -66,7 +66,7 @@
            {% for entry in model.calculator.entries %}
                <tr>
                    <td>{{ entry.begin|date_short }}</td>
-                    <td>{{ entry.activity.name }} / {{ entry.activity.project.name }}</td>
+                    <td>{{ entry.activity.name }} / {{ entry.project.name }}</td>
                    <td contenteditable="true">{{ app.user.getPreferenceValue('hourly_rate')|money(model.calculator.currency) }}</td>
                    <td>{{ entry.duration|duration }}</td>
                    <td>{{ entry.rate|money(model.calculator.currency) }}</td>