kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-03 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Make sure edit of liability always works.

Browse Source
This commit is contained in:
James Cole
2023-01-15 07:20:58 +01:00
parent 1f9e0b48c9
commit 7111aec101
5 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,8 @@ class AccountFormRequest extends FormRequest
$data['account_type_name'] = null;
$data['account_type_id'] = $this->convertInteger('liability_type_id');
if ('' !== $data['opening_balance']) {
$data['opening_balance'] = app('steam')->negative($data['opening_balance']);
// opening balance is always positive for liabilities
$data['opening_balance'] = app('steam')->positive($data['opening_balance']);
}
}

5
app/Services/Internal/Update/AccountUpdateService.php
View File

@@ -298,6 +298,11 @@ class AccountUpdateService
$openingBalance = $data['opening_balance'];
$openingBalanceDate = $data['opening_balance_date'];
// if liability, make sure the amount is positive for a credit, and negative for a debit.
if($this->isLiability($account)) {
$openingBalance = 'credit' === $data['liability_direction'] ? app('steam')->positive($openingBalance) : app('steam')->negative($openingBalance);
}
$this->updateOBGroupV2($account, $openingBalance, $openingBalanceDate);
}