From a29ad3a7edf7fba47efe6551e2e2de57771dc421 Mon Sep 17 00:00:00 2001
From: Serghei MIHAI <smihai@entrouvert.com>
Date: Fri, 17 Oct 2014 19:08:49 +0200
Subject: [PATCH] autobilled invoices info page updated

Closes #5416
---
 facturier/templates/facturier/tipi.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/facturier/templates/facturier/tipi.html b/facturier/templates/facturier/tipi.html
index ee0f4d3..2dd8866 100644
--- a/facturier/templates/facturier/tipi.html
+++ b/facturier/templates/facturier/tipi.html
@@ -54,15 +54,12 @@
       {{ invoice.creation_date|to_date|date:"j F Y" }}
       {% if invoice.prelevement_automatique %}
       <br />
-      {% with expiration_date=invoice.expiration_date|to_date %}
       Prélèvement automatique
-      {% if expiration_date < now %}
-                              effectué
+      {% if invoice.amount|to_decimal %}
+                              prévu le {{ invoice.expiration_date|to_date|date:"j F Y" }}
                               {% else %}
-                              prévu
+                              effectué le {{ invoice.paid_date|to_date|date:"j F Y" }}
                               {% endif %}
-                              le {{ expiration_date|date:"j F Y" }}
-                              {% endwith %}
                               {% endif %}
                               </p>