IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-09 15:43:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

This fixes #559

Browse Source
This commit is contained in:
James Cole 2017-02-11 18:35:16 +01:00
parent b5a005dcc5
commit dcc2b9c1cb
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/AccountFormRequest.php
View File

@ -77,11 +77,11 @@ class AccountFormRequest extends Request
return [ return [
'id' => $idRule, 'id' => $idRule,
'name' => $nameRule, 'name' => $nameRule,
'openingBalance' => 'numeric', 'openingBalance' => 'numeric|required_with:openingBalanceDate',
'openingBalanceDate' => 'date|required_with:openingBalance',
'iban' => 'iban', 'iban' => 'iban',
'BIC' => 'bic', 'BIC' => 'bic',
'virtualBalance' => 'numeric', 'virtualBalance' => 'numeric',
'openingBalanceDate' => 'date',
'currency_id' => 'exists:transaction_currencies,id', 'currency_id' => 'exists:transaction_currencies,id',
'accountNumber' => 'between:1,255|uniqueAccountNumberForUser', 'accountNumber' => 'between:1,255|uniqueAccountNumberForUser',
'accountRole' => 'in:' . $accountRoles, 'accountRole' => 'in:' . $accountRoles,

2
resources/views/accounts/create.twig
View File

@ -40,7 +40,7 @@
{% if what == 'asset' %} {% if what == 'asset' %}
{{ ExpandedForm.balance('openingBalance') }} {{ ExpandedForm.balance('openingBalance') }}
{{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }} {{ ExpandedForm.date('openingBalanceDate') }}
{{ ExpandedForm.select('accountRole', roles,null,{'helpText' : 'asset_account_role_help'|_}) }} {{ ExpandedForm.select('accountRole', roles,null,{'helpText' : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.balance('virtualBalance') }} {{ ExpandedForm.balance('virtualBalance') }}
{% endif %} {% endif %}