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

recuPaiement devient un generalizedTimeFormat

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-09-26 00:35:38 +02:00
parent 6da84bbfd1
commit c5c903b114
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gestion/whos.py
View file

@ -53,6 +53,7 @@ from affich_tools import *
from ldap_crans import is_actif, crans_ldap, AssociationCrans, hostname
from ldap_crans import MachineCrans, MachineWifi, BorneWifi
from ldap_crans import Adherent
from ldap_crans import datetimeFromGTF
from hptools import sw_chbre, ConversationError
import gestion.annuaires_pg as annuaires_pg
import gestion.config as config
@ -293,7 +294,7 @@ def factures_brief(factures) :
facture.id(),
p,
facture.modePaiement(),
coul(facture.recuPaiement(), "vert") if facture.recuPaiement() else coul("NON", "rouge"),
coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S%z"), "vert") if facture.recuPaiement() else coul("NON", "rouge"),
controle,
', '.join(article['code'] for article in facture.articles()),
unicode(facture.total()) + u" €",
@ -420,7 +421,7 @@ def list_factures(factures) :
data.append([
f.id(),
f.modePaiement(),
coul(f.recuPaiement(), "vert") if f.recuPaiement() else coul("NON", "rouge"),
coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S%z"), "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()])
@ -705,7 +706,7 @@ def facture_details(facture) :
f += facture.modePaiement()
f += u" "
f += coul(u"Paiement reçu : ", "gras")
f += coul(facture.recuPaiement(), "vert") if facture.recuPaiement() else coul(u"Non", "rouge")
f += coul(datetimeFromGTF(facture.recuPaiement()).strftime("%d/%m/%Y %H:%M:%S%z"), "vert") if facture.recuPaiement() else coul(u"Non", "rouge")
f += u"\n"
f += coul(u"Contrôle : ", "gras")
f += controle