Merge branch 'fix-3.2.2' into 'master'

Fix 3.2.2

See merge request coope/coopev3!5

CHANGELOG.md

@@ -1,3 +1,5 @@
+## v3.2.2
+* Fix cotisation cancer
 ## v3.2.1
 * Le module django_tex est directement inclu dans le projet (disparition du module sur pip)
 ## v3.2.0

templates/footer.html

@@ -39,6 +39,6 @@
 		<li><a href="https://www.facebook.com/coopesmetz/" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
 	</ul>
 </section>
-<p class="copyright">coope.rez v3.2.1 (release stable) &copy; 2018 Yoann Pietri.</p>
+<p class="copyright">coope.rez v3.2.2 (release stable) &copy; 2018 Yoann Pietri.</p>
 
 

users/views.py

@@ -8,6 +8,7 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.contrib.auth.decorators import login_required, permission_required
 from django.forms.models import model_to_dict
+from django.utils import timezone
 
 import simplejson as json
 from datetime import datetime, timedelta
@@ -878,7 +879,7 @@ def addCotisationHistory(request, pk):
         cotisation.coopeman = request.user
         cotisation.amount = cotisation.cotisation.amount
         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)
         else:
             cotisation.endDate = datetime.now() + timedelta(days=cotisation.cotisation.duration)