nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 05:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50250 from frappe/mergify/bp/version-15-hotfix/pr-50220

Browse Source 
fix(gross profit): remove customer name from columns (backport #50220)
This commit is contained in:
Diptanil Saha
2025-10-28 15:37:53 +05:30
committed by GitHub
parent ad33735541 158e1b28a9
commit 7434522ea1
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,6 +231,15 @@ def get_data_when_not_grouped_by_invoice(gross_profit_data, filters, group_wise_
group_columns = group_wise_columns.get(scrub(filters.group_by)) group_columns = group_wise_columns.get(scrub(filters.group_by))
# removing customer_name from group columns
customer_master_name = frappe.db.get_single_value("Selling Settings", "cust_master_name")
supplier_master_name = frappe.db.get_single_value("Buying Settings", "supp_master_name")
if "customer_name" in group_columns and (
supplier_master_name == "Supplier Name" and customer_master_name == "Customer Name"
):
group_columns = [col for col in group_columns if col != "customer_name"]
for src in gross_profit_data.grouped_data: for src in gross_profit_data.grouped_data:
total_base_amount += src.base_amount or 0.00 total_base_amount += src.base_amount or 0.00
total_buying_amount += src.buying_amount or 0.00 total_buying_amount += src.buying_amount or 0.00