diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index e3b0f4ba0c..e9524e6acf 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -185,8 +185,8 @@

{{ 'inactiveBudgets'|_ }}

- {% for index,budget in inactive %} - {% if index != inactive|length-1 %} + {% for budget in inactive %} + {% if loop.index == inactive.count() %} {{ budget.name }} {% else %} {{ budget.name }}, diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index 314415d2f8..88474b6029 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -95,24 +95,34 @@ - + {% for year in years %} {% endfor %} - + - {% for id, info in budgetMultiYear %} - + + {% set sum = 0 %} {% for amount in info.entries %} - + {% set sum = sum + amount %} {% endfor %} - + {% endfor %}
Budget{{ 'budget'|_ }}{{ year }}{{ 'sum'|_ }}
{{ info.name }} + {% if id == 0 %} + {{ info.name }} + + {% else %} + {{ info.name }} + {% endif %} + + {{ amount|formatAmount }} + {{ sum|formatAmount }} +