kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Allow the mapping of asset accounts for opposing value

Browse Source
This commit is contained in:
James Cole
2018-05-12 20:56:34 +02:00
parent 9c507f7f62
commit 528da3f08e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Import/Routine/File/OpposingAccountMapper.php
View File

@@ -62,7 +62,7 @@ class OpposingAccountMapper
if ((int)$accountId > 0) {
// find any account with this ID:
$result = $this->repository->findNull($accountId);
if (null !== $result && $result->accountType->type === $expectedType) {
if (null !== $result && ($result->accountType->type === $expectedType || $result->accountType->type === AccountType::ASSET)) {
Log::debug(sprintf('Found account "%s" (%s) based on given ID %d. Return it!', $result->name, $result->accountType->type, $accountId));
return $result;
@@ -112,7 +112,7 @@ class OpposingAccountMapper
// not found? Create it!
$creation = [
'name' => $data['name'] ?? '(no name)',
'iban' => $data['iban']?? null,
'iban' => $data['iban'] ?? null,
'accountNumber' => $data['number'] ?? null,
'account_type_id' => null,
'accountType' => $expectedType,