Correction Etat actif pour QBE

diff --git a/src/qbe/django_qbe/forms.py b/src/qbe/django_qbe/forms.py
index 6e60150..c8f45e9 100644 (file)
--- a/src/qbe/django_qbe/forms.py
+++ b/src/qbe/django_qbe/forms.py
@@ -267,8 +267,12 @@ class BaseQueryByExampleFormSet(BaseFormSet):
                 if s == "inactive":
                     _my_wheres.append("%s.date_fin < DATE(NOW())" % m)
                 if s == "active":
-                    _my_wheres.append("(%s.date_debut IS NULL OR %s.date_debut <= DATE(NOW())) AND (%s.date_fin IS NULL OR %s.date_fin >= DATE(NOW()))" %
-                                      (m, m, m, m))
+                    _my_wheres.append(
+                        "%s.supprime = False AND ("
+                        "((%s.`date_debut` <= DATE(NOW()) OR %s.`date_debut` IS NULL) AND %s.`date_fin` >= DATE(NOW())) OR "
+                        "((%s.`date_fin` >= DATE(NOW()) OR %s.`date_fin` IS NULL) AND %s.`date_debut` <= DATE(NOW())) OR "
+                        "(%s.`date_debut` <= DATE(NOW()) AND %s.`date_fin` >= DATE(NOW())))"
+                        % (m, m, m, m, m, m, m, m, m))
                 if s == "futur":
                     _my_wheres.append("%s.date_debut > DATE(NOW())" % m)
                 if s == "unknown":