diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig index d5cff5eedb..19fdea02c3 100644 --- a/resources/views/reports/default/month.twig +++ b/resources/views/reports/default/month.twig @@ -20,7 +20,16 @@
-
+
+
+
+

{{ 'accountBalances'|_ }}

+
+
+
+
+ +
@@ -42,7 +51,15 @@
-
+
+
+
+

{{ 'incomeVsExpenses'|_ }}

+
+
+
+
+
{% include 'reports/partials/tags.twig' %} diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index 3841050be2..e6975889c8 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -38,7 +38,7 @@

{{ 'income'|_ }}

-
+
@@ -53,7 +53,14 @@
-
+
+
+
+

{{ 'incomeVsExpenses'|_ }}

+
+
+
+
{% include 'reports/partials/tags.twig' %} diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index 7d897601bf..1db568296a 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -31,17 +31,27 @@
-
+
+
+

{{ 'accountBalances'|_ }}

+
+
+
+
+
+
+

{{ 'incomeVsExpenses'|_ }}

+
+
+
-
-

{{ 'income'|_ }}

-
+
diff --git a/resources/views/reports/partials/accounts.twig b/resources/views/reports/partials/accounts.twig index b0d4782a24..f05872ed1f 100644 --- a/resources/views/reports/partials/accounts.twig +++ b/resources/views/reports/partials/accounts.twig @@ -1,37 +1,30 @@ -
-
-

{{ 'accountBalances'|_ }}

-
-
- - - - - - - - - - - {% for account in accountReport.getAccounts %} - - - - - - - {% endfor %} - - - - - - - - - -
{{ 'name'|_ }}{{ 'balanceStart'|_ }}{{ 'balanceEnd'|_ }}{{ 'difference'|_ }}
- {{ account.name }} - {{ account.startBalance|formatAmount }}{{ account.endBalance|formatAmount }}{{ (account.endBalance - account.startBalance)|formatAmount }}
{{ 'sumOfSums'|_ }}{{ accountReport.getStart|formatAmount }}{{ accountReport.getEnd|formatAmount }}{{ accountReport.getDifference|formatAmount }}
-
-
+ + + + + + + + + + + {% for account in accountReport.getAccounts %} + + + + + + + {% endfor %} + + + + + + + + + +
{{ 'name'|_ }}{{ 'balanceStart'|_ }}{{ 'balanceEnd'|_ }}{{ 'difference'|_ }}
+ {{ account.name }} + {{ account.startBalance|formatAmount }}{{ account.endBalance|formatAmount }}{{ (account.endBalance - account.startBalance)|formatAmount }}
{{ 'sumOfSums'|_ }}{{ accountReport.getStart|formatAmount }}{{ accountReport.getEnd|formatAmount }}{{ accountReport.getDifference|formatAmount }}
diff --git a/resources/views/reports/partials/income-vs-expenses.twig b/resources/views/reports/partials/income-vs-expenses.twig index 5103c1987b..b9c9d0f5f5 100644 --- a/resources/views/reports/partials/income-vs-expenses.twig +++ b/resources/views/reports/partials/income-vs-expenses.twig @@ -1,21 +1,14 @@ -
-
-

{{ 'incomeVsExpenses'|_ }}

-
-
- - - - - - - - - - - - - -
{{ 'in'|_ }}{{ incomes.getTotal|formatAmount }}
{{ 'out'|_ }}{{ (expenses.getTotal)|formatAmount }}
{{ 'difference'|_ }}{{ (incomes.getTotal + expenses.getTotal)|formatAmount }}
-
-
+ + + + + + + + + + + + + +
{{ 'in'|_ }}{{ incomes.getTotal|formatAmount }}
{{ 'out'|_ }}{{ (expenses.getTotal)|formatAmount }}
{{ 'difference'|_ }}{{ (incomes.getTotal + expenses.getTotal)|formatAmount }}