diff --git a/printing/templates.py b/printing/templates.py index 2b456fc..6e9fe44 100644 --- a/printing/templates.py +++ b/printing/templates.py @@ -129,16 +129,29 @@ def list_machines(machines, width=None): width=width) def list_factures(factures, width=None): - return tableau([ - [f['fid'][0], f['modePaiement'][0], - style("OK", "vert") if f.get('recuPaiement', []) else style("NON", "rouge"), - ' '.join(attr['code'] for attr in f.get('article',[])), - u"%s€" % sum([float(a['pu'])*int(a['nombre']) for a in f.get('article',[])]) - ] for f in factures], - titre = [u'fid', u'Mode de paiement', u'Payé', u'Articles', u"Total"], - largeur = [5, 16, 6, '*', 8], - alignement = ['d', 'g', 'c', 'g', 'd'], - width=width) + data = [] + for facture in factures: + controle = facture.get('controle', [""])[0] + if controle == "TRUE": + controle = style(u"Validée", "vert") + elif controle == "FALSE": + controle = style(u"Invalide", "rouge") + else: + controle = u"N/A" + data.append([ + facture['fid'][0], + facture['modePaiement'][0], + style("OK", "vert") if facture.get('recuPaiement', []) else style("NON", "rouge"), + controle, + ' '.join(attr['code'] for attr in facture.get('article',[])), + u"%s €" % sum([float(a['pu'])*int(a['nombre']) for a in facture.get('article',[])]) + ]) + return tableau( + data, + titre = [u'fid', u'Mode de paiement', u'Payé', u'Contrôle', u'Articles', u"Total"], + largeur = [5, 16, 6, 8, '*', 8], + alignement = ['d', 'g', 'c', 'c', 'g', 'd'], + width=width) def list_adherents(adherents, width=None): return tableau([