Merge branch 'release/1.6.5' into dev
[auf_rh_dae.git] / project / dae / forms.py
index e9fa7c5..498f308 100644 (file)
@@ -96,7 +96,7 @@ class BaseInlineFormSetWithInitial(BaseInlineFormSet):
 def _implantation_choices(obj, request):
     # TRAITEMENT NORMAL
     employe = groups.get_employe_from_user(request.user)
-    q = Q(**{'zone_administrative': employe.implantation.zone_administrative})
+    q = Q(**{'zone_administrative__in': groups.get_zones_from_user(request.user)})
 
     # TRAITEMENT DRH
     user_groupes = [g.name for g in request.user.groups.all()]
@@ -111,13 +111,13 @@ def _employe_choices(obj, request):
     # TRAITEMENT NORMAL
     employe = groups.get_employe_from_user(request.user)
     q_dae_region_service = Q(
-        poste__implantation__zone_administrative=(
-            employe.implantation.zone_administrative
+        poste__implantation__zone_administrative__in=(
+            groups.get_zones_from_user(request.user)
         )
     )
     q_rh_region_service = Q(
-        poste__implantation__zone_administrative=(
-            employe.implantation.zone_administrative
+        poste__implantation__zone_administrative__in=(
+            groups.get_zones_from_user(request.user)
         )
     )
     # TRAITEMENT DRH