Quand une facture est controlée, on affichel'erreur au lieu de planter gest_crans, en attendant une solution définitive

This commit is contained in:
Gabriel Detraz 2015-06-29 00:22:13 +02:00
parent dc37719f0d
commit 2bcce4911f
2 changed files with 7 additions and 2 deletions

View file

@ -2267,7 +2267,12 @@ def modif_adher(adher):
if no: return modif_adher(adher) if no: return modif_adher(adher)
for m in adher.machines(): for m in adher.machines():
m.delete("Depart du campus") m.delete("Depart du campus")
adher.delete("Depart du campus") try:
adher.delete("Depart du campus")
except EnvironmentError, c:
arg = u'--title "Destruction du compte" '
arg += u'--msgbox "%s\n\n\n" 0 0' % to_unicode(c.args[0])
dialog(arg)
return return
else: else:

View file

@ -4256,7 +4256,7 @@ class Facture(BaseClasseCrans):
def delete(self, comment=''): def delete(self, comment=''):
"""Suppression de la facture""" """Suppression de la facture"""
if self.controle(): if self.controle():
raise EnvironmentError(u"La facture a déjà été controlée") raise EnvironmentError(u"La facture a déjà été controlée, contacter trésorerie")
self.__proprietaire = None self.__proprietaire = None
self._delete(self.dn, comment) self._delete(self.dn, comment)