nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-23 12:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(manufacturing): derive transferred qty from net item coverage

Browse Source 
Follow-up to 329126a8d2; review findings: the claim capped away
legitimate coverage and the claim-sum validation still blocked the
honest remainder.

- material_transferred_for_manufacturing is now owned solely by the
  recomputation: finished-good qty covered by net item transfers
  (non-additional transfers minus returns, alternatives mapped to the
  original required item), capped at planned qty plus the transfer
  allowance instead of a hard 1.0 fraction.
- update_work_order_qty delegates the field to that recomputation and no
  longer validates SUM(fg_completed_qty) for transfers, so the
  advertised remainder submits after an under-covered entry; inflated
  claims cannot reach the stored value anyway.
- Coverage from For Quantity = 0 entries (pick list / material request)
  adds to claimed entries instead of being capped away, and returns
  reduce both the stored value and the In Process predicate.
This commit is contained in:
Mihir Kandoi
2026-08-13 11:32:10 +05:30
parent 4577930312
commit 754462801e
2 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
erpnext/manufacturing/doctype/work_order/services/required_items.py
View File

@@ -148,7 +148,7 @@ class RequiredItemsService:
row, transferred_qty, row_wise_serial_batch
)
self.recompute_material_transferred_for_manufacturing(transferred_items)
self.recompute_material_transferred_for_manufacturing()
def refresh_material_transferred_for_manufacturing(self):
"""Recompute material_transferred_for_manufacturing only, without touching per-row
@@ -157,32 +157,26 @@ class RequiredItemsService:
"""
if self.doc.skip_transfer:
return
transferred_items = self._material_transfer_qty_by_item(is_return=0)
self.recompute_material_transferred_for_manufacturing(transferred_items)
self.recompute_material_transferred_for_manufacturing()
def recompute_material_transferred_for_manufacturing(self, transferred_items):
"""Set material_transferred_for_manufacturing to the claimed SUM(fg_completed_qty),
capped by the finished-good qty the transferred item quantities actually cover.
def recompute_material_transferred_for_manufacturing(self):
"""Set material_transferred_for_manufacturing to the finished-good qty covered by net
item-level transfers (transfers minus returns), capped at the transfer allowance.
Falls back to the claimed SUM(fg_completed_qty) when coverage is unmeasurable.
"""
# Job Card transfers use the minimum completed quantity across operations.
if self.doc.operations and self.doc.transfer_material_against == "Job Card":
return
claimed_qty = StatusService(self.doc).get_transferred_or_manufactured_qty(
"Material Transfer for Manufacture", "material_transferred_for_manufacturing"
)
covered_qty = self._transfer_covered_qty(transferred_items)
covered_qty = self._transfer_covered_qty()
if covered_qty is None:
if claimed_qty:
self.doc.db_set("material_transferred_for_manufacturing", claimed_qty)
return
covered_qty = StatusService(self.doc).get_transferred_or_manufactured_qty(
"Material Transfer for Manufacture", "material_transferred_for_manufacturing"
)
self.doc.db_set("material_transferred_for_manufacturing", covered_qty)
material_transferred = min(claimed_qty, covered_qty) if claimed_qty else covered_qty
self.doc.db_set("material_transferred_for_manufacturing", material_transferred)
def _transfer_covered_qty(self, transferred_items):
"""Finished-good qty covered by the transferred raw materials, None when unmeasurable."""
def _transfer_covered_qty(self):
"""Finished-good qty covered by net transferred raw materials, None when unmeasurable."""
required_by_item = {}
for row in self.doc.required_items:
if not row.include_item_in_manufacturing or flt(row.required_qty) <= 0:
@@ -192,13 +186,23 @@ class RequiredItemsService:
if not required_by_item:
return None
net_transferred = self._net_transferred_qty_by_item()
min_fraction = min(
flt(transferred_items.get(item_code) or 0) / required_qty
flt(net_transferred.get(item_code) or 0) / required_qty
for item_code, required_qty in required_by_item.items()
)
covered_qty = min(min_fraction, 1.0) * flt(self.doc.qty)
allowance = StatusService(self.doc).get_qty_allowance("Material Transfer for Manufacture")
covered_qty = min(min_fraction, 1.0 + allowance / 100.0) * flt(self.doc.qty)
return flt(covered_qty, self.doc.precision("material_transferred_for_manufacturing"))
def _net_transferred_qty_by_item(self):
transferred = self._material_transfer_qty_by_item(is_return=0, exclude_additional=True)
returned = self._material_transfer_qty_by_item(is_return=1, exclude_additional=True)
net = frappe._dict()
for item_code, qty in transferred.items():
net[item_code] = max(0.0, flt(qty) - flt(returned.get(item_code) or 0.0))
return net
def update_returned_qty(self):
returned_dict = self._material_transfer_qty_by_item(is_return=1)
for row in self.doc.required_items:
@@ -295,7 +299,7 @@ class RequiredItemsService:
)
return frappe._dict({d.item_code: flt(d.qty) for d in query.run(as_dict=1)})
def _material_transfer_qty_by_item(self, is_return):
def _material_transfer_qty_by_item(self, is_return, exclude_additional=False):
ste = frappe.qb.DocType("Stock Entry")
ste_child = frappe.qb.DocType("Stock Entry Detail")
job_card = frappe.qb.DocType("Job Card")
@@ -316,7 +320,7 @@ class RequiredItemsService:
ste_child.original_item,
fn.Sum(ste_child.transfer_qty).as_("qty"),
)
.where(self._material_transfer_filter(ste, is_return))
.where(self._material_transfer_filter(ste, is_return, exclude_additional))
.where(fn.Coalesce(job_card.is_corrective_job_card, 0) == 0)
.groupby(ste_child.item_code, ste_child.original_item)
)
@@ -326,14 +330,16 @@ class RequiredItemsService:
qty_by_item[key] = (qty_by_item.get(key) or 0.0) + flt(d.qty)
if is_return:
return self._cap_returned_qty_to_transferred(qty_by_item)
return self._cap_returned_qty_to_transferred(qty_by_item, exclude_additional)
return qty_by_item
def _cap_returned_qty_to_transferred(self, returned_qty_by_item):
def _cap_returned_qty_to_transferred(self, returned_qty_by_item, exclude_additional=False):
# Work Order returns combine regular and corrective stock without a Job Card link.
# Cap each return at the regular transfer total so corrective quantities stay neutral.
transferred_qty_by_item = self._material_transfer_qty_by_item(is_return=0)
transferred_qty_by_item = self._material_transfer_qty_by_item(
is_return=0, exclude_additional=exclude_additional
)
return frappe._dict(
{
item_code: min(flt(returned_qty), flt(transferred_qty_by_item.get(item_code)))
@@ -341,13 +347,16 @@ class RequiredItemsService:
}
)
def _material_transfer_filter(self, ste, is_return):
return (
def _material_transfer_filter(self, ste, is_return, exclude_additional=False):
condition = (
(ste.docstatus == 1)
& (ste.work_order == self.doc.name)
& (ste.purpose == "Material Transfer for Manufacture")
& (ste.is_return == is_return)
)
if exclude_additional:
condition &= ste.is_additional_transfer_entry == 0
return condition
def update_consumed_qty_for_required_items(self):
"""

21
erpnext/manufacturing/doctype/work_order/services/status.py
View File

@@ -10,6 +10,7 @@ callers (job cards, sales orders, production plans, patches) keep working.
import frappe
from frappe import _
from frappe.query_builder import Case
from frappe.query_builder.functions import IfNull, Sum
from frappe.utils import cint, flt, get_link_to_form
@@ -144,20 +145,20 @@ class StatusService:
return status
def _has_transferred_material(self):
"""True if any raw material was transferred against this work order, even when the
covered qty leaves material_transferred_for_manufacturing at 0."""
"""True if raw material net of returns remains transferred against this work order,
even when the covered qty leaves material_transferred_for_manufacturing at 0."""
ste = frappe.qb.DocType("Stock Entry")
ste_child = frappe.qb.DocType("Stock Entry Detail")
signed_qty = Case().when(ste.is_return == 1, -ste_child.transfer_qty).else_(ste_child.transfer_qty)
qty = (
frappe.qb.from_(ste)
.inner_join(ste_child)
.on(ste_child.parent == ste.name)
.select(Sum(ste_child.transfer_qty))
.select(Sum(signed_qty))
.where(
(ste.work_order == self.doc.name)
& (ste.docstatus == 1)
& (ste.purpose == "Material Transfer for Manufacture")
& (ste.is_return == 0)
)
).run()[0][0]
return flt(qty) > 0
@@ -201,8 +202,16 @@ class StatusService:
if self._skip_transfer_purpose(purpose):
return
if fieldname == "material_transferred_for_manufacturing":
# Owned by the net-coverage recomputation; the claimed fg_completed_qty is not
# validated here because item rows, not the claim, decide the stored value.
self.doc.refresh_material_transferred_for_manufacturing()
self.set_process_loss_qty()
self._update_produced_qty_in_so()
return
qty = self.get_transferred_or_manufactured_qty(purpose, fieldname)
completed_qty = self.doc.qty + (self._qty_allowance(purpose) / 100 * self.doc.qty)
completed_qty = self.doc.qty + (self.get_qty_allowance(purpose) / 100 * self.doc.qty)
if qty > completed_qty:
frappe.throw(
_("{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}").format(
@@ -222,7 +231,7 @@ class StatusService:
and self.doc.transfer_material_against == "Job Card"
)
def _qty_allowance(self, purpose):
def get_qty_allowance(self, purpose):
allowance = flt(
frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
)