From 39925f813987a117eb3dfc3148ecfda7fb45f615 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Mon, 12 Apr 2021 06:08:21 +0200
Subject: [PATCH] Small changes in list

---
 app/Http/Controllers/Account/IndexController.php | 2 +-
 app/Http/Requests/AccountFormRequest.php         | 9 +++------
 resources/views/v1/list/accounts.twig            | 4 +++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php
index c80673db05..9d9ecabc80 100644
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -172,7 +172,7 @@ class IndexController extends Controller
                 $account->location            = $this->repository->getLocation($account);
 
                 $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
-                $account->current_debt = $this->repository->getMetaValue($account, 'current_debt');
+                $account->current_debt = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
             }
         );
         // make paginator:
diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php
index 86370a1440..4cc9298b32 100644
--- a/app/Http/Requests/AccountFormRequest.php
+++ b/app/Http/Requests/AccountFormRequest.php
@@ -75,7 +75,9 @@ class AccountFormRequest extends FormRequest
         if ('liabilities' === $data['account_type_name']) {
             $data['account_type_name'] = null;
             $data['account_type_id']   = $this->integer('liability_type_id');
-            $data['opening_balance'] = app('steam')->negative($data['opening_balance']);
+            if ('' !== $data['opening_balance']) {
+                $data['opening_balance'] = app('steam')->negative($data['opening_balance']);
+            }
         }
 
         return $data;
@@ -110,11 +112,6 @@ class AccountFormRequest extends FormRequest
         ];
         $rules          = Location::requestRules($rules);
 
-        if ('liabilities' === $this->get('objectType')) {
-            $rules['opening_balance']      = ['numeric', 'required', 'max:1000000000'];
-            $rules['opening_balance_date'] = 'date|required';
-        }
-
         /** @var Account $account */
         $account = $this->route()->parameter('account');
         if (null !== $account) {
diff --git a/resources/views/v1/list/accounts.twig b/resources/views/v1/list/accounts.twig
index 03c2694001..5923f81a6f 100644
--- a/resources/views/v1/list/accounts.twig
+++ b/resources/views/v1/list/accounts.twig
@@ -68,7 +68,9 @@
             </td>
             {% if objectType == 'liabilities' %}
             <td style="text-align: right;">
-                <span class="text-info">{{ formatAmountByAccount(account, account.current_debt, false) }}</span>
+                {% if '-' != account.current_debt %}
+                    <span class="text-info">{{ formatAmountByAccount(account, account.current_debt, false) }}</span>
+                {% endif %}
             </td>
             {% endif %}
             <td class="hidden-sm hidden-xs">