retrait de actif

[auf_rh_dae.git] / project / dae / forms.py

diff --git a/project/dae/forms.py b/project/dae/forms.py
index 8b14afb..d578f4d 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -130,7 +130,7 @@ class PosteForm(forms.ModelForm):
     """ Formulaire des postes. """
 
     # On ne propose que les services actifs
-    service = forms.ModelChoiceField(queryset=rh.Service.objects.filter(actif=True), required=True)
+    service = forms.ModelChoiceField(queryset=rh.Service.objects.filter(archive=False), required=True)
 
     responsable=AutoCompleteSelectField('responsables', required=True)
     #responsable = forms.ModelChoiceField(
@@ -146,7 +146,6 @@ class PosteForm(forms.ModelForm):
 
     class Meta:
         model = dae.Poste
-        exclude = ('actif', )
         fields = ('type_intervention',
                   'poste', 'implantation', 'type_poste', 'service', 'nom',
                   'responsable', 'local', 'expatrie', 'mise_a_disposition',
@@ -209,10 +208,10 @@ class PosteForm(forms.ModelForm):
         d'équivalent dans dae.
 
         """
-        dae_ = dae.Poste.objects.ma_region_ou_service(request.user).filter(actif=True, id_rh__isnull=True)
+        dae_ = dae.Poste.objects.ma_region_ou_service(request.user).filter(id_rh__isnull=True)
         copies = dae.Poste.objects.ma_region_ou_service(request.user).exclude(id_rh__isnull=True)
         id_copies = [p.id_rh_id for p in copies.all()]
-        rhv1 = rh.Poste.objects.ma_region_ou_service(request.user).filter(actif=True).exclude(id__in=id_copies)
+        rhv1 = rh.Poste.objects.ma_region_ou_service(request.user).exclude(id__in=id_copies)
         # Optimisation de la requête
         rhv1 = rhv1.select_related(depth=1)