Overview
Comment:Reverse result when positive
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA3-256: 49e35ff0234a52680298766008974408fea8b26fa2c0705075bef4bfa467366e
User & Date: bohwaz on 2021-12-09 02:41:02
Other Links: manifest | tags
Context
2021-12-10
12:16
Generate change event from date picker check-in: 2850e9dfe9 user: bohwaz tags: trunk, stable
01:10
Merge with trunk check-in: 8672b16816 user: bohwaz tags: dev
2021-12-09
02:41
Reverse result when positive check-in: 49e35ff023 user: bohwaz tags: trunk, stable
02:38
Fix sum change between two years check-in: 5d3d4ea90f user: bohwaz tags: trunk, stable
Changes

Modified src/include/lib/Garradin/Accounting/Reports.php from [19f217be1d] to [b455a0ddd1].

550
551
552
553
554
555
556
557
558
559
560
561
562
563

		if (isset($criterias['compare_year'])) {
			$revenue_sum2 = $get_sum($revenue, 'sum2');
			$revenue_change = $revenue_sum - $revenue_sum2;
			$expense_sum2 = $get_sum($expense, 'sum2');
			$expense_change = $expense_sum - $expense_sum2;
			$result2 = $revenue_sum2 - $expense_sum2;
			$result_change = $result2 - $result;
		}

		return compact('revenue', 'expense', 'revenue_sum', 'expense_sum', 'result',
			'revenue_sum2', 'expense_sum2', 'result2', 'revenue_change', 'expense_change', 'result_change');
	}
}







|






550
551
552
553
554
555
556
557
558
559
560
561
562
563

		if (isset($criterias['compare_year'])) {
			$revenue_sum2 = $get_sum($revenue, 'sum2');
			$revenue_change = $revenue_sum - $revenue_sum2;
			$expense_sum2 = $get_sum($expense, 'sum2');
			$expense_change = $expense_sum - $expense_sum2;
			$result2 = $revenue_sum2 - $expense_sum2;
			$result_change = $result < 0 ? $result2 - $result : $result - $result2;
		}

		return compact('revenue', 'expense', 'revenue_sum', 'expense_sum', 'result',
			'revenue_sum2', 'expense_sum2', 'result2', 'revenue_change', 'expense_change', 'result_change');
	}
}