Overview
Comment:Fix missing condition
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: 0ab77f060ea08adae58c47d6a6052ea065687c5a
User & Date: bohwaz on 2020-10-23 18:08:15
Other Links: branch diff | manifest | tags
Context
2020-10-23
18:12
Add favourite type to third party accounts check-in: 9fe17ffcd3 user: bohwaz tags: dev
18:08
Fix missing condition check-in: 0ab77f060e user: bohwaz tags: dev
2020-10-21
21:08
Fix issues with CSV import in accounting check-in: 30836e5e9c user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Accounting/Reports.php from [f05d387ae3] to [008729b5d3].

206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
		}
		else {
			$sql = sprintf('SELECT a.id, a.code, a.label, a.description, a.type,
				SUM(l.credit) - SUM(l.debit) AS sum
				FROM %s a
				INNER JOIN %s t ON t.id = l.id_transaction
				INNER JOIN %s l ON a.id = l.id_account
				WHERE t.id_year = %d
				GROUP BY l.id_account
				ORDER BY a.code COLLATE NOCASE;', Account::TABLE, Transaction::TABLE, Line::TABLE, $year_id);
		}

		$group = null;

		foreach (DB::getInstance()->iterate($sql) as $row) {







|







206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
		}
		else {
			$sql = sprintf('SELECT a.id, a.code, a.label, a.description, a.type,
				SUM(l.credit) - SUM(l.debit) AS sum
				FROM %s a
				INNER JOIN %s t ON t.id = l.id_transaction
				INNER JOIN %s l ON a.id = l.id_account
				WHERE t.id_year = %d AND a.type != 0
				GROUP BY l.id_account
				ORDER BY a.code COLLATE NOCASE;', Account::TABLE, Transaction::TABLE, Line::TABLE, $year_id);
		}

		$group = null;

		foreach (DB::getInstance()->iterate($sql) as $row) {