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

Update des attributs dans l'adhérent quand update des factures, et changement de sémantique.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-03-11 22:28:54 +01:00
parent 86a054cbad
commit 182ac4ad32
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gestion/gest_crans.py
View file

@ -2713,8 +2713,12 @@ def menu_principal():
if del_facture(facture): continue if del_facture(facture): continue
del(facture) del(facture)
facture = None facture = None
proprio.update_adhesion() proprio.update_adhesion()
proprio.update_connexion() proprio.update_connexion()
proprio.save()
del(proprio)
proprio = None
elif choix == 'aKM': elif choix == 'aKM':
# Ajout machine au crans # Ajout machine au crans
@ -2823,6 +2827,13 @@ def menu_principal():
if modif_facture(facture): if modif_facture(facture):
# Annulation des modifs # Annulation des modifs
facture.restore() facture.restore()
else:
proprio = facture.proprietaire()
proprio.update_adhesion()
proprio.update_connexion()
proprio.save()
del(proprio)
proprio = None
elif choix == 'mCc': elif choix == 'mCc':
# Modif club courant # Modif club courant

20
gestion/ldap_crans.py
View file

@ -1481,7 +1481,7 @@ class BaseProprietaire(BaseClasseCrans):
finAdh = max([0.0] + [fgtf(facture) for facture finAdh = max([0.0] + [fgtf(facture) for facture
in adh_factures in adh_factures
if facture.controle() != "FALSE" if facture.controle() != "FALSE"
and facture.recuPaiement() is not None and facture.recuPaiement() is not None
]) ])
if update == False: if update == False:
@ -1732,12 +1732,24 @@ class BaseProprietaire(BaseClasseCrans):
return [] return []
def factures_adh(self): def factures_adh(self):
""" Retourne les factures pour adhésion """ """ Retourne les factures pour adhésion valides."""
return self.factures("(debutAdhesion=*)") factures_adh = self.factures("(debutAdhesion=*)")
return [
facture
for facture in factures_adh
if facture.controle() != "FALSE"
and facture.recuPaiement() is not None
]
def factures_conn(self): def factures_conn(self):
""" Retourne les factures pour connexion """ """ Retourne les factures pour connexion """
return self.factures("(debutConnexion=*)") factures_conn = self.factures("(debutConnexion=*)")
return [
facture
for facture in factures_conn
if facture.controle() != "FALSE"
and facture.recuPaiement() is not None
]
def solde(self, operation=None, comment=None): def solde(self, operation=None, comment=None):
""" Retourne ou modifie le solde d'un propriétaire """ Retourne ou modifie le solde d'un propriétaire