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

refactor(supplier): Using query builder for get_total_received_amount (#54869)

Browse Source 
Use the query builder for get_total_received_amount to assure compatibility with PostgreSQL.
This commit is contained in:
Loïc Oberle
2026-05-12 19:02:34 +02:00
committed by GitHub
parent 1a4748759d
commit 5b7f07ddb1
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py
View File

@@ -258,28 +258,21 @@ def get_total_received(scorecard):
def get_total_received_amount(scorecard): def get_total_received_amount(scorecard):
"""Gets the total amount (in company currency) received in the period (based on Purchase Receipts)""" """Gets the total amount (in company currency) received in the period (based on Purchase Receipts)"""
supplier = frappe.get_doc("Supplier", scorecard.supplier) pr = frappe.qb.DocType("Purchase Receipt")
pr_item = frappe.qb.DocType("Purchase Receipt Item")
# Look up all PO Items with delivery dates between our dates query = (
data = frappe.db.sql( frappe.qb.from_(pr)
""" .join(pr_item)
SELECT .on(pr_item.parent == pr.name)
SUM(pr_item.received_qty * pr_item.base_rate) .select(frappe.qb.fn.Sum(pr_item.received_qty * pr_item.base_rate))
FROM .where(pr.supplier == scorecard.supplier)
`tabPurchase Receipt Item` pr_item, .where(pr.posting_date[scorecard.start_date : scorecard.end_date])
`tabPurchase Receipt` pr .where(pr_item.docstatus == 1)
WHERE )
pr.supplier = %(supplier)s
AND pr.posting_date BETWEEN %(start_date)s AND %(end_date)s
AND pr_item.docstatus = 1
AND pr_item.parent = pr.name""",
{"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date},
as_dict=0,
)[0][0]
if not data: result = query.run()
data = 0 return frappe.utils.flt(result[0][0]) if result else 0.0
return data
def get_total_received_items(scorecard): def get_total_received_items(scorecard):