mirror of
https://github.com/nanoy42/coope
synced 2024-12-24 16:03:47 +00:00
Merge branch 'fix-3.2.2' into 'dev'
Fix 3.2.2 See merge request coope/coopev3!6
This commit is contained in:
commit
5ab2e034bb
2 changed files with 4 additions and 1 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
## v3.2.2
|
||||||
|
* Fix cotisation cancer
|
||||||
## v3.2.1
|
## v3.2.1
|
||||||
* Le module django_tex est directement inclu dans le projet (disparition du module sur pip)
|
* Le module django_tex est directement inclu dans le projet (disparition du module sur pip)
|
||||||
## v3.2.0
|
## v3.2.0
|
||||||
|
|
|
@ -8,6 +8,7 @@ from django.http import HttpResponse, HttpResponseRedirect
|
||||||
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
|
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
|
||||||
from django.contrib.auth.decorators import login_required, permission_required
|
from django.contrib.auth.decorators import login_required, permission_required
|
||||||
from django.forms.models import model_to_dict
|
from django.forms.models import model_to_dict
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
import simplejson as json
|
import simplejson as json
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
@ -878,7 +879,7 @@ def addCotisationHistory(request, pk):
|
||||||
cotisation.coopeman = request.user
|
cotisation.coopeman = request.user
|
||||||
cotisation.amount = cotisation.cotisation.amount
|
cotisation.amount = cotisation.cotisation.amount
|
||||||
cotisation.duration = cotisation.cotisation.duration
|
cotisation.duration = cotisation.cotisation.duration
|
||||||
if(user.profile.cotisationEnd):
|
if(user.profile.cotisationEnd and user.profile.cotisationEnd > timezone.now()):
|
||||||
cotisation.endDate = user.profile.cotisationEnd + timedelta(days=cotisation.cotisation.duration)
|
cotisation.endDate = user.profile.cotisationEnd + timedelta(days=cotisation.cotisation.duration)
|
||||||
else:
|
else:
|
||||||
cotisation.endDate = datetime.now() + timedelta(days=cotisation.cotisation.duration)
|
cotisation.endDate = datetime.now() + timedelta(days=cotisation.cotisation.duration)
|
||||||
|
|
Loading…
Reference in a new issue