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

fix: take function call outside loop

Browse Source 
(cherry picked from commit b3c400f998)
This commit is contained in:
Mihir Kandoi
2025-03-19 13:04:08 +05:30
committed by Mergify
parent 36ffc2ee67
commit ec1a3a1e6b
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -1083,6 +1083,9 @@ def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate
total_amount, total_billed_amount = 0, 0 total_amount, total_billed_amount = 0, 0
item_wise_returned_qty = get_item_wise_returned_qty(pr_doc) item_wise_returned_qty = get_item_wise_returned_qty(pr_doc)
if adjust_incoming_rate:
item_wise_billed_qty = get_billed_qty_against_purchase_receipt(pr_doc)
for item in pr_doc.items: for item in pr_doc.items:
returned_qty = flt(item_wise_returned_qty.get(item.name)) returned_qty = flt(item_wise_returned_qty.get(item.name))
returned_amount = flt(returned_qty) * flt(item.rate) returned_amount = flt(returned_qty) * flt(item.rate)
@@ -1102,10 +1105,15 @@ def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate
if adjust_incoming_rate: if adjust_incoming_rate:
adjusted_amt = 0.0 adjusted_amt = 0.0
billed_qty = get_billed_qty_against_item(item.name)
if item.billed_amt is not None and item.amount is not None and billed_qty: if (
adjusted_amt = (flt(item.billed_amt / billed_qty) - flt(item.rate)) * item.qty item.billed_amt is not None
and item.amount is not None
and item_wise_billed_qty.get(item.name)
):
adjusted_amt = (
flt(item.billed_amt / item_wise_billed_qty.get(item.name)) - flt(item.rate)
) * item.qty
adjusted_amt = flt(adjusted_amt * flt(pr_doc.conversion_rate), item.precision("amount")) adjusted_amt = flt(adjusted_amt * flt(pr_doc.conversion_rate), item.precision("amount"))
item.db_set("amount_difference_with_purchase_invoice", adjusted_amt, update_modified=False) item.db_set("amount_difference_with_purchase_invoice", adjusted_amt, update_modified=False)
@@ -1121,14 +1129,20 @@ def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate
adjust_incoming_rate_for_pr(pr_doc) adjust_incoming_rate_for_pr(pr_doc)
def get_billed_qty_against_item(name): def get_billed_qty_against_purchase_receipt(pr_doc):
pr_names = [d.name for d in pr_doc.items]
table = frappe.qb.DocType("Purchase Invoice Item") table = frappe.qb.DocType("Purchase Invoice Item")
query = ( query = (
frappe.qb.from_(table) frappe.qb.from_(table)
.select(fn.Sum(table.qty).as_("qty")) .select(table.pr_detail, fn.Sum(table.qty).as_("qty"))
.where((table.pr_detail == name) & (table.docstatus == 1)) .where((table.pr_detail.isin(pr_names)) & (table.docstatus == 1))
.groupby(table.pr_detail)
) )
return query.run(as_dict=True)[0].get("qty", 0) invoice_data = query.run(as_list=1)
if not invoice_data:
return frappe._dict()
return frappe._dict(invoice_data)
def adjust_incoming_rate_for_pr(doc): def adjust_incoming_rate_for_pr(doc):