Skip to content

Commit e0d3bf7

Browse files
authored
Merge pull request #141 from QuanMPhm/139/remove_magic
Removed "Project" magic string from `bu_internal_invoice.py`
2 parents 28318f7 + 51b3335 commit e0d3bf7

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

process_report/invoices/bu_internal_invoice.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class BUInternalInvoice(invoice.Invoice):
1414
export_columns_list = [
1515
invoice.INVOICE_DATE_FIELD,
1616
invoice.PI_FIELD,
17-
"Project",
17+
invoice.PROJECT_NAME_FIELD,
1818
invoice.GROUP_NAME_FIELD,
1919
invoice.GROUP_INSTITUTION_FIELD,
2020
invoice.GROUP_BALANCE_FIELD,
@@ -40,17 +40,19 @@ def _sum_project_allocations(self, dataframe):
4040
"""A project may have multiple allocations, and therefore multiple rows
4141
in the raw invoices. For BU-Internal invoice, we only want 1 row for
4242
each unique project, summing up its allocations' costs"""
43-
project_list = dataframe["Project"].unique()
44-
data_no_dup = dataframe.drop_duplicates("Project", inplace=False)
43+
project_list = dataframe[invoice.PROJECT_NAME_FIELD].unique()
44+
data_no_dup = dataframe.drop_duplicates(
45+
invoice.PROJECT_NAME_FIELD, inplace=False
46+
)
4547
sum_fields = [
4648
invoice.COST_FIELD,
4749
invoice.CREDIT_FIELD,
4850
invoice.SUBSIDY_FIELD,
4951
invoice.PI_BALANCE_FIELD,
5052
]
5153
for project in project_list:
52-
project_mask = dataframe["Project"] == project
53-
no_dup_project_mask = data_no_dup["Project"] == project
54+
project_mask = dataframe[invoice.PROJECT_NAME_FIELD] == project
55+
no_dup_project_mask = data_no_dup[invoice.PROJECT_NAME_FIELD] == project
5456

5557
sum_fields_sums = dataframe[project_mask][sum_fields].sum().values
5658
data_no_dup.loc[no_dup_project_mask, sum_fields] = sum_fields_sums

0 commit comments

Comments
 (0)