Overview
Comment:Order accounts by code in projects
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA3-256: c7f099ceef3901b4a0b235e0d25d17b36a44ef273bf274d75b63f50e4f2f95c3
User & Date: bohwaz on 2021-03-25 23:44:02
Other Links: branch diff | manifest | tags
Context
2021-03-26
00:39
Fix use line id, not transaction id, in deposit form check-in: a741675694 user: bohwaz tags: dev
2021-03-25
23:44
Order accounts by code in projects check-in: c7f099ceef user: bohwaz tags: dev
21:39
New alpha release, change logic of storage backends to have real time sync check-in: bcaf2da5a3 user: bohwaz tags: dev, 1.1.0-alpha9
Changes

Modified src/include/lib/Garradin/Accounting/Reports.php from [b07c8619b9] to [5ea34ddcf7].

84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
			INNER JOIN acc_accounts a ON a.id = l.id_analytical
			INNER JOIN acc_years y ON y.id = t.id_year
			GROUP BY %s
			ORDER BY %s;';

		if ($by_year) {
			$group = 'y.id, a.id';
			$order = 'y.start_date DESC, a.label COLLATE NOCASE';
		}
		else {
			$group = 'a.id, y.id';
			$order = 'a.label COLLATE NOCASE, y.id';
		}

		$sql = sprintf($sql, Account::EXPENSE, Account::REVENUE, $group, $order);

		$current = null;

		static $sums = ['credit', 'debit', 'sum'];







|



|







84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
			INNER JOIN acc_accounts a ON a.id = l.id_analytical
			INNER JOIN acc_years y ON y.id = t.id_year
			GROUP BY %s
			ORDER BY %s;';

		if ($by_year) {
			$group = 'y.id, a.id';
			$order = 'y.start_date DESC, a.code COLLATE NOCASE';
		}
		else {
			$group = 'a.id, y.id';
			$order = 'a.code COLLATE NOCASE, y.id';
		}

		$sql = sprintf($sql, Account::EXPENSE, Account::REVENUE, $group, $order);

		$current = null;

		static $sums = ['credit', 'debit', 'sum'];