diff --git a/facturier/templates/facturier/tipi.html b/facturier/templates/facturier/tipi.html index aae1f33..da35afd 100644 --- a/facturier/templates/facturier/tipi.html +++ b/facturier/templates/facturier/tipi.html @@ -55,7 +55,15 @@ {{ invoice.creation_date|iso8601|date:"l j F Y" }} {% if invoice.prelevement_automatique %}
- Prélèvement automatique effectué le {{ invoice.expiration_date|iso8601|date:"l j F Y" }} + {% with expiration_date=invoice.expiration_date|iso8601 %} + Prélèvement automatique + {% if expiration_date < now %} + effectué + {% else %} + prévu + {% endif %} + le {{ expiration_date|date:"l j F Y" }} + {% endwith %} {% endif %}

diff --git a/facturier/views.py b/facturier/views.py index 5257b6e..0e66fcd 100644 --- a/facturier/views.py +++ b/facturier/views.py @@ -42,6 +42,7 @@ class InvoiceView(DetailView): def get_context_data(self): context = super(InvoiceView, self).get_context_data() context['invoice'] = self.invoice + context.update({'now': datetime.datetime.now()}) return context def get(self, request, *args, **kwargs):