nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44687 from ruthra-kumar/backport_v14_pr_42989

Browse Source 
fix: Wrong allocated_amount for sales_team in gross_profit report (backport #43989)
This commit is contained in:
ruthra kumar
2024-12-13 12:39:28 +05:30
committed by GitHub
parent 00898be8e4 d83cc57e58
commit 4c8b4419b6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,7 +768,10 @@ class GrossProfitGenerator:
"""
if self.filters.group_by == "Sales Person":
sales_person_cols = ", sales.sales_person, sales.allocated_amount, sales.incentives"
sales_person_cols = """, sales.sales_person,
sales.allocated_percentage * `tabSales Invoice Item`.base_net_amount / 100 as allocated_amount,
sales.incentives
"""
sales_team_table = "left join `tabSales Team` sales on sales.parent = `tabSales Invoice`.name"
else:
sales_person_cols = ""