diff --git a/gestion/whos.py b/gestion/whos.py index 4ed8c6f3..fddaafa3 100755 --- a/gestion/whos.py +++ b/gestion/whos.py @@ -85,13 +85,13 @@ def indicatif (num): return (num[2], num[3:]) # indicatifs nationaux à 2 chiffres ids = [20, 27, 36, 86, 98] - ids.extend(range(30,35)) - ids.extend(range(39,42)) - ids.extend(range(43,50)) - ids.extend(range(51,59)) - ids.extend(range(60,67)) - ids.extend(range(81,85)) - ids.extend(range(90,96)) + ids.extend(range(30, 35)) + ids.extend(range(39, 42)) + ids.extend(range(43, 50)) + ids.extend(range(51, 59)) + ids.extend(range(60, 67)) + ids.extend(range(81, 85)) + ids.extend(range(90, 96)) if int(num[2:4]) in ids: return (num[2:4], num[4:]) return (num[2:5], num[5:]) @@ -294,7 +294,7 @@ def factures_brief(factures) : facture.id(), p, facture.modePaiement(), - coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S%z"), "vert") if facture.recuPaiement() else coul("NON", "rouge"), + coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S"), "vert") if facture.recuPaiement() else coul("NON", "rouge"), controle, ', '.join(article['code'] for article in facture.articles()), unicode(facture.total()) + u" €", @@ -421,7 +421,7 @@ def list_factures(factures) : data.append([ f.id(), f.modePaiement(), - coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S%z"), "vert") if f.recuPaiement() else coul("NON", "rouge"), + coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S"), "vert") if f.recuPaiement() else coul("NON", "rouge"), controle, ', '.join(a['code'] for a in f.articles()), u"%s€" % sum([float(a['pu'])*int(a['nombre']) for a in f.articles()]) @@ -706,7 +706,7 @@ def facture_details(facture) : f += facture.modePaiement() f += u" " f += coul(u"Paiement reçu : ", "gras") - f += coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S%z"), "vert") if facture.recuPaiement() else coul(u"Non", "rouge") + f += coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S"), "vert") if facture.recuPaiement() else coul(u"Non", "rouge") f += u"\n" f += coul(u"Contrôle : ", "gras") f += controle