added user-specific rates (#1455)

2020-02-10 20:29:43 +01:00
parent 465d7166d4
commit 52c7437076
83 changed files with 2054 additions and 520 deletions
--- a/templates/invoice/index.html.twig
+++ b/templates/invoice/index.html.twig
@@ -61,11 +61,12 @@
        {% if model.calculator is empty or model.calculator.entries is empty %}
            {{ widgets.callout('warning', 'error.no_entries_found') }}
        {% else %}
+            {% set isDecimal = model.template.decimalDuration|default(false) %}
            {% set entries = model.calculator.entries %}
            {{ tables.datatable_header(tableName, columns, query, {}) }}
            {% for entry in entries %}
                {% set amount = entry.amount %}
-                {% set duration = entry.duration|duration %}
+                {% set duration = entry.duration|duration(isDecimal) %}
                {% set rate = 0 %}
                {% if entry.fixedRate is not null %}
                    {% set rate = entry.fixedRate %}