nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 09:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update weighted average rate calculation to consider returned and consumed quantities

Browse Source 
(cherry picked from commit 35e55d3e13)
This commit is contained in:
ljain112
2026-06-15 14:16:07 +05:30
committed by Mergify
parent 6c37acc180
commit 35e06045bd
2 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/controllers/subcontracting_inward_controller.py
View File

@@ -743,7 +743,14 @@ class SubcontractingInwardController:
"name": ["in", list(data.keys())],
"docstatus": 1,
},
fields=["rate", "name", "required_qty", "received_qty"],
fields=[
"rate",
"name",
"required_qty",
"received_qty",
"returned_qty",
"consumed_qty",
],
)
doc_updates = {}
@@ -751,13 +758,17 @@ class SubcontractingInwardController:
current_qty = flt(data[d.name].transfer_qty) * (1 if self._action == "submit" else -1)
current_rate = flt(data[d.name].rate)
# Calculate weighted average rate
old_total = d.rate * d.received_qty
# Weighted average rate must be computed on the on-hand balance
balance_qty = d.received_qty - d.returned_qty - d.consumed_qty
old_total = d.rate * balance_qty
current_total = current_rate * current_qty
new_balance_qty = balance_qty + current_qty
d.received_qty = d.received_qty + current_qty
d.rate = (
flt((old_total + current_total) / d.received_qty, precision) if d.received_qty else 0.0
flt((old_total + current_total) / new_balance_qty, precision)
if new_balance_qty > 0
else 0.0
)
if not d.required_qty and not d.received_qty: