Overview
Comment: | Ne pas inclure les reports dans le rapprochement, signalé par @Alain |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA1: |
c86a781f5e65e9ed670505ecab5ee14f |
User & Date: | bohwaz on 2018-02-21 04:56:51 |
Other Links: | manifest | tags |
References
2020-12-08
| ||
23:25 | • Wiki page "Changelog/0.9" artifact: b9c916b4d1 user: bohwaz | |
Context
2018-02-21
| ||
07:48 | Corrige installation des champs check-in: 14f1be0c39 user: bohwaz tags: trunk, stable | |
04:56 | Ne pas inclure les reports dans le rapprochement, signalé par @Alain check-in: c86a781f5e user: bohwaz tags: trunk, stable | |
04:51 | Ne pas permettre de supprimer le champ email ! check-in: b619ea4702 user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/lib/Garradin/Compta/Rapprochement.php from [13245b3cd0] to [4eec0ce21a].
︙ | ︙ | |||
27 28 29 30 31 32 33 34 35 36 37 38 39 40 | SELECT j.*, strftime(\'%s\', j.date) AS date, (CASE WHEN j.compte_debit = :compte THEN j.montant ELSE -(j.montant) END) AS solde, r.date AS date_rapprochement FROM compta_journal AS j LEFT JOIN compta_rapprochement AS r ON r.id_operation = j.id WHERE (compte_debit = :compte OR compte_credit = :compte) AND j.date >= :debut AND j.date <= :fin ' . ($sauf_deja_rapprochees ? 'AND r.id_operation IS NULL' : '') . ' ORDER BY date ASC;'; $result = $db->get($query, [ 'compte' => $compte, 'debut' => $debut, 'fin' => $fin, | > | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | SELECT j.*, strftime(\'%s\', j.date) AS date, (CASE WHEN j.compte_debit = :compte THEN j.montant ELSE -(j.montant) END) AS solde, r.date AS date_rapprochement FROM compta_journal AS j LEFT JOIN compta_rapprochement AS r ON r.id_operation = j.id WHERE (compte_debit = :compte OR compte_credit = :compte) AND j.date >= :debut AND j.date <= :fin AND compte_debit IS NOT NULL AND compte_credit IS NOT NULL ' . ($sauf_deja_rapprochees ? 'AND r.id_operation IS NULL' : '') . ' ORDER BY date ASC;'; $result = $db->get($query, [ 'compte' => $compte, 'debut' => $debut, 'fin' => $fin, |
︙ | ︙ |