schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: incorrect query for Purchase Invoice rate in GP

Browse Source 
(cherry picked from commit bd8382c592)
This commit is contained in:
ruthra kumar
2024-05-06 12:07:33 +05:30
committed by Mergify
parent 904f369e99
commit 93b30d9f11
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -717,20 +717,22 @@ class GrossProfitGenerator:
frappe.qb.from_(purchase_invoice_item) frappe.qb.from_(purchase_invoice_item)
.inner_join(purchase_invoice) .inner_join(purchase_invoice)
.on(purchase_invoice.name == purchase_invoice_item.parent) .on(purchase_invoice.name == purchase_invoice_item.parent)
.select(purchase_invoice_item.base_rate / purchase_invoice_item.conversion_factor) .select(
purchase_invoice.name,
purchase_invoice_item.base_rate / purchase_invoice_item.conversion_factor,
)
.where(purchase_invoice.docstatus == 1) .where(purchase_invoice.docstatus == 1)
.where(purchase_invoice.posting_date <= self.filters.to_date) .where(purchase_invoice.posting_date <= self.filters.to_date)
.where(purchase_invoice_item.item_code == item_code) .where(purchase_invoice_item.item_code == item_code)
) )
if row.project: if row.project:
query.where(purchase_invoice_item.project == row.project) query = query.where(purchase_invoice_item.project == row.project)
if row.cost_center: if row.cost_center:
query.where(purchase_invoice_item.cost_center == row.cost_center) query = query.where(purchase_invoice_item.cost_center == row.cost_center)
query.orderby(purchase_invoice.posting_date, order=frappe.qb.desc) query = query.orderby(purchase_invoice.posting_date, order=frappe.qb.desc).limit(1)
query.limit(1)
last_purchase_rate = query.run() last_purchase_rate = query.run()
return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0 return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0