rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 08:23:46 +00:00
Code Issues Releases Wiki Activity

On met des datetime timezone aware

Browse source
This commit is contained in:
Gabriel Detraz 2016-07-02 21:32:00 +02:00
parent 892dc7ee3e
commit cfd0b706fa
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cotisations/views.py
View file

@ -12,7 +12,7 @@ from cotisations.models import NewFactureForm, EditFactureForm, Facture, Article
from users.models import User from users.models import User
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
import datetime from django.utils import timezone
def form(ctx, template, request): def form(ctx, template, request):
c = ctx c = ctx
@ -27,9 +27,10 @@ def end_adhesion(user):
def create_cotis(facture, user, article): def create_cotis(facture, user, article):
""" Update et crée l'objet cotisation associé à une facture, prend en argument l'user, la facture pour la quantitéi, et l'article pour la durée""" """ Update et crée l'objet cotisation associé à une facture, prend en argument l'user, la facture pour la quantitéi, et l'article pour la durée"""
cotisation=Cotisation(facture=facture) cotisation=Cotisation(facture=facture)
date_max = end_adhesion(user) or datetime.datetime.now() date_max = end_adhesion(user) or timezone.now()
if date_max: if date_max < timezone.now():
cotisation.date_start=date_max datemax = timezone.now()
cotisation.date_start=date_max
cotisation.date_end = cotisation.date_start + relativedelta(months=article[0].duration*facture.number) cotisation.date_end = cotisation.date_start + relativedelta(months=article[0].duration*facture.number)
cotisation.save() cotisation.save()
return return