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

Better formatting for split transactions.

Browse Source
This commit is contained in:
James Cole
2016-05-13 19:40:13 +02:00
parent 5166171e5d
commit 5a6967cefd
6 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/accounts/show.twig
View File

@@ -38,7 +38,7 @@
<h3 class="box-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="box-body">
{% include 'list.journals' with {sorting:true} %}
{% include 'list.journals' with {sorting:true, accountPerspective: account} %}
</div>
</div>
</div>

6
resources/views/list/journals.twig
View File

@@ -57,7 +57,11 @@
</td>
<td>
{{ journal|formatJournal }}
{% if not accountPerspective %}
{{ journal|formatJournal }}
{% else %}
{{ formatPerspective(journal, accountPerspective)|raw }}
{% endif %}
</td>
<td class="hidden-sm hidden-xs">
{{ journal.date.formatLocalized(monthAndDayFormat) }}

39
resources/views/reports/index.twig
View File

@@ -135,6 +135,45 @@
]) }}">{{ 'report_all_time_quick'|_ }}</a>
</li>
</ul>
<h4>{{ 'quick_link_audit_report'|_ }}</h4>
<ul>
<li>
<a href="{{ route('reports.report',
['audit',
'currentMonthStart',
'currentMonthEnd',
accountList
]) }}">{{ 'report_this_month_quick'|_ }}</a>
</li>
<li>
<a href="{{ route('reports.report',
['audit',
'currentYearStart',
'currentYearEnd',
accountList
]) }}">{{ 'report_this_year_quick'|_ }}</a>
</li>
{% if customFiscalYear == 1 %}
<li>
<a href="{{ route('reports.report',
['audit',
'currentFiscalYearStart',
'currentFiscalYearEnd',
accountList
]) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a>
</li>
{% endif %}
<li>
<a href="{{ route('reports.report',
['audit',
start.format('Ymd'),
'currentMonthEnd',
accountList
]) }}">{{ 'report_all_time_quick'|_ }}</a>
</li>
</ul>
<p>
<em>{{ 'reports_can_bookmark'|_ }}</em>
</p>