Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: supp report logic 2867 #2877

Merged
merged 8 commits into from
Apr 26, 2024
Merged

Fix: supp report logic 2867 #2877

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35d190c
fix: updated org service calculation for max credit offset to account…
Apr 12, 2024
6bd3f00
fix: pending deductions calc change
Apr 19, 2024
9d401ef
fix: None check on summary obj
Apr 19, 2024
46d7e98
Merge branch 'release-2.18.0' into fix/alex-supp-report-logic-2867
AlexZorkin Apr 19, 2024
c7cf932
fix: added back exclude reserved
Apr 22, 2024
1260e48
Merge branch 'fix/alex-supp-report-logic-2867' of github.com:bcgov/tf…
Apr 22, 2024
5e391ab
fix: test for ignoring pending supplemental deductions
Apr 26, 2024
0972526
Merge branch 'release-2.18.0' into fix/alex-supp-report-logic-2867
AlexZorkin Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backend/api/services/OrganizationService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ 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:
if report.summary is not None:
if report.summary.credits_offset:
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
Expand Down