Various code cleanup.

This commit is contained in:
James Cole
2017-01-21 09:07:10 +01:00
parent 71f6ba3418
commit 738a311f49
9 changed files with 65 additions and 46 deletions

View File

@@ -41,7 +41,7 @@
{{ ExpandedForm.balance('openingBalance') }}
{{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }}
{{ ExpandedForm.select('accountRole', Config.get('firefly.accountRoles'),null,{'helpText' : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.select('accountRole', roles,null,{'helpText' : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.balance('virtualBalance') }}
{% endif %}

View File

@@ -38,7 +38,7 @@
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
{{ ExpandedForm.balance('openingBalance',null, {'currency' : openingBalance ? openingBalance.transactionCurrency : null}) }}
{{ ExpandedForm.date('openingBalanceDate') }}
{{ ExpandedForm.select('accountRole',Config.get('firefly.accountRoles')) }}
{{ ExpandedForm.select('accountRole', roles) }}
{{ ExpandedForm.balance('virtualBalance',null) }}
{% endif %}

View File

@@ -28,7 +28,7 @@
<td class="hidden-sm hidden-xs">
{% for entry in account.accountmeta %}
{% if entry.name == 'accountRole' %}
{{ entry.data|getAccountRole }}
{{ ('account_role_'~entry.data)|_ }}
{% endif %}
{% endfor %}
</td>

View File

@@ -24,7 +24,7 @@
<td class="hidden-sm hidden-xs">
{% for entry in account.accountmeta %}
{% if entry.name == 'accountRole' %}
{{ trans('firefly.'~entry.data|getAccountRole) }}
{{ ('account_role_'~entry.data)|_ }}
{% endif %}
{% endfor %}
</td>