Overview
SHA1:c86a781f5e65e9ed670505ecab5ee14faad3b949
Date: 2018-02-21 04:56:51
User: bohwaz
Comment:Ne pas inclure les reports dans le rapprochement, signalé par @Alain
Timelines: family | ancestors | descendants | both | trunk | stable
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2018-02-21
07:48
[14f1be0c39] Corrige installation des champs (user: bohwaz, tags: trunk, stable)
04:56
[c86a781f5e] Ne pas inclure les reports dans le rapprochement, signalé par @Alain (user: bohwaz, tags: trunk, stable)
04:51
[b619ea4702] Ne pas permettre de supprimer le champ email ! (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,