Overview
Comment: | Fix sum when filtering date in account journal |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
5b8d8717f0c30ac49996e009b6fdb349 |
User & Date: | bohwaz on 2021-12-22 17:24:55 |
Other Links: | manifest | tags |
Context
2021-12-22
| ||
17:31 | Fix: we need to reverse the account balance in simple journal mode check-in: 9083102028 user: bohwaz tags: trunk, stable | |
17:24 | Fix sum when filtering date in account journal check-in: 5b8d8717f0 user: bohwaz tags: trunk, stable | |
17:21 | Add date filter to accounts journals check-in: 1086cf3d34 user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/lib/Garradin/Entities/Accounting/Account.php from [0a1cc7ac0b] to [d1f798f3f5].
︙ | ︙ | |||
193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 | $db = DB::getInstance(); $columns = self::LIST_COLUMNS; $tables = 'acc_transactions_lines l INNER JOIN acc_transactions t ON t.id = l.id_transaction LEFT JOIN acc_accounts b ON b.id = l.id_analytical'; $conditions = sprintf('l.id_account = %d AND t.id_year = %d', $this->id(), $year_id); if ($start) { $conditions .= sprintf(' AND t.date >= %s', $db->quote($start->format('Y-m-d'))); } if ($end) { $conditions .= sprintf(' AND t.date <= %s', $db->quote($end->format('Y-m-d'))); } | > > > < | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 | $db = DB::getInstance(); $columns = self::LIST_COLUMNS; $tables = 'acc_transactions_lines l INNER JOIN acc_transactions t ON t.id = l.id_transaction LEFT JOIN acc_accounts b ON b.id = l.id_analytical'; $conditions = sprintf('l.id_account = %d AND t.id_year = %d', $this->id(), $year_id); $sum = 0; if ($start) { $conditions .= sprintf(' AND t.date >= %s', $db->quote($start->format('Y-m-d'))); $sum = $this->getSumAtDate($year_id, $start); } if ($end) { $conditions .= sprintf(' AND t.date <= %s', $db->quote($end->format('Y-m-d'))); } $reverse = $simple && self::isReversed($this->type) ? -1 : 1; if ($simple) { unset($columns['debit']['label'], $columns['credit']['label'], $columns['line_label']); $columns['line_reference']['label'] = 'Réf. paiement'; $columns['change']['select'] = sprintf($columns['change']['select'], $reverse); } |
︙ | ︙ |