diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig index 12b6111c8e..dbf3d7436c 100644 --- a/resources/views/list/accounts.twig +++ b/resources/views/list/accounts.twig @@ -10,7 +10,8 @@ {{ trans('list.currentBalance') }} {{ trans('list.active') }} {{ trans('list.lastActivity') }} - {{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }} + {{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }} @@ -33,7 +34,11 @@ {% endif %} {{ account.iban }} - {{ account.endBalance|formatAmount }} + + + {{ account.endBalance|formatAmount }} + + {% if account.active %} @@ -50,8 +55,10 @@ {{ 'never'|_ }} {% endif %} - + + {{ (account.difference)|formatAmount }} + diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index 2bf6f5b128..7e6d1af0b1 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -29,11 +29,15 @@ {{ match }} {% endfor %} - + + {{ entry.amount_min|formatAmount }} + - + + {{ entry.amount_max|formatAmount }} + {% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %} diff --git a/resources/views/list/journals-tasker.twig b/resources/views/list/journals-tasker.twig index 37cbcd1b72..a52df725be 100644 --- a/resources/views/list/journals-tasker.twig +++ b/resources/views/list/journals-tasker.twig @@ -1,6 +1,6 @@ {{ journals.render|raw }} - +
@@ -62,12 +62,13 @@ {% endif %} - -
+ + {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }} {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} - + + {% if event.amount < 0 %} {{ trans('firefly.removed_amount', {amount: (event.amount)|formatAmountPlain})|raw }} {% else %}