diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig index f4bf459842..a75d9e445e 100644 --- a/resources/views/popup/list/journals.twig +++ b/resources/views/popup/list/journals.twig @@ -39,27 +39,23 @@ {{ journal.description }} - {{ journal|formatJournal }} + {% if not accountPerspective %} + {{ journal|formatJournal }} + {% else %} + {{ formatPerspective(journal, accountPerspective)|raw }} + {% endif %} {{ journal.date.formatLocalized(monthAndDayFormat) }} {% if not hideSource %} - {% if journal.source_account_type == 'Cash account' %} - (cash) - {% else %} - {{ journal.source_account_name }} - {% endif %} + {{ sourceAccount(journal)|raw }} {% endif %} {% if not hideDestination %} - {% if journal.destination_account_type == 'Cash account' %} - (cash) - {% else %} - {{ journal.destination_account_name }} - {% endif %} + {{ destinationAccount(journal)|raw }} {% endif %} diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig index 504960ea69..71ffb20f65 100644 --- a/resources/views/popup/report/income-entry.twig +++ b/resources/views/popup/report/income-entry.twig @@ -8,6 +8,7 @@