CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 09:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44838 from frappe/mergify/bp/version-15-hotfix/pr-44751

Browse Source 
fix: buying rate for service item in gross profit report (backport #44751)
This commit is contained in:
ruthra kumar
2024-12-23 12:06:23 +05:30
committed by GitHub
parent 59841408ac a55aaea5a1
commit 1a9dfec115
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -748,12 +748,13 @@ class GrossProfitGenerator:
.inner_join(purchase_invoice)
.on(purchase_invoice.name == purchase_invoice_item.parent)
.select(
purchase_invoice.name,
purchase_invoice_item.base_rate / purchase_invoice_item.conversion_factor,
)
.where(purchase_invoice.docstatus == 1)
.where(purchase_invoice.posting_date <= self.filters.to_date)
.where(purchase_invoice_item.item_code == item_code)
.where(purchase_invoice.is_return == 0)
.where(purchase_invoice_item.parenttype == "Purchase Invoice")
)
if row.project: