diff --git a/resources/twig/list/accounts.twig b/resources/twig/list/accounts.twig
index 1ddfdc6fce..8543184d3e 100644
--- a/resources/twig/list/accounts.twig
+++ b/resources/twig/list/accounts.twig
@@ -4,12 +4,12 @@
|
{{ trans('list.name') }} |
{% if what == 'asset' %}
- {{ trans('list.role') }} |
+ {{ trans('list.role') }} |
{% endif %}
{{ trans('list.currentBalance') }} |
- {{ trans('list.active') }} |
- {{ trans('list.lastActivity') }} |
- {{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }} |
+ {{ trans('list.active') }} |
+ {{ trans('list.lastActivity') }} |
+ {{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }} |
@@ -23,7 +23,7 @@
{{ account.name }} |
{% if what == "asset" %}
-
+ |
{% for entry in account.accountmeta %}
{% if entry.name == 'accountRole' %}
{{ entry.data|getAccountRole }}
@@ -32,7 +32,7 @@
|
{% endif %}
{{ account|balance|formatAmount }} |
-
+ |
{% if account.active %}
{% else %}
@@ -40,15 +40,15 @@
{% endif %}
|
{% if account.lastActivityDate %}
-
+ |
{{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }}
|
{% else %}
-
+ |
Never
|
{% endif %}
-
+ |
{{ (account.endBalance - account.startBalance)|formatAmount }}
|
diff --git a/resources/twig/list/bills.twig b/resources/twig/list/bills.twig
index f22c78b624..115853a873 100644
--- a/resources/twig/list/bills.twig
+++ b/resources/twig/list/bills.twig
@@ -3,13 +3,13 @@
| |
{{ trans('list.name') }} |
- {{ trans('list.matchesOn') }} |
+ {{ trans('list.matchesOn') }} |
{{ trans('list.matchingAmount') }} |
- {{ trans('list.lastMatch') }} |
- {{ trans('list.expectedMatch') }} |
- {{ trans('list.active') }} |
- {{ trans('list.automatch') }} |
- {{ trans('list.repeat_freq') }} |
+ {{ trans('list.lastMatch') }} |
+ {{ trans('list.expectedMatch') }} |
+ {{ trans('list.active') }} |
+ {{ trans('list.automatch') }} |
+ {{ trans('list.repeat_freq') }} |
{% for entry in bills %}
@@ -23,7 +23,7 @@
{{ entry.name }}
|
-
+ |
{% for match in entry.match|split(',') %}
{{ match }}
{% endfor %}
@@ -35,40 +35,40 @@
{{ entry.amount_max|formatAmount }}
|
{% if entry.lastFoundMatch %}
-
+ |
{{entry.lastFoundMatch.formatLocalized(monthAndDayFormat)}}
|
{% else %}
-
+ |
{{ 'unknown'|_ }}
|
{% endif %}
{% if entry.nextExpectedMatch%}
-
+ |
{{entry.nextExpectedMatch.formatLocalized(monthAndDayFormat)}}
|
{% else %}
-
+ |
{{ 'unknown'|_ }}
|
{% endif %}
-
+ |
{% if entry.active %}
{% else %}
{% endif %}
|
-
+ |
{% if entry.automatch %}
{% else %}
{% endif %}
|
-
+ |
{{ entry.repeat_freq|_ }}
{% if entry.skip > 0 %}
skips over {{entry.skip}}
diff --git a/resources/twig/list/categories.twig b/resources/twig/list/categories.twig
index 2d4377d100..c442447109 100644
--- a/resources/twig/list/categories.twig
+++ b/resources/twig/list/categories.twig
@@ -3,14 +3,14 @@
|
| |
{{ trans('list.name') }} |
- {{ trans('list.lastActivity') }} |
+ {{ trans('list.lastActivity') }} |
| |
{{ 'without_category'|_ }} |
- |
+ |
{% for category in categories %}
@@ -24,11 +24,11 @@
{{ category.name }}
{% if category.lastActivity %}
- |
+ |
{{category.lastActivity.formatLocalized(monthAndDayFormat) }}
|
{% else %}
-
+ |
{{ 'never'|_ }}
|
{% endif %}
diff --git a/resources/twig/list/journals.twig b/resources/twig/list/journals.twig
index a7399b8bd2..77164ccdfb 100644
--- a/resources/twig/list/journals.twig
+++ b/resources/twig/list/journals.twig
@@ -5,7 +5,7 @@
|
{{ trans('list.description') }} |
{{ trans('list.amount') }} |
- {{ trans('list.date') }} |
+ {{ trans('list.date') }} |
{{ trans('list.from') }} |
{{ trans('list.to') }} |
@@ -60,7 +60,7 @@
{{ journal.correct_amount|formatAmount }}
{% endif %}
-
+ |
{{journal.date.formatLocalized(monthAndDayFormat)}}
|
diff --git a/resources/twig/list/piggy-banks.twig b/resources/twig/list/piggy-banks.twig
index 12a864bf04..6ca711f56d 100644
--- a/resources/twig/list/piggy-banks.twig
+++ b/resources/twig/list/piggy-banks.twig
@@ -2,11 +2,11 @@
|
{% for piggyBank in piggyBanks %}
- |
+ |
|
-
+ |
@@ -18,14 +18,14 @@
{{ piggyBank.savedSoFar|formatAmountPlain }}
|
-
+ |
{% if piggyBank.savedSoFar > 0 %}
{% endif %}
|
-
+ |
-
+ |
{% if piggyBank.leftToSave > 0 %}
{% endif %}
|
-
+ |
{{ piggyBank.targetamount|formatAmount }}
{% if piggyBank.leftToSave > 0 %}
({{ piggyBank.leftToSave|formatAmount }})
diff --git a/resources/twig/piggy-banks/index.twig b/resources/twig/piggy-banks/index.twig
index 1e32d4267a..6d8d16687f 100644
--- a/resources/twig/piggy-banks/index.twig
+++ b/resources/twig/piggy-banks/index.twig
@@ -31,22 +31,22 @@
| {{ 'account'|_ }} |
- {{ 'balance'|_ }} |
+ {{ 'balance'|_ }} |
{{ 'left_for_piggy_banks'|_ }} |
- {{ 'sum_of_piggy_banks'|_ }} |
- {{ 'saved_so_far'|_ }} |
- {{ 'left_to_save'|_ }} |
+ {{ 'sum_of_piggy_banks'|_ }} |
+ {{ 'saved_so_far'|_ }} |
+ {{ 'left_to_save'|_ }} |
|
{% for id,info in accounts %}
| {{ info.name }} |
- {{ info.balance|formatAmount }} |
+ {{ info.balance|formatAmount }} |
{{ info.leftForPiggyBanks|formatAmount }} |
- {{ info.sumOfTargets|formatAmount }} |
- {{ info.sumOfSaved|formatAmount }} |
- {{ info.leftToSave|formatAmount }} |
+ {{ info.sumOfTargets|formatAmount }} |
+ {{ info.sumOfSaved|formatAmount }} |
+ {{ info.leftToSave|formatAmount }} |
{% endfor %}
| |