diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index c2eb0c01..870aa374 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -772,7 +772,7 @@ class CransLdap: # Doit-on bloquer en cas de manque de la carte d'etudiant ? # (si période transitoire on ne bloque dans aucun cas) if config.bl_carte_et_definitif: - el = "(&(|(carteEtudiant=%d)(objectClass=club)(carteEtudiant=TRUE))%s)" % (config.ann_scol, el) + el = "(&(|(objectClass=club)(carteEtudiant=*))%s)" % (el,) elif champ[1:] == 'blacklist': el = '(blacklist=%s)' % expr else: @@ -2402,7 +2402,7 @@ class Adherent(BaseProprietaire): debutConn = [] finConn = [] - for facture in self.factures_adh(): + for facture in self.factures_conn(): debutConn.append(facture._data['debutConnexion'][0]) finConn.append(facture._data['finConnexion'][0]) self._set('debutConnexion', debutConn)