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

Merge pull request #24364 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue

Browse Source 
fix: extra transferred qty has not consumed against work order
This commit is contained in:
rohitwaghchaure
2021-01-14 16:36:24 +05:30
committed by GitHub
parent 6df18856db a250d415aa
commit 87f0ed6477
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -1115,7 +1115,10 @@ class StockEntry(StockController):
else:
qty = (req_qty_each * flt(self.fg_completed_qty)) - remaining_qty
else:
qty = req_qty_each * flt(self.fg_completed_qty)
if self.flags.backflush_based_on == "Material Transferred for Manufacture":
qty = (item.qty/trans_qty) * flt(self.fg_completed_qty)
else:
qty = req_qty_each * flt(self.fg_completed_qty)
elif backflushed_materials.get(item.item_code):
for d in backflushed_materials.get(item.item_code):
@@ -1123,7 +1126,8 @@ class StockEntry(StockController):
if (qty > req_qty):
qty = (qty/trans_qty) * flt(self.fg_completed_qty)
if consumed_qty:
if consumed_qty and frappe.db.get_single_value("Manufacturing Settings",
"material_consumption"):
qty -= consumed_qty
if cint(frappe.get_cached_value('UOM', item.stock_uom, 'must_be_whole_number')):