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

Removed "Project" magic string from bu_internal_invoice.py #141

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Removed "Project" magic string from bu_internal_invoice.py #141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52a0931
Removed "Project" magic string from `bu_internal_invoice.py`
QuanMPhm Jan 15, 2025
51b3335
Merge branch 'main' into 139/remove_magic
knikolla Jan 17, 2025
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
12 changes: 7 additions & 5 deletions process_report/invoices/bu_internal_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class BUInternalInvoice(invoice.Invoice):
export_columns_list = [
invoice.INVOICE_DATE_FIELD,
invoice.PI_FIELD,
"Project",
invoice.PROJECT_NAME_FIELD,
invoice.GROUP_NAME_FIELD,
invoice.GROUP_INSTITUTION_FIELD,
invoice.GROUP_BALANCE_FIELD,
Expand All @@ -40,17 +40,19 @@ def _sum_project_allocations(self, dataframe):
"""A project may have multiple allocations, and therefore multiple rows
in the raw invoices. For BU-Internal invoice, we only want 1 row for
each unique project, summing up its allocations' costs"""
project_list = dataframe["Project"].unique()
data_no_dup = dataframe.drop_duplicates("Project", inplace=False)
project_list = dataframe[invoice.PROJECT_NAME_FIELD].unique()
data_no_dup = dataframe.drop_duplicates(
invoice.PROJECT_NAME_FIELD, inplace=False
)
sum_fields = [
invoice.COST_FIELD,
invoice.CREDIT_FIELD,
invoice.SUBSIDY_FIELD,
invoice.PI_BALANCE_FIELD,
]
for project in project_list:
project_mask = dataframe["Project"] == project
no_dup_project_mask = data_no_dup["Project"] == project
project_mask = dataframe[invoice.PROJECT_NAME_FIELD] == project
no_dup_project_mask = data_no_dup[invoice.PROJECT_NAME_FIELD] == project

sum_fields_sums = dataframe[project_mask][sum_fields].sum().values
data_no_dup.loc[no_dup_project_mask, sum_fields] = sum_fields_sums
Expand Down
Loading