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

Prevent asset account from being found by opposing account. #719

Browse Source
This commit is contained in:
James Cole
2017-08-12 13:49:40 +02:00
parent 9803932324
commit 0375f77b73
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Import/Storage/ImportStorage.php
View File

@@ -188,7 +188,7 @@ class ImportStorage
{
$amount = Steam::positive($importJournal->getAmount());
$asset = $importJournal->asset->getAccount();
$opposing = $this->getOpposingAccount($importJournal->opposing, $amount);
$opposing = $this->getOpposingAccount($importJournal->opposing,$asset->id, $amount);
$description = $importJournal->getDescription();
$filtered = $set->filter(
@@ -288,8 +288,9 @@ class ImportStorage
*
* @return Account
*/
private function getOpposingAccount(ImportAccount $account, $amount): Account
private function getOpposingAccount(ImportAccount $account, int $forbiddenAccount, string $amount): Account
{
$account->setForbiddenAccountId($forbiddenAccount);
if (bccomp($amount, '0') === -1) {
Log::debug(sprintf('%s is negative, create opposing expense account.', $amount));
$account->setExpectedType(AccountType::EXPENSE);