diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index b68c607cde..e1f7cc7e20 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -107,14 +107,14 @@ {% if entry[2] != 0 %} - - + + {% endif %} {% if entry[3] != 0 %} - - + + {% endif %}
{{ 'spent'|_ }}{{ entry[2]|formatAmount }}{{ 'spent'|_ }}{{ entry[2]|formatAmount }}
{{ 'earned'|_ }}{{ entry[3]|formatAmount }}{{ 'earned'|_ }}{{ entry[3]|formatAmount }}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index 77954e0501..f824d79b75 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -96,14 +96,14 @@ {% if entry[2] != 0 %} - - + + {% endif %} {% if entry[3] != 0 %} - - + + {% endif %}
{{ 'spent'|_ }}{{ entry[2]|formatAmount }}{{ 'spent'|_ }}{{ entry[2]|formatAmount }}
{{ 'earned'|_ }}{{ entry[3]|formatAmount }}{{ 'earned'|_ }}{{ entry[3]|formatAmount }}
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index c3009fe2a0..e8de3bee8f 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -17,7 +17,7 @@ {{ 'name'|_ }} - {{ 'spent'|_ }} + {{ 'spent'|_ }} @@ -27,9 +27,9 @@ {{ account.name }} {% if accountSummary[account.id] %} - {{ accountSummary[account.id]|formatAmount }} + {{ accountSummary[account.id]|formatAmount }} {% else %} - {{ 0|formatAmount }} + {{ 0|formatAmount }} {% endif %} {% endfor %} @@ -47,7 +47,7 @@ {{ 'name'|_ }} - {{ 'spent'|_ }} + {{ 'spent'|_ }} @@ -57,9 +57,9 @@ {{ budget.name }} {% if budgetSummary[budget.id] %} - {{ budgetSummary[budget.id]|formatAmount }} + {{ budgetSummary[budget.id]|formatAmount }} {% else %} - {{ 0|formatAmount }} + {{ 0|formatAmount }} {% endif %} {% endfor %} @@ -133,8 +133,8 @@ {{ 'account'|_ }} - {{ 'spent_average'|_ }} - {{ 'total'|_ }} + {{ 'spent_average'|_ }} + {{ 'total'|_ }} {{ 'transaction_count'|_ }} @@ -148,10 +148,10 @@ {{ row.name }} - + {{ row.average|formatAmount }} - + {{ row.sum|formatAmount }} @@ -188,7 +188,7 @@ {{ 'description'|_ }} {{ 'date'|_ }} {{ 'account'|_ }} - {{ 'amount'|_ }} + {{ 'amount'|_ }} @@ -215,7 +215,7 @@ {{ row.opposing_account_name }} - + {{ row.transaction_amount|formatAmount }} diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig index 76df238013..cef7514534 100644 --- a/resources/views/reports/category/month.twig +++ b/resources/views/reports/category/month.twig @@ -17,8 +17,8 @@ {{ 'name'|_ }} - {{ 'earned'|_ }} - {{ 'spent'|_ }} + {{ 'earned'|_ }} + {{ 'spent'|_ }} @@ -28,14 +28,14 @@ {{ account.name }} {% if accountSummary[account.id] %} - {{ accountSummary[account.id].earned|formatAmount }} + {{ accountSummary[account.id].earned|formatAmount }} {% else %} - {{ 0|formatAmount }} + {{ 0|formatAmount }} {% endif %} {% if accountSummary[account.id] %} - {{ accountSummary[account.id].spent|formatAmount }} + {{ accountSummary[account.id].spent|formatAmount }} {% else %} - {{ 0|formatAmount }} + {{ 0|formatAmount }} {% endif %} {% endfor %} @@ -53,8 +53,8 @@ {{ 'name'|_ }} - {{ 'earned'|_ }} - {{ 'spent'|_ }} + {{ 'earned'|_ }} + {{ 'spent'|_ }} @@ -64,14 +64,14 @@ {{ category.name }} {% if categorySummary[category.id] %} - {{ categorySummary[category.id].earned|formatAmount }} + {{ categorySummary[category.id].earned|formatAmount }} {% else %} - {{ 0|formatAmount }} + {{ 0|formatAmount }} {% endif %} {% if categorySummary[category.id] %} - {{ categorySummary[category.id].spent|formatAmount }} + {{ categorySummary[category.id].spent|formatAmount }} {% else %} - {{ 0|formatAmount }} + {{ 0|formatAmount }} {% endif %} {% endfor %} @@ -164,8 +164,8 @@ {{ 'account'|_ }} - {{ 'spent_average'|_ }} - {{ 'total'|_ }} + {{ 'spent_average'|_ }} + {{ 'total'|_ }} {{ 'transaction_count'|_ }} @@ -179,10 +179,10 @@ {{ row.name }} - + {{ row.average|formatAmount }} - + {{ row.sum|formatAmount }} @@ -219,7 +219,7 @@ {{ 'description'|_ }} {{ 'date'|_ }} {{ 'account'|_ }} - {{ 'amount'|_ }} + {{ 'amount'|_ }} @@ -246,7 +246,7 @@ {{ row.opposing_account_name }} - + {{ row.transaction_amount|formatAmount }} diff --git a/resources/views/reports/partials/accounts.twig b/resources/views/reports/partials/accounts.twig index ef3ad787e7..3468f4c1d0 100644 --- a/resources/views/reports/partials/accounts.twig +++ b/resources/views/reports/partials/accounts.twig @@ -2,9 +2,9 @@ {{ 'name'|_ }} - {{ 'balanceStart'|_ }} - {{ 'balanceEnd'|_ }} - {{ 'difference'|_ }} + {{ 'balanceStart'|_ }} + {{ 'balanceEnd'|_ }} + {{ 'difference'|_ }} @@ -13,18 +13,18 @@ {{ account.name }} - {{ account.startBalance|formatAmount }} - {{ account.endBalance|formatAmount }} - {{ (account.endBalance - account.startBalance)|formatAmount }} + {{ account.startBalance|formatAmount }} + {{ account.endBalance|formatAmount }} + {{ (account.endBalance - account.startBalance)|formatAmount }} {% endfor %} {{ 'sumOfSums'|_ }} - {{ accountReport.getStart|formatAmount }} - {{ accountReport.getEnd|formatAmount }} - {{ accountReport.getDifference|formatAmount }} + {{ accountReport.getStart|formatAmount }} + {{ accountReport.getEnd|formatAmount }} + {{ accountReport.getDifference|formatAmount }} diff --git a/resources/views/reports/partials/balance.twig b/resources/views/reports/partials/balance.twig index 58fdf45cfc..c2c6e1a323 100644 --- a/resources/views/reports/partials/balance.twig +++ b/resources/views/reports/partials/balance.twig @@ -4,9 +4,9 @@ {{ 'budgets'|_ }} {% for account in balance.getBalanceHeader.getAccounts %} - {{ account.name }} + {{ account.name }} {% endfor %} - + {{ 'leftInBudget'|_ }} @@ -28,7 +28,7 @@ {% endif %} - + {% if(balanceLine.getBudget.amount) %} {{ balanceLine.getBudget.amount|formatAmount }} {% else %} @@ -40,7 +40,7 @@ {% endif %} {% for balanceEntry in balanceLine.getBalanceEntries %} - + {% if balanceEntry.getSpent != 0 %} {{ (balanceEntry.getSpent)|formatAmountPlain }} {{ (balanceEntry.getLeft)|formatAmountPlain }} + {{ (balanceEntry.getLeft)|formatAmountPlain }} {% endif %} {% endfor %} - + {{ balanceLine.leftOfRepetition|formatAmount }} diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig index fe234655ef..05f7f02839 100644 --- a/resources/views/reports/partials/bills.twig +++ b/resources/views/reports/partials/bills.twig @@ -7,10 +7,10 @@ {{ trans('form.name') }} - {{ trans('form.amount_min') }} - {{ trans('form.amount_max') }} - {{ trans('form.amount') }} - {{ trans('form.under') }} + {{ trans('form.amount_min') }} + {{ trans('form.amount_max') }} + {{ trans('form.amount') }} + {{ trans('form.under') }} @@ -19,10 +19,10 @@ {{ line.getBill.name }} - {{ line.getMin|formatAmount }} - {{ line.getMax|formatAmount }} + {{ line.getMin|formatAmount }} + {{ line.getMax|formatAmount }} {% if line.isHit %} - + {{ line.getAmount|formatAmount }} @@ -34,7 +34,7 @@ {% if not line.isActive %}   {% endif %} - + {% if line.isActive %} {{ (line.getMax + line.getAmount)|formatAmount }} {% endif %} diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig index 86d5f98aed..e5586d17b0 100644 --- a/resources/views/reports/partials/budget-period.twig +++ b/resources/views/reports/partials/budget-period.twig @@ -3,9 +3,9 @@ {{ 'budget'|_ }} {% for period in periods %} - {{ period }} + {{ period }} {% endfor %} - {{ 'sum'|_ }} + {{ 'sum'|_ }} @@ -19,17 +19,17 @@ {% for key, period in periods %} {% if(info.entries[key]) %} - + {{ info.entries[key]|formatAmount }} {% else %} - + {{ 0|formatAmount }} {% endif %} {% endfor %} - + {{ info.sum|formatAmount }} diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig index 9deece67bb..be4b938c4b 100644 --- a/resources/views/reports/partials/budgets.twig +++ b/resources/views/reports/partials/budgets.twig @@ -3,10 +3,11 @@ {{ 'budget'|_ }} {{ 'date'|_ }} - {{ 'budgeted'|_ }} - {{ 'spent'|_ }} - {{ 'left'|_ }} - {{ 'overspent'|_ }} + {{ 'budgeted'|_ }} + {{ 'spent'|_ }} +   + {{ 'left'|_ }} + {{ 'overspent'|_ }} @@ -40,33 +41,41 @@ {% if budgetLine.getBudgetLimit.id %} - + {{ budgetLine.getBudgetLimit.amount|formatAmount }} {% else %} - + {{ 0|formatAmount }} {% endif %} - + {% if budgetLine.getSpent != 0 %} {{ budgetLine.getSpent|formatAmount }} - + --> {% endif %} {% if budgetLine.getSpent == 0 %} {{ budgetLine.getSpent|formatAmount }} {% endif %} - - + + {% if budgetLine.getSpent != 0 %} + + + {% endif %} + + + {% if(budgetLine.getOverspent == 0) %} {{ budgetLine.getLeft|formatAmount }} {% endif %} - + {% if budgetLine.getOverspent != 0 %} {{ budgetLine.getOverspent|formatAmount }} {% endif %} @@ -78,8 +87,8 @@ {{ 'sum'|_ }}   - {{ budgets.getBudgeted|formatAmount }} - + {{ budgets.getBudgeted|formatAmount }} + {% if budgets.getSpent != 0 %} {{ budgets.getSpent|formatAmountPlain }} {% endif %} @@ -87,8 +96,9 @@ {{ budgets.getSpent|formatAmount }} {% endif %} - {{ budgets.getLeft|formatAmount }} - {{ budgets.getOverspent|formatAmountPlain }} +   + {{ budgets.getLeft|formatAmount }} + {{ budgets.getOverspent|formatAmountPlain }} diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twig index d5bfcb4df8..eec4ac0843 100644 --- a/resources/views/reports/partials/categories.twig +++ b/resources/views/reports/partials/categories.twig @@ -2,7 +2,8 @@ {{ 'category'|_ }} - {{ 'spent'|_ }} + {{ 'spent'|_ }} +   @@ -17,7 +18,7 @@ {{ category.name }} - {{ category.spent|formatAmount }} + {{ category.spent|formatAmount }} {{ 'sum'|_ }} - {{ sum|formatAmount }} + {{ sum|formatAmount }} +   diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twig index d24e0ec09f..8228327b64 100644 --- a/resources/views/reports/partials/category-period.twig +++ b/resources/views/reports/partials/category-period.twig @@ -3,9 +3,9 @@ {{ 'category'|_ }} {% for period in periods %} - {{ period }} + {{ period }} {% endfor %} - {{ 'sum'|_ }} + {{ 'sum'|_ }} @@ -20,11 +20,11 @@ {% for key, period in periods %} {# income first #} {% if(info.entries[key]) %} - + {{ info.entries[key]|formatAmount }} {% else %} - + {{ 0|formatAmount }} {% endif %} @@ -32,11 +32,11 @@ {# if sum of income, display: #} {% if info.sum %} - + {{ info.sum|formatAmount }} {% else %} - + {{ 0|formatAmount }} {% endif %} diff --git a/resources/views/reports/partials/income-expenses.twig b/resources/views/reports/partials/income-expenses.twig index c70f60b0d7..3dcb0f0614 100644 --- a/resources/views/reports/partials/income-expenses.twig +++ b/resources/views/reports/partials/income-expenses.twig @@ -2,8 +2,8 @@ {{ 'name'|_ }} - {{ 'total'|_ }} - {{ 'average'|_ }} + {{ 'total'|_ }} + {{ 'average'|_ }} @@ -25,10 +25,10 @@ {% endif %} - + {{ (entry.sum)|formatAmount }} - + {% if entry.count > 1 %} {{ entry.average|formatAmount }} {% else %} @@ -52,7 +52,7 @@ {% endif %} {{ 'sum'|_ }} - {{ (sum)|formatAmount }} + {{ (sum)|formatAmount }} diff --git a/resources/views/reports/partials/journals-audit-tasker.twig b/resources/views/reports/partials/journals-audit-tasker.twig index 824dd126bc..0c9fd25adc 100644 --- a/resources/views/reports/partials/journals-audit-tasker.twig +++ b/resources/views/reports/partials/journals-audit-tasker.twig @@ -7,9 +7,9 @@   {{ trans('list.description') }} - {{ trans('list.balance_before') }} - {{ trans('list.amount') }} - {{ trans('list.balance_after') }} + {{ trans('list.balance_before') }} + {{ trans('list.amount') }} + {{ trans('list.balance_after') }} {{ trans('list.date') }} {{ trans('list.book_date') }} @@ -57,14 +57,14 @@ {% endif %} - {{ transaction.before|formatAmount }} - + {{ transaction.before|formatAmount }} + {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }} {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} - {{ transaction.after|formatAmount }} + {{ transaction.after|formatAmount }} {{ transaction.date.formatLocalized(monthAndDayFormat) }} diff --git a/resources/views/reports/partials/operations.twig b/resources/views/reports/partials/operations.twig index 12fb1928f7..60ee342bb9 100644 --- a/resources/views/reports/partials/operations.twig +++ b/resources/views/reports/partials/operations.twig @@ -1,14 +1,14 @@ - + - + - +
{{ 'in'|_ }}{{ incomeSum|formatAmount }}{{ incomeSum|formatAmount }}
{{ 'out'|_ }}{{ expensesSum|formatAmount }}{{ expensesSum|formatAmount }}
{{ 'difference'|_ }}{{ (incomeSum + expensesSum)|formatAmount }}{{ (incomeSum + expensesSum)|formatAmount }}