nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: read WIP warehouse from work order (#20131)

Browse Source 
* 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
This commit is contained in:
Ishan Loya
2019-12-30 12:19:08 +05:30
committed by Nabin Hait
parent 59a835602a
commit fe0adc8b25
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@@ -684,8 +684,7 @@ def set_work_order_ops(name):
@frappe.whitelist() @frappe.whitelist()
def make_stock_entry(work_order_id, purpose, qty=None): def make_stock_entry(work_order_id, purpose, qty=None):
work_order = frappe.get_doc("Work Order", work_order_id) work_order = frappe.get_doc("Work Order", work_order_id)
if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group") \ if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"):
and not work_order.skip_transfer:
wip_warehouse = work_order.wip_warehouse wip_warehouse = work_order.wip_warehouse
else: else:
wip_warehouse = None wip_warehouse = None

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

@@ -849,7 +849,7 @@ class StockEntry(StockController):
and po.name = %s""",self.purchase_order)) and po.name = %s""",self.purchase_order))
for item in itervalues(item_dict): 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 item["from_warehouse"] = self.pro_doc.wip_warehouse
#Get Reserve Warehouse from PO #Get Reserve Warehouse from PO
if self.purchase_order and self.purpose=="Send to Subcontractor": if self.purchase_order and self.purpose=="Send to Subcontractor":