Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version-12-hotfix' into bom-comparison-tool

Browse Source
This commit is contained in:
Suraj Shetty 2019-08-01 12:59:19 +05:30 committed by GitHub
commit 31e3dada0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,7 +802,7 @@ class StockEntry(StockController):
self.add_to_stock_entry_detail(item_dict)
if self.purpose != "Send to Subcontractor":
if self.purpose != "Send to Subcontractor" and self.purpose == "Manufacture":
scrap_item_dict = self.get_bom_scrap_material(self.fg_completed_qty)
for item in itervalues(scrap_item_dict):
if self.pro_doc and self.pro_doc.scrap_warehouse: