crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

« BONJOUR, J'AI CLIQUÉ SUR CONNEXION ET ÇA NE M'A PAS RÉADHÉRÉ »

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-08-29 21:36:18 +02:00
parent 037ecab023
commit 5a7e367e9c
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gestion/gest_crans.py
View file

@ -1524,12 +1524,16 @@ def set_connexion(proprio):
# Si l'adhérent ne l'est plus, on commence par le faire adhérer, sauf s'il a une facture adhésion. # Si l'adhérent ne l'est plus, on commence par le faire adhérer, sauf s'il a une facture adhésion.
adhEnd = proprio.adhesion() adhEnd = proprio.adhesion()
if in_facture is not None: if in_facture is not None:
adhEnd = max(adhEnd, fromGeneralizedTimeFormat(in_facture._data.get('finAdhesion', ["19700101000000Z"])[0])) adhEnd = max(adhEnd, fromGeneralizedTimeFormat(in_facture._data.get('finAdhesion', ["19700101000000Z"])[0]))
if adhEnd < time():
if adhEnd - cotisation.delai_readh < time():
stat = set_adhesion(proprio) stat = set_adhesion(proprio)
if stat == 1:
if stat == 1 and adhEnd < time():
return 1 return 1
if in_facture is not None: if in_facture is not None:
adhEnd = max(adhEnd, fromGeneralizedTimeFormat(in_facture._data.get('finAdhesion', ["19700101000000Z"])[0])) adhEnd = max(adhEnd, fromGeneralizedTimeFormat(in_facture._data.get('finAdhesion', ["19700101000000Z"])[0]))
@ -1554,6 +1558,7 @@ def set_connexion(proprio):
annul, res = dialog(args) annul, res = dialog(args)
if annul: if annul:
if in_facture is not None:
in_facture.supprime(pop=True) in_facture.supprime(pop=True)
return 1 return 1
res = res[0] res = res[0]