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

Various fixes. Sorry, lazy day.

Browse Source
This commit is contained in:
James Cole
2019-08-03 06:27:56 +02:00
parent 43dbad4e4c
commit febaab62f7
9 changed files with 57864 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,12 +205,12 @@ class ReconcileController extends Controller
$inverse = true;
}
// reconciliation into account? then positive amount:
if (TransactionType::RECONCILIATION === $journal['transaction_type_type']) {
// opening balance into account? then positive amount:
if (TransactionType::OPENING_BALANCE === $journal['transaction_type_type']
&& $account->id === $journal['destination_account_id']) {
$inverse = true;
}
if (true === $inverse) {
$journal['amount'] = app('steam')->positive($journal['amount']);
if (null !== $journal['foreign_amount']) {

5
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -73,6 +73,8 @@ class BulkController extends Controller
{
$subTitle = (string)trans('firefly.mass_bulk_journals');
$this->rememberPreviousUri('transactions.bulk-edit.uri');
// make amounts positive.
// get list of budgets:
@@ -127,8 +129,9 @@ class BulkController extends Controller
* @param array $tags
* @return bool
*/
public function updateJournalTags(TransactionJournal $journal, bool $ignoreUpdate, array $tags): bool
private function updateJournalTags(TransactionJournal $journal, bool $ignoreUpdate, array $tags): bool
{
if (true === $ignoreUpdate) {
return false;
}