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

Fixed some issues in import, should improve results for #701

Browse Source
This commit is contained in:
James Cole
2017-07-14 06:41:47 +02:00
parent 970c73c221
commit 3c4abb7b60
6 changed files with 111 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Import/Object/ImportAccount.php
View File

@@ -264,8 +264,10 @@ class ImportAccount
return new Account;
}
if ($account->accountType->type !== $this->expectedType) {
// must be of the same type
// except when mapped is an asset, then it's fair game.
// which only shows that user must map very carefully.
if ($account->accountType->type !== $this->expectedType && $account->accountType->type !== AccountType::ASSET) {
Log::error(
sprintf(
'Mapped account #%d is of type "%s" but we expect a "%s"-account. Mapping will be ignored.', $account->id, $account->accountType->type,