Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into k-fet

kfet/autocomplete.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django.shortcuts import render
 from django.http import Http404
 from django.db.models import Q

kfet/backends.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 import hashlib
 
 from django.contrib.auth.models import User, Permission

kfet/consumers.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from channels import Group
 from channels.generic.websockets import JsonWebsocketConsumer
 

kfet/context_processors.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django.contrib.auth.context_processors import PermWrapper
 
 def auth(request):

kfet/decorators.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django_cas_ng.decorators import user_passes_test
 
 def kfet_is_team(user):

kfet/forms.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from decimal import Decimal
 from django import forms
 from django.core.exceptions import ValidationError

kfet/middleware.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from kfet.backends import KFetBackend
 
 class KFetAuthenticationMiddleware(object):

kfet/models.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django.db import models
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied, ValidationError
@@ -6,6 +12,7 @@ from django.contrib.auth.models import User
 from gestioncof.models import CofProfile
 from django.utils.six.moves import reduce
 from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
 from django.db import transaction
 from django.db.models import F
 from django.core.cache import cache
@@ -19,6 +26,7 @@ def default_promo():
     now = date.today()
     return now.month <= 8 and now.year-1 or now.year
 
+@python_2_unicode_compatible
 class Account(models.Model):
     cofprofile = models.OneToOneField(
         CofProfile, on_delete = models.PROTECT,
@@ -217,6 +225,7 @@ class AccountNegative(models.Model):
         blank = True, null = True, default = None)
     comment = models.CharField(max_length = 255, blank = True)
 
+@python_2_unicode_compatible
 class Checkout(models.Model):
     created_by = models.ForeignKey(
         Account, on_delete = models.PROTECT,
@@ -248,6 +257,7 @@ class CheckoutTransfer(models.Model):
     amount = models.DecimalField(
         max_digits = 6, decimal_places = 2)
 
+@python_2_unicode_compatible
 class CheckoutStatement(models.Model):
     by = models.ForeignKey(
         Account, on_delete = models.PROTECT,
@@ -309,12 +319,14 @@ class CheckoutStatement(models.Model):
                     balance=F('balance') - last_statement.balance_new + self.balance_new)
             super(CheckoutStatement, self).save(*args, **kwargs)
 
+@python_2_unicode_compatible
 class ArticleCategory(models.Model):
     name = models.CharField(max_length = 45)
 
     def __str__(self):
         return self.name
 
+@python_2_unicode_compatible
 class Article(models.Model):
     name     = models.CharField(max_length = 45)
     is_sold  = models.BooleanField(default = True)
@@ -387,6 +399,7 @@ class InventoryArticle(models.Model):
             self.stock_error = self.stock_new - self.stock_old
         super(InventoryArticle, self).save(*args, **kwargs)
 
+@python_2_unicode_compatible
 class Supplier(models.Model):
     articles = models.ManyToManyField(
         Article,

kfet/routing.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from channels.routing import route, route_class
 from kfet import consumers
 

kfet/templatetags/kfet_tags.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django import template
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
@@ -31,4 +37,5 @@ def highlight_clipper(clipper, q):
 @register.filter()
 def ukf(balance, is_cof):
     grant = is_cof and (1 + Settings.SUBVENTION_COF() / 100) or 1
-    return round(balance * 10 * grant)
+    # float nécessaire car sinon problème avec le round de future.builtins
+    return round(float(balance * 10 * grant))

kfet/tests.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django.test import TestCase
 
 # Create your tests here.

kfet/urls.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django.conf.urls import url
 from django.contrib.auth.decorators import permission_required
 from kfet import views

kfet/views.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (absolute_import, division,
+                        print_function, unicode_literals)
+from builtins import *
+
 from django.shortcuts import render, get_object_or_404, redirect
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.cache import cache

requirements.txt

@@ -16,3 +16,5 @@ asgiref==0.14.0
 daphne==0.14.3
 asgi-redis==0.14.0
 -e git+https://github.com/Aureplop/channels.git#egg=channel
+statistics==1.0.3.5
+future==0.15.2