Overview
SHA1:71a53b99c21fd52a5a4ccb390198968a42197f4c
Date: 2018-10-27 23:23:10
User: bohwaz
Comment:Problème de merge corrigé
Timelines: family | ancestors | descendants | both | trunk | stable | 0.9.0
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2018-10-28
18:22
[754297e064] Ne pas permettre d'importer la date d'inscription (user: bohwaz, tags: trunk, stable)
2018-10-27
23:23
[71a53b99c2] Problème de merge corrigé (user: bohwaz, tags: trunk, stable, 0.9.0)
23:12
[c70c29a6de] Mise à jour dépendances (user: bohwaz, tags: trunk)
Changes

Modified src/include/lib/Garradin/Membres/Cotisations.php from [ec784bf9dc] to [07c3d844f4].

259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
		$champ_id = Config::getInstance()->get('champ_identite');

		if (empty($order))
			$order = 'date';

		switch ($order)
		{
				$order = 'cm.date';
				break;
			case 'a_jour':
				break;
			case 'date':
				$order = 'cm.date';
				break;
			case 'identite':
				$order = 'transliterate_to_ascii(m.'.$champ_id.') COLLATE NOCASE';







<
<







259
260
261
262
263
264
265


266
267
268
269
270
271
272
		$champ_id = Config::getInstance()->get('champ_identite');

		if (empty($order))
			$order = 'date';

		switch ($order)
		{


			case 'a_jour':
				break;
			case 'date':
				$order = 'cm.date';
				break;
			case 'identite':
				$order = 'transliterate_to_ascii(m.'.$champ_id.') COLLATE NOCASE';