kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 14:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2513

Browse Source
This commit is contained in:
James Cole
2019-09-01 19:17:46 +02:00
parent 30fc56a0d7
commit 8246d901e7
3 changed files with 92 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
resources/views/v1/reports/audit/report.twig
View File

@@ -52,6 +52,17 @@
</div>
{% else %}
<div class="box-body table-responsive no-padding">
<p style="padding:10px;">
{{ trans('firefly.audit_end_balance',
{
account_name: account.name|escape,
url: url,
end: auditData[account.id].dayBefore,
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
})|raw }}
</p>
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
<p style="padding:10px;">
{{ trans('firefly.audit_end_balance',
@@ -61,17 +72,6 @@
end: auditData[account.id].end,
balance: formatAmountByAccount(account,auditData[account.id].endBalance)
})|raw }}
<!-- TODO VERIFY THAT STEAM BALANCE ACTUALLY WORKS -->
</p>
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
<p style="padding:10px;">
{{ trans('firefly.audit_end_balance',
{
account_name: account.name|escape,
url: url,
end: auditData[account.id].dayBefore,
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
})|raw }}
</p>
</div>
{% endif %}

11
resources/views/v1/reports/partials/journals-audit.twig
View File

@@ -57,11 +57,11 @@
{% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %}
XX
<i class="fa-fw fa fa-calculator" title="{{ trans('firefly.reconciliation_transaction') }}"></i>
{% endif %}
{% if journal.transaction_type_type == 'Opening balance' %}
XX
<i class="fa-fw fa fa-star-o" title="{{ trans('firefly.Opening balance') }}"></i>
{% endif %}
</td>
@@ -80,7 +80,12 @@
{{ formatAmountBySymbol(journal.balance_before, journal.currency_symbol, journal.currency_decimal_places) }}
</td>
<td class="hide-amount" style="text-align: right;">
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
{% if account.id == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}
{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
{% else %}
{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
{% endif %}
</td>
<td class="hide-balance_after" style="text-align: right;">