Fix: Credit Offset Exclude Reserved

backend/api/serializers/ComplianceReport.py

@@ -592,6 +592,18 @@ def get_max_credit_offset(self, obj):
 
         return max_credit_offset
 
+    def get_max_credit_offset_exclude_reserved(self, obj):
+        max_credit_offset_exclude_reserved = OrganizationService.get_max_credit_offset(
+            obj.organization,
+            obj.compliance_period.description,
+            exclude_reserved=True
+        )
+
+        if max_credit_offset_exclude_reserved < 0:
+            max_credit_offset_exclude_reserved = 0
+
+        return max_credit_offset_exclude_reserved
+
     def get_summary(self, obj):
         """
         Retrieve a summary that merges synthetic totals with existing summary data.
@@ -1255,6 +1267,18 @@ def get_max_credit_offset(self, obj):
 
         return max_credit_offset
 
+    def get_max_credit_offset_exclude_reserved(self, obj):
+        max_credit_offset_exclude_reserved = OrganizationService.get_max_credit_offset(
+            obj.organization,
+            obj.compliance_period.description,
+            exclude_reserved=True
+        )
+
+        if max_credit_offset_exclude_reserved < 0:
+            max_credit_offset_exclude_reserved = 0
+
+        return max_credit_offset_exclude_reserved
+
     def get_history(self, obj):
         """
         Returns all the previous status changes for the compliance report

backend/api/services/OrganizationService.py

@@ -107,9 +107,11 @@ def get_pending_deductions(
                     if compliance_report.summary.credits_offset is not None:
                             deductions += compliance_report.summary.credits_offset
 
-            if report.status.director_status_id == 'Accepted' and \
-                    ignore_pending_supplemental:
-                deductions -= report.summary.credits_offset
+            if report.status.director_status_id == 'Accepted' and ignore_pending_supplemental:
+                if report.summary is not None:
+                    if report.summary.credits_offset:
+                        deductions -= report.summary.credits_offset
+
         if deductions < 0:
             deductions = 0