From 3ecf93c57ca46104cdc0707151d937a9b4fa3f21 Mon Sep 17 00:00:00 2001 From: Romain Beuque Date: Thu, 25 Sep 2014 17:56:01 +0200 Subject: [PATCH] =?UTF-8?q?on=20rajoute=20une=20clause=20sur=20la=20suppre?= =?UTF-8?q?ssion=20de=20machine:=20le=20fait=20que=20le=20membre=20soit=20?= =?UTF-8?q?pas=20cotis=C3=A9=20cette=20ann=C3=A9e,=20et=20qu'il=20soit=20s?= =?UTF-8?q?df?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Brie/brie/lib/aurore_helper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Brie/brie/lib/aurore_helper.py b/Brie/brie/lib/aurore_helper.py index c813023..0c2aeba 100644 --- a/Brie/brie/lib/aurore_helper.py +++ b/Brie/brie/lib/aurore_helper.py @@ -202,8 +202,10 @@ class CotisationComputes: anniversary = CotisationComputes.anniversary_from_ldap_items(cotisations_previous_year) #end if + + #si il a pas cotise cette annee et qu'il n'avait pas pris jusqua fin aout l'an dernier delta = (last_year - anniversary) - return cotisations_this_year == [] and delta.days > 7 + return cotisations_this_year == [] and (delta.days > 7 or Room.get_by_member_dn(user_session, residence_dn, member.dn) == None) #end def