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

Merge tag '4.7.17.4' into develop

Browse Source 
4.7.17.4

# Conflicts:
#	config/firefly.php
#	resources/views/v1/transactions/convert.twig
This commit is contained in:
James Cole
2019-08-02 17:10:55 +02:00
parent 6ac08de71d c9f4cf4f34
commit 3435cb937c
10 changed files with 87 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@
<em>
{{ trans('firefly.no_audit_activity',
{
account_name: account.name,
account_name: account.name|escape,
url: url,
start: start.formatLocalized(monthAndDayFormat),
end: end.formatLocalized(monthAndDayFormat),
@@ -56,7 +56,7 @@
{{ trans('firefly.audit_end_balance',
{
account_name: account.name,
account_name: account.name|escape,
url: url,
end: auditData[account.id].end,
balance: formatAmountByAccount(account,auditData[account.id].endBalance)
@@ -67,7 +67,7 @@
<p style="padding:10px;">
{{ trans('firefly.audit_end_balance',
{
account_name: account.name,
account_name: account.name|escape,
url: url,
end: auditData[account.id].dayBefore,
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)