date poste import

[auf_rh_dae.git] / project / rh / admin.py

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 6c12274..fa1b26b 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -74,9 +74,9 @@ class ChangeList(DjangoChangeList):
         if date_debut is not None and date_fin is not None:    
             q_left = (Q(**{'%s__isnull' % prefix_debut : True}) | Q(**{'%s__lte' % prefix_debut : date_debut})) & (Q(**{'%s__gte' % prefix_fin : date_debut}) & Q(**{'%s__lte' % prefix_fin : date_fin}))
             q_right = (Q(**{'%s__isnull' % prefix_fin : True}) | Q(**{'%s__gte' % prefix_fin : date_fin})) & (Q(**{'%s__gte' % prefix_debut : date_debut}) & Q(**{'%s__lte' % prefix_debut : date_fin}))
-            q_no_date = Q(**{'%s__isnull' % prefix_fin : True}) & Q(**{'%s__isnull' % prefix_debut : True})
+            q_both = Q(**{'%s__isnull' % prefix_fin : True}) | Q(**{'%s__lte' % prefix_fin : date_fin}) & (Q(**{'%s__isnull' % prefix_debut : True}) | Q(**{'%s__gte' % prefix_debut : date_debut}))
             q_non_supprime = Q(**{'%s__exact' % prefix_debut.replace('date_debut', 'supprime') : False})
-            q = (q_left | q_right | q_no_date) & q_non_supprime
+            q = (q_left | q_right | q_both) & q_non_supprime
             qs = qs.filter(q).distinct()
 
         self.params = old