kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 07:53:16 +00:00
Code Issues Projects Releases Wiki Activity

View updates. [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-05-14 23:14:49 +02:00
parent 0d39161ec3
commit 446ab62d38
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/popup/list/journals.twig
View File

@@ -39,27 +39,23 @@
<a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a> <a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
</td> </td>
<td> <td>
{% if not accountPerspective %}
{{ journal|formatJournal }} {{ journal|formatJournal }}
{% else %}
{{ formatPerspective(journal, accountPerspective)|raw }}
{% endif %}
</td> </td>
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
{{ journal.date.formatLocalized(monthAndDayFormat) }} {{ journal.date.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% if not hideSource %} {% if not hideSource %}
<td class="hidden-xs"> <td class="hidden-xs">
{% if journal.source_account_type == 'Cash account' %} {{ sourceAccount(journal)|raw }}
<span class="text-success">(cash)</span>
{% else %}
<a href="{{ route('accounts.show',journal.source_account_id) }}">{{ journal.source_account_name }}</a>
{% endif %}
</td> </td>
{% endif %} {% endif %}
{% if not hideDestination %} {% if not hideDestination %}
<td class="hidden-xs"> <td class="hidden-xs">
{% if journal.destination_account_type == 'Cash account' %} {{ destinationAccount(journal)|raw }}
<span class="text-success">(cash)</span>
{% else %}
<a href="{{ route('accounts.show',journal.destination_account_id) }}">{{ journal.destination_account_name }}</a>
{% endif %}
</td> </td>
{% endif %} {% endif %}

1
resources/views/popup/report/income-entry.twig
View File

@@ -8,6 +8,7 @@
<div class="modal-body"> <div class="modal-body">
{% set hideBudget = true %} {% set hideBudget = true %}
{% set hideSource = true %} {% set hideSource = true %}
{% set accountPerspective = account %}
{% include 'popup/list/journals.twig' %} {% include 'popup/list/journals.twig' %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">