nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Get data when grouped by invoice and otherwise

Browse Source
This commit is contained in:
GangaManoj
2021-08-25 02:52:18 +05:30
parent 498377fbbc
commit fd8657d2f7
1 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@@ -42,6 +42,14 @@ def execute(filters=None):
columns = get_columns(group_wise_columns, filters) columns = get_columns(group_wise_columns, filters)
if filters.group_by == 'Invoice': if filters.group_by == 'Invoice':
get_data_when_grouped_by_invoice(columns, gross_profit_data, filters, group_wise_columns, data)
else:
get_data_when_not_grouped_by_invoice(gross_profit_data, filters, group_wise_columns, data)
return columns, data
def get_data_when_grouped_by_invoice(columns, gross_profit_data, filters, group_wise_columns, data):
column_names = get_column_names() column_names = get_column_names()
# to display item as Item Code: Item Name # to display item as Item Code: Item Name
@@ -60,7 +68,7 @@ def execute(filters=None):
data.append(row) data.append(row)
else: def get_data_when_not_grouped_by_invoice(gross_profit_data, filters, group_wise_columns, data):
for idx, src in enumerate(gross_profit_data.grouped_data): for idx, src in enumerate(gross_profit_data.grouped_data):
row = [] row = []
for col in group_wise_columns.get(scrub(filters.group_by)): for col in group_wise_columns.get(scrub(filters.group_by)):
@@ -71,8 +79,6 @@ def execute(filters=None):
row[0] = frappe.bold("Total") row[0] = frappe.bold("Total")
data.append(row) data.append(row)
return columns, data
def get_columns(group_wise_columns, filters): def get_columns(group_wise_columns, filters):
columns = [] columns = []
column_map = frappe._dict({ column_map = frappe._dict({