From fe0adc8b2501a05a2fc803eee1a231f587bad0b2 Mon Sep 17 00:00:00 2001 From: Ishan Loya Date: Mon, 30 Dec 2019 12:19:08 +0530 Subject: [PATCH] fix: read WIP warehouse from work order (#20131) * fix: read wip_warehouse from work order in stock entry even if skip transfer is checked * fix: remove skip_transfer in stock entry Related to #10753 --- erpnext/manufacturing/doctype/work_order/work_order.py | 3 +-- erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index ff4ebfe8be..6798dd2de8 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -684,8 +684,7 @@ def set_work_order_ops(name): @frappe.whitelist() def make_stock_entry(work_order_id, purpose, qty=None): work_order = frappe.get_doc("Work Order", work_order_id) - if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group") \ - and not work_order.skip_transfer: + if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"): wip_warehouse = work_order.wip_warehouse else: wip_warehouse = None diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 18af062147..400d1f435a 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -849,7 +849,7 @@ class StockEntry(StockController): and po.name = %s""",self.purchase_order)) for item in itervalues(item_dict): - if self.pro_doc and (cint(self.pro_doc.from_wip_warehouse) or not self.pro_doc.skip_transfer): + if self.pro_doc and cint(self.pro_doc.from_wip_warehouse): item["from_warehouse"] = self.pro_doc.wip_warehouse #Get Reserve Warehouse from PO if self.purchase_order and self.purpose=="Send to Subcontractor":