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

Merge branch 'release/3.6.1' into develop

Browse Source 
Conflicts:
	composer.lock
This commit is contained in:
James Cole
2016-01-09 14:31:52 +01:00
parent 681bc580c4 fdca234721
commit e094871bc9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Report/ReportHelper.php
View File

@@ -385,7 +385,7 @@ class ReportHelper implements ReportHelperInterface
foreach ($accounts as $account) { foreach ($accounts as $account) {
$entry = $spentData->filter( $entry = $spentData->filter(
function (TransactionJournal $model) use ($budget, $account) { function (TransactionJournal $model) use ($account) {
return $model->account_id == $account->id && is_null($model->budget_id); return $model->account_id == $account->id && is_null($model->budget_id);
} }
); );

2
config/firefly.php
View File

@@ -2,7 +2,7 @@
return [ return [
'chart' => 'chartjs', 'chart' => 'chartjs',
'version' => '3.6.0', 'version' => '3.6.1',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true, 'csv_import_enabled' => true,