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/preview.html.twig
+++ b/templates/invoice/preview.html.twig
@@ -33,7 +33,7 @@
                            {% if entry.description is not empty %}
                                {{ entry.description|desc2html }}
                            {% else %}
-                                {{ entry.activity.name }} / {{ entry.activity.project.name }}
+                                {{ entry.activity.name }} / {{ entry.project.name }}
                            {% endif %}
                        </td>
                        <td class="text-center" contenteditable="true">