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

Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/JC5/firefly-iii:
  Should fix frontpage.

# Conflicts:
#	app/Models/TransactionJournal.php
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2016-05-11 06:08:05 +02:00
parent cda6cfb4cd 7c7740d3ba
commit d233a2df3c
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/TransactionJournal.php
View File

@@ -338,10 +338,6 @@ class TransactionJournal extends TransactionJournalSupport
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0);
}
);
// order
$query->orderBy('transaction_journals.date', 'DESC')->orderBy('transaction_journals.order', 'ASC')->orderBy('transaction_journals.id', 'DESC');
$query->groupBy('transaction_journals.id');
$query->with(['categories', 'budgets', 'attachments', 'bill','transactions']);
}