diff --git a/facturier/models.py b/facturier/models.py index 81e3815..9e3ebed 100644 --- a/facturier/models.py +++ b/facturier/models.py @@ -1,3 +1,6 @@ +from datetime import datetime +from decimal import Decimal + from django.db import models from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _, pgettext_lazy @@ -99,6 +102,14 @@ class Regie(models.Model): invoice['download_url'] = reverse('invoice-download', args=(self.slug, invoice_id, invoice_hash)) break + # convert values to proper datatypes + for amount_key in ('paid_amount', 'total_amount', 'amount'): + if invoice.get(amount_key): + invoice[amount_key] = Decimal(invoice[amount_key]) + for date_key in ('creation_date', 'expiration_date', 'paid_date', + 'tipi_paid_date'): + if invoice.get(date_key): + invoice[date_key] = datetime.strptime(invoice[date_key], '%Y-%m-%d') return invoice diff --git a/facturier/templates/facturier/tipi.html b/facturier/templates/facturier/tipi.html index fbce3cf..8db74c2 100644 --- a/facturier/templates/facturier/tipi.html +++ b/facturier/templates/facturier/tipi.html @@ -1,5 +1,5 @@ {% extends 'base-cms.html' %} -{% load i18n portail_citoyen_tags facturier_tags %} +{% load i18n facturier_tags %} {% block breadcrumbs %}
Facture émise le
- {{ invoice.creation_date|to_date|date:"j F Y" }}
+ {{ invoice.creation_date|date:"j F Y" }}
{% if invoice.prelevement_automatique %}
Prélèvement automatique
- {% if invoice.amount|to_decimal %}
- prévu le {{ invoice.expiration_date|to_date|date:"j F Y" }}
+ {% if invoice.amount %}
+ prévu le {{ invoice.expiration_date|date:"j F Y" }}
{% else %}
- effectué le {{ invoice.paid_date|to_date|date:"j F Y" }}
+ effectué le {{ invoice.paid_date|date:"j F Y" }}
{% endif %}
{% endif %}
Cette facture a été réglée - {% if invoice.paid_date %}le {{ invoice.paid_date|to_date|date:"j F Y" }} - {% elif invoice.tipi_paid_date %} le {{ invoice.tipi_paid_date|to_date|date:"j F Y" }} {% endif %} + {% if invoice.paid_date %}le {{ invoice.paid_date|date:"j F Y" }} + {% elif invoice.tipi_paid_date %} le {{ invoice.tipi_paid_date|date:"j F Y" }} {% endif %}
{% elif invoice.expired %}