IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some rare bugs.

Browse Source
This commit is contained in:
James Cole 2016-10-02 15:09:43 +02:00
parent 7d21255f7f
commit 0a147e5c9c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Import/ImportValidator.php
View File

@ -181,13 +181,13 @@ class ImportValidator
Log::debug(sprintf('No account named %s of type %s, create new account.', $account->name, $type)); Log::debug(sprintf('No account named %s of type %s, create new account.', $account->name, $type));
$result = $repository->store( $result = $repository->store(
[ [
'user' => $this->user->id, 'user' => $this->user->id,
'accountType' => config('firefly.shortNamesByFullName.' . $type), 'accountType' => config('firefly.shortNamesByFullName.' . $type),
'name' => $account->name, 'name' => $account->name,
'virtualBalance' => 0, 'virtualBalance' => 0,
'active' => true, 'active' => true,
'iban' => null, 'iban' => null,
'openingBalance' => 0, 'openingBalance' => 0,
] ]
); );
} }
@ -262,6 +262,7 @@ class ImportValidator
$entry->valid = false; $entry->valid = false;
Log::warning('Cannot import entry. Asset account is NULL and import account is also NULL.'); Log::warning('Cannot import entry. Asset account is NULL and import account is also NULL.');
return $entry;
} }
Log::debug('Asset account is OK.', ['id' => $entry->fields['asset-account']->id, 'name' => $entry->fields['asset-account']->name]); Log::debug('Asset account is OK.', ['id' => $entry->fields['asset-account']->id, 'name' => $entry->fields['asset-account']->name]);

2
app/Repositories/Tag/TagRepository.php
View File

@ -143,7 +143,7 @@ class TagRepository implements TagRepositoryInterface
->transactionJournals() ->transactionJournals()
->sortCorrectly() ->sortCorrectly()
->expanded() ->expanded()
->groupBy(['tag_transaction_journal.tag_id']) ->groupBy(['tag_transaction_journal.tag_id','tag_transaction_journal.transaction_journal_id'])
->get(TransactionJournal::queryFields()); ->get(TransactionJournal::queryFields());
return $journals; return $journals;