diff --git a/collabs/admin.py b/collabs/admin.py
index b2a07bb..c713184 100644
--- a/collabs/admin.py
+++ b/collabs/admin.py
@@ -3,6 +3,7 @@ from rangefilter.filters import DateRangeFilter
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.shortcuts import render
+from django.contrib.auth.models import Permission
 
 from collabs.models import *
 
@@ -57,11 +58,6 @@ class Collabs_hour_Admin(admin.ModelAdmin):
         if not "dtDate__range__gte" in request.GET.keys():
             start, end = self.get_rangefilter_dtDate_default(request)
             queryset = queryset.filter(dtDate__range=[start,end])
-            print("PASS if QUERY")
-
-        print(request.GET.keys())
-
-
 
         return queryset
 
@@ -73,12 +69,23 @@ class Collabs_hour_Admin(admin.ModelAdmin):
         if request.user.is_superuser:
             #kwargs['form'] = Collabs_hour_Form_admin  # ModelForm
             print("PASS SUPERUSER")
+        if ( obj.userName == request.user.username or obj.user == request.user) and not obj.bNoticed:
+            permission = Permission.objects.get(codename='change_collabs_hour')
+            request.user.user_permissions.add(permission)
+            request.user = User.objects.get(pk=request.user.id)
+            print("CAN EDIT")
+        else:
+            permission = Permission.objects.get(codename='change_collabs_hour')
+            request.user.user_permissions.remove(permission)
+            request.user.user_permissions.clear()
+            request.user = User.objects.get(pk=request.user.id)
+            print("RESET CAN EDIT")
 
         return super().get_form(request, obj, **kwargs)
 
     def get_list_display(self, request):
         default_list_display = super(Collabs_hour_Admin, self).get_list_display(request)
-        if is_member(request.user,"Administration"):
+        if request.user.has_perm('collabs.can_notice'):
             #default_list_display = ('dtDate', 'nHour', 'nMinutes', 'user', 'sBases', 'type', 'get_total_hour_by_user', 'has_remarques', 'bNoticed')
             pass
         else:
@@ -91,7 +98,7 @@ class Collabs_hour_Admin(admin.ModelAdmin):
         django ModelAdmin doesn't provide it.
         """
         dynamically_editable_fields = None
-        if is_member(request.user, "Administration"):
+        if request.user.has_perm('collabs.can_notice'):
             dynamically_editable_fields = ('bNoticed',)
         return dynamically_editable_fields