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/timesheet/export.html.twig
+++ b/templates/timesheet/export.html.twig
@@ -46,8 +46,8 @@
                            {% endif %}
                            <span class="small">
                                {{ 'label.activity'|trans }}: {{ entry.activity.name }} |
-                                {{ 'label.project'|trans }}: {{ entry.activity.project.name }} |
-                                {{ 'label.customer'|trans }}: {{ entry.activity.project.customer.name }}
+                                {{ 'label.project'|trans }}: {{ entry.project.name }} |
+                                {{ 'label.customer'|trans }}: {{ entry.project.customer.name }}
                            </span>
                        </td>
                        <td>{{ entry.duration|duration }}</td>