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

Correction de bugs

Browse source
This commit is contained in:
Gabriel Detraz 2015-09-25 00:02:16 +02:00
parent bd4403d8ee
commit 31f21003e7
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gestion/gest_crans.py
View file

@ -139,15 +139,17 @@ def set_bases(adher):
err += "La date est invalide" err += "La date est invalide"
else: else:
naissance = naissance.groupdict() naissance = naissance.groupdict()
naissance_date = date(int(naissance['annee']),int(naissance['mois']),int(naissance['jour'])) try:
age = rdelta.relativedelta(Now, naissance_date).years naissance_date = date(int(naissance['annee']),int(naissance['mois']),int(naissance['jour']))
if age < 18: age = rdelta.relativedelta(Now, naissance_date).years
arg = u'--title "Inscription adhérent" ' if age < 18:
arg += u'--yesno "Cet adhérent est mineur, merci de demander un accord écrit des parents' arg = u'--title "Inscription adhérent" '
arg += u'\nContinuer ?" 0 0' arg += u'--yesno "Cet adhérent est mineur, merci de demander un accord écrit des parents'
no, res = dialog(arg) arg += u'\nContinuer ?" 0 0'
if no: no, res = dialog(arg)
return 1 if no:
return 1
except ValueError, c: err += c.args[0] + '\n'
err += _set_chbre(adher, result[3]) err += _set_chbre(adher, result[3])

2
gestion/ldap_crans.py
View file

@ -4141,7 +4141,7 @@ class Facture(BaseClasseCrans):
if round(art['pu'], 2) != art['pu']: if round(art['pu'], 2) != art['pu']:
raise ValueError, u'pu ne doit pas avoir plus de 2 chiffres apres la virgule' raise ValueError, u'pu ne doit pas avoir plus de 2 chiffres apres la virgule'
art['nombre'] = int(art['nombre']) art['nombre'] = int(art['nombre'])
if '~~' in unicode(art['designation']): if '~~' in art['designation']:
raise ValueError, u'Ne pas mettre de ~~ dans les champs' raise ValueError, u'Ne pas mettre de ~~ dans les champs'
arts.append(art) arts.append(art)