From b875eb31d2b18e1c468f691d3c7ee51193904d93 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 6 Feb 2016 19:00:01 +0100 Subject: [PATCH] Small cosmetic changes. --- resources/views/list/bills.twig | 4 ++-- resources/views/reports/partials/budgets.twig | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index ba83739b49..7b95561765 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -35,7 +35,7 @@ {{ entry.amount_max|formatAmount }} - {% if entry.lastFoundMatch %} + {% if not entry.lastFoundMatch.isFuture %} {{ entry.lastFoundMatch.formatLocalized(monthAndDayFormat) }} @@ -45,7 +45,7 @@ {% endif %} - {% if entry.nextExpectedMatch %} + {% if entry.nextExpectedMatch.isFuture %} {{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }} diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig index 19122b4cd7..076487a1e0 100644 --- a/resources/views/reports/partials/budgets.twig +++ b/resources/views/reports/partials/budgets.twig @@ -47,7 +47,9 @@ {% endif %} - {{ budgetLine.getLeft|formatAmount }} + {% if(budgetLine.getOverspent == 0) %} + {{ budgetLine.getLeft|formatAmount }} + {% endif %} {% if budgetLine.getOverspent != 0 %}