consider fixed price mission with end boundary in pre billing page

digitalfox · Feb 21, 2025 · 203991e · 203991e
1 parent bf9ee01
commit 203991e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/billing/views.py b/billing/views.py
@@ -552,9 +552,9 @@ def pre_billing(request, start_date=None, end_date=None, mine=False):
         mine = False
 
 
-    fixedPriceMissions = Mission.objects.filter(nature="PROD", billing_mode="FIXED_PRICE",
-                                                timesheet__working_date__gte=start_date,
-                                                timesheet__working_date__lt=end_date)
+    fixedPriceMissions = Mission.objects.filter(nature="PROD", billing_mode="FIXED_PRICE").filter(
+                                                Q(timesheet__working_date__gte=start_date, timesheet__working_date__lt=end_date) |
+                                                Q(end_date__gte=start_date))
     undefinedBillingModeMissions = Mission.objects.filter(nature="PROD", billing_mode=None,
                                                           timesheet__working_date__gte=start_date,
                                                           timesheet__working_date__lt=end_date)