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

fix: use qty instead of stock qty dropship gross profit report (#54389)

Browse Source 
(cherry picked from commit d6b379b936)

# Conflicts:
#	erpnext/accounts/report/gross_profit/gross_profit.py
This commit is contained in:
Mihir Kandoi
2026-04-19 12:10:59 +05:30
committed by Mergify
parent 4048f0666e
commit 2db138a833
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -769,7 +769,32 @@ class GrossProfitGenerator:
# IMP NOTE
# stock_ledger_entries should already be filtered by item_code and warehouse and
# sorted by posting_date desc, posting_time desc
<<<<<<< HEAD
if item_code in self.non_stock_items and (row.project or row.cost_center):
=======
if (
row.delivered_by_supplier
and row.so_detail
and (
po_details := frappe.get_all(
"Purchase Order Item",
filters={"sales_order_item": row.so_detail, "docstatus": 1},
pluck="name",
)
)
):
from frappe.query_builder.functions import Sum
table = frappe.qb.DocType("Purchase Invoice Item")
query = (
frappe.qb.from_(table)
.select(Sum(table.qty * table.base_net_rate))
.where((table.po_detail.isin(po_details)) & (table.docstatus == 1))
)
return flt(query.run()[0][0])
elif item_code in self.non_stock_items and (row.project or row.cost_center):
>>>>>>> d6b379b936 (fix: use qty instead of stock qty dropship gross profit report (#54389))
# Issue 6089-Get last purchasing rate for non-stock item
item_rate = self.get_last_purchase_rate(item_code, row)
return flt(row.qty) * item_rate