From c894eecc15c6027b6de332f3f972b80a2a045bac Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Thu, 5 Dec 2013 14:29:44 +0100 Subject: [PATCH] =?UTF-8?q?[printing/templates]=C2=A0Mises=20en=20page=20d?= =?UTF-8?q?iverses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- printing/templates/facture | 3 ++- printing/templates/object | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/printing/templates/facture b/printing/templates/facture index 9223486..37d21b7 100644 --- a/printing/templates/facture +++ b/printing/templates/facture @@ -2,7 +2,8 @@ {% if o.article %} {{"Article : "|coul('gras')}} Prix N° Total Commentaire {% set total = [] %}{% for a in o.article %} - {% do total.append( a.pu|float * a.nombre|int) %}{{"%05.2f" % a.pu|float}}€ x{{"%02d" % a.nombre|int}} {{"%05.2f" % a.pu|float * a.nombre|int}}€ {{a.designation}} + {% do total.append( a.pu|float * a.nombre|int) %} + {{"%05.2f" % a.pu|float}}€ x{{"%02d" % a.nombre|int}} {{"%05.2f" % a.pu|float * a.nombre|int}}€ {{a.designation}} {% endfor %} {{"total : "|coul('gras')}}{{"%05.2f" % total|sum}}€ {% endif %} diff --git a/printing/templates/object b/printing/templates/object index 24128c6..c0ca2fa 100644 --- a/printing/templates/object +++ b/printing/templates/object @@ -1,5 +1,6 @@ {% if o.info %} -{{"Remarque : "|coul('gras')}}{{o.info|reverse|join('\n ')}} +{{"Remarque : "|coul('gras')}} + {{o.info|join('\n ')}} {% endif %} {% if o.historique %} {{"Historique : "|coul('gras')}}{{o.historique[-limit:]|reverse|join('\n ')}}