fix corner case of subcontactors with cost but no selling rate

digitalfox · Apr 24, 2024 · 422fcc6 · 422fcc6
1 parent eac1f6b
commit 422fcc6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/staffing/models.py b/staffing/models.py
@@ -388,7 +388,7 @@ def objectiveMargin(self, startDate=None, endDate=None):
                 n_days = timesheet_data.get(month, 0)
                 if consultant.subcontractor:
                     # Compute objective margin on sold rate after removing standard subcontractor budget margin
-                    if consultant_rates[consultant][0] and consultant_rates[consultant][1]:
+                    if consultant_rates[consultant][0] is not None and consultant_rates[consultant][1]:
                         result[consultant] += n_days * (consultant_rates[consultant][0] * (1 - get_parameter("SUBCONTRACTOR_BUDGET_MARGIN")/100) - consultant_rates[consultant][1])
                 else:
                     # Compute objective margin on rate objective for this period
@@ -400,7 +400,7 @@ def objectiveMargin(self, startDate=None, endDate=None):
                 n_days = staffing_data.get(month, 0) - timesheet_data.get(month, 0)  # substract timesheet data from staffing to avoid twice counting
                 if consultant.subcontractor:
                     # Compute objective margin on sold rate
-                    if consultant_rates[consultant][0] and consultant_rates[consultant][1]:
+                    if consultant_rates[consultant][0] is not None and consultant_rates[consultant][1]:
                         result[consultant] += n_days * (consultant_rates[consultant][0] * (1 - get_parameter("SUBCONTRACTOR_BUDGET_MARGIN")/100) - consultant_rates[consultant][1])
                 else:
                     # Compute objective margin on rate objective for this period