From 66a1eb2fb59a739e9f302f59a62d24347c35e75c Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Fri, 2 Dec 2011 20:34:18 +0100
Subject: [PATCH] =?UTF-8?q?[lc=5Fldap]=20On=20mets=20paiement=5Fok=20?=
 =?UTF-8?q?=C3=A0=20False=20si=20config.bl=5Fcarte=5Fet=5Fdefinitif=20est?=
 =?UTF-8?q?=20actif?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lc_ldap.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lc_ldap.py b/lc_ldap.py
index 5037c88..5d45f47 100644
--- a/lc_ldap.py
+++ b/lc_ldap.py
@@ -453,13 +453,23 @@ class proprio(CransLdapObject):
         """Renvoie si le propriétaire à payé pour l'année en cours"""
         if self.dn == base_dn:
             return True
+        bool_paiement = False
         try:
             for paiement in self['paiement']:
                 if paiement.value == config.ann_scol:
-                    return True
+                    bool_paiement = True
         except KeyError:
             pass
-        return False
+        if config.bl_carte_et_definitif:
+            bool_carte = False
+            try:
+                for carte in self['carteEtudiant']:
+                    if carte.value == config.ann_scol:
+                        bool_carte = True
+            except KeyError:
+                pass
+            return bool_carte and bool_paiement
+        return bool_paiement