kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1825

Browse Source
This commit is contained in:
James Cole
2018-10-28 15:51:11 +01:00
parent bb39781848
commit 933105a721
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -138,7 +138,7 @@ class ReconcileController extends Controller
if ($account->id === $dstAccount->id) {
// destination, and it matches the currency id or is 0
if ($dstCurrency === $transaction->transaction_currency_id || 0 === $dstCurrency) {
Log::debug(sprintf('Destination matches currency: %s', $transaction->transaction_amount));
Log::debug(sprintf('Destination matches currency: %s', app('steam')->negative($transaction->transaction_amount)));
$amount = bcadd($amount, app('steam')->negative($transaction->transaction_amount));
}
// destination, and it matches the foreign currency ID.
@@ -147,10 +147,9 @@ class ReconcileController extends Controller
$amount = bcadd($amount, $transaction->transaction_foreign_amount);
}
}
Log::debug(sprintf('Amount is now %s', $amount));
}
Log::debug('End transaction loop');
// make sure amount is positive.
$amount = app('steam')->positive($amount);
/** @var Transaction $transaction */
foreach ($cleared as $transaction) {
if ($transaction->date <= $end) {