kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/3.4.4.2' into develop

Browse Source
This commit is contained in:
James Cole
2015-06-08 18:52:30 +02:00
parent 3a1102fa4e 5fa87e18db
commit 06862a2812
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,4 +1,4 @@
# Firefly III (v3.4.4) # Firefly III (v3.4.4.2)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
[![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)

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

@@ -320,13 +320,18 @@ class TagRepository implements TagRepositoryInterface
$match = true; $match = true;
/** @var TransactionJournal $check */ /** @var TransactionJournal $check */
foreach ($tag->transactionjournals as $check) { foreach ($tag->transactionjournals as $check) {
if ($check->source_account->id != $journal->source_account->id) { // $checkAccount is the source_account for a withdrawal
// $checkAccount is the destination_account for a deposit
if ($check->transactionType->type == 'Withdrawal' && $check->source_account->id != $journal->destination_account->id) {
$match = false; $match = false;
} }
if ($check->transactionType->type == 'Deposit' && $check->destination_account->id != $journal->destination_account->id) {
$match = false;
}
} }
if ($match) { if ($match) {
$journal->tags()->save($tag); $journal->tags()->save($tag);
return true; return true;
} }