From 14d570ed9eb081c027b466f4a0d50ab6daa14832 Mon Sep 17 00:00:00 2001 From: pawan Date: Thu, 30 Nov 2017 18:41:09 +0530 Subject: [PATCH] fix --- erpnext/buying/doctype/purchase_order/purchase_order.py | 3 +-- erpnext/controllers/buying_controller.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index bb78579ebdf..6522a34a6e8 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -257,8 +257,7 @@ class PurchaseOrder(BuyingController): def update_reserved_qty_for_subcontract(self): for d in self.supplied_items: if d.rm_item_code: - warehouse = d.reserve_warehouse or bom_item_wh.get(d.rm_item_code) or item_wh.get(d.rm_item_code) - stock_bin = get_bin(d.rm_item_code, warehouse) + stock_bin = get_bin(d.rm_item_code, d.reserve_warehouse) stock_bin.update_reserved_qty_for_sub_contracting() @frappe.whitelist() diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index 6956023d4f1..f23aa297ee1 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -268,7 +268,7 @@ class BuyingController(StockController): def get_items_from_bom(self, item_code, bom): bom_items = frappe.db.sql("""select t2.item_code, t2.stock_qty / ifnull(t1.quantity, 1) as qty_consumed_per_unit, - t2.rate, t2.stock_uom, t2.name, t2.description + t2.rate, t2.stock_uom, t2.name, t2.description, t2.source_warehouse from `tabBOM` t1, `tabBOM Item` t2, tabItem t3 where t2.parent = t1.name and t1.item = %s and t1.docstatus = 1 and t1.is_active = 1 and t1.name = %s