Improved queryset

src/oscar/apps/dashboard/offers/views.py

@@ -96,9 +96,9 @@ class OfferListView(ListView):
                 self.search_filters.append(_("Is active"))
             else:
                 qs = qs.filter(
-                    (Q(start_datetime__lte=now) | Q(start_datetime__isnull=True))
-                    & (Q(end_datetime__gte=now) | Q(end_datetime__isnull=True)),
-                    status=ConditionalOffer.SUSPENDED,
+                    Q(start_datetime__gt=now)
+                    | Q(end_datetime__lt=now)
+                    | Q(status=ConditionalOffer.SUSPENDED)
                 )
                 self.search_filters.append(_("Is inactive"))
         if offer_type: