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

Merge pull request #37509 from frappe/mergify/bp/version-13-hotfix/pr-37435

Browse Source 
fix(gp): wrong `allocated_amount` when grouped by Sales Person (backport #37435)
This commit is contained in:
ruthra kumar
2023-10-15 10:30:28 +05:30
committed by GitHub
parent 8b4e69235a 7805c3acf6
commit 1cfc6cfe5d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,6 +457,8 @@ class GrossProfitGenerator(object):
new_row.qty += flt(row.qty) new_row.qty += flt(row.qty)
new_row.buying_amount += flt(row.buying_amount, self.currency_precision) new_row.buying_amount += flt(row.buying_amount, self.currency_precision)
new_row.base_amount += flt(row.base_amount, self.currency_precision) new_row.base_amount += flt(row.base_amount, self.currency_precision)
if self.filters.get("group_by") == "Sales Person":
new_row.allocated_amount += flt(row.allocated_amount, self.currency_precision)
new_row = self.set_average_rate(new_row) new_row = self.set_average_rate(new_row)
self.grouped_data.append(new_row) self.grouped_data.append(new_row)
else: else: