diff --git a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php index 3ed3d4204b..6869c4c18d 100644 --- a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php +++ b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php @@ -43,7 +43,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator foreach ($entries as $entry) { $data['labels'][] = $entry[0]->formatLocalized($format); $data['datasets'][0]['data'][] = round($entry[1], 2); - $data['datasets'][1]['data'][] = round(($entry[2] * -1), 2); + $data['datasets'][1]['data'][] = round($entry[2], 2); } return $data; diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 9f8669b1d1..0331981df8 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -63,8 +63,8 @@ class ReportController extends Controller $month = clone $start; $month->endOfMonth(); // total income and total expenses: - $incomeSum = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount'); - $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount'); + $incomeSum = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount_positive'); + $expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount_positive'); $entries->push([clone $start, $incomeSum, $expenseSum]); $start->addMonth();