Update des attributs dans l'adhérent quand update des factures, et changement de sémantique.
This commit is contained in:
parent
86a054cbad
commit
182ac4ad32
2 changed files with 27 additions and 4 deletions
|
@ -2713,8 +2713,12 @@ def menu_principal():
|
|||
if del_facture(facture): continue
|
||||
del(facture)
|
||||
facture = None
|
||||
|
||||
proprio.update_adhesion()
|
||||
proprio.update_connexion()
|
||||
proprio.save()
|
||||
del(proprio)
|
||||
proprio = None
|
||||
|
||||
elif choix == 'aKM':
|
||||
# Ajout machine au crans
|
||||
|
@ -2823,6 +2827,13 @@ def menu_principal():
|
|||
if modif_facture(facture):
|
||||
# Annulation des modifs
|
||||
facture.restore()
|
||||
else:
|
||||
proprio = facture.proprietaire()
|
||||
proprio.update_adhesion()
|
||||
proprio.update_connexion()
|
||||
proprio.save()
|
||||
del(proprio)
|
||||
proprio = None
|
||||
|
||||
elif choix == 'mCc':
|
||||
# Modif club courant
|
||||
|
|
|
@ -1481,7 +1481,7 @@ class BaseProprietaire(BaseClasseCrans):
|
|||
finAdh = max([0.0] + [fgtf(facture) for facture
|
||||
in adh_factures
|
||||
if facture.controle() != "FALSE"
|
||||
and facture.recuPaiement() is not None
|
||||
and facture.recuPaiement() is not None
|
||||
])
|
||||
|
||||
if update == False:
|
||||
|
@ -1732,12 +1732,24 @@ class BaseProprietaire(BaseClasseCrans):
|
|||
return []
|
||||
|
||||
def factures_adh(self):
|
||||
""" Retourne les factures pour adhésion """
|
||||
return self.factures("(debutAdhesion=*)")
|
||||
""" Retourne les factures pour adhésion valides."""
|
||||
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):
|
||||
""" 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):
|
||||
""" Retourne ou modifie le solde d'un propriétaire
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue