From 44e0786840f467c4e00d3adecaa291b64c1d19dc Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Wed, 24 Sep 2014 17:22:02 +0200 Subject: [PATCH] make date fields timezone aware and ignore them if empty --- synchro_orleans/data/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/synchro_orleans/data/models.py b/synchro_orleans/data/models.py index 2056c85..560cec6 100644 --- a/synchro_orleans/data/models.py +++ b/synchro_orleans/data/models.py @@ -5,6 +5,7 @@ from datetime import datetime from django.db import models, transaction from django.conf import settings +from django.utils.timezone import make_aware, get_current_timezone SEXES = ( ('G', 'Homme'), @@ -182,7 +183,11 @@ class FactureManager(models.Manager): for date_type in ('date_generation', 'date_limite_paie', 'debut_pge', 'fin_pge', 'date_reglement', 'date_passage_perception'): - params[date_type] = datetime.strptime(params[date_type], INPUT_DATE_FORMAT) + try: + params[date_type] = datetime.strptime(params[date_type], INPUT_DATE_FORMAT) + params[date_type] = make_aware(params[date_type], get_current_timezone()) + except ValueError: + params.pop(date_type) params['active'] = path.exists(settings.INVOICES_LOCATION_PATTERN.format(invoice_id = params['id'])) family = Famille.objects.get(pk = params.pop('famille')) params['famille'] = family