Overview
SHA1:774d4cee5efbf13d526b7f42ee1671410bb3344b
Date: 2018-07-27 12:41:38
User: bohwaz
Comment:Corrige cotisations par durée affichées pas à jour, patch suggéré par @daniel
Timelines: family | ancestors | descendants | both | trunk | stable
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2018-07-29
13:20
[0a5c42b0fb] Toujours créer les répertoires de manière récusive, au cas où (user: bohwaz, tags: trunk, stable)
2018-07-27
12:41
[774d4cee5e] Corrige cotisations par durée affichées pas à jour, patch suggéré par @daniel (user: bohwaz, tags: trunk, stable)
2018-07-24
22:37
[0c01217ecf] Envoi d'email perso en utilisant l'adresse expéditrice forcée ou de l'asso, fix [e7539ae31f] (user: bohwaz, tags: trunk, stable)
Changes

Modified src/include/lib/Garradin/Membres/Cotisations.php from [7d3964d0a7] to [05dee5b004].

275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
		}

		$desc = $desc ? 'DESC' : 'ASC';

		return $db->get('SELECT cm.id_membre, cm.date, cm.id, m.numero,
			m.'.$champ_id.' AS nom, c.montant,
			CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') >= date()
			WHEN c.fin IS NOT NULL THEN c.fin <= date() ELSE 1 END AS a_jour
			FROM cotisations_membres AS cm
				INNER JOIN cotisations AS c ON c.id = cm.id_cotisation
				INNER JOIN membres AS m ON m.id = cm.id_membre
			WHERE
				cm.id_cotisation = ?
				AND m.id_categorie NOT IN (SELECT mc.id FROM membres_categories AS mc WHERE mc.cacher = 1)
			GROUP BY cm.id_membre ORDER BY '.$order.' '.$desc.' LIMIT ?,?;',







|







275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
		}

		$desc = $desc ? 'DESC' : 'ASC';

		return $db->get('SELECT cm.id_membre, cm.date, cm.id, m.numero,
			m.'.$champ_id.' AS nom, c.montant,
			CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') >= date()
			WHEN c.fin IS NOT NULL THEN (date() <= c.fin AND date() >= c.debut) ELSE 1 END AS a_jour
			FROM cotisations_membres AS cm
				INNER JOIN cotisations AS c ON c.id = cm.id_cotisation
				INNER JOIN membres AS m ON m.id = cm.id_membre
			WHERE
				cm.id_cotisation = ?
				AND m.id_categorie NOT IN (SELECT mc.id FROM membres_categories AS mc WHERE mc.cacher = 1)
			GROUP BY cm.id_membre ORDER BY '.$order.' '.$desc.' LIMIT ?,?;',