From 4dc329f5ea716cc70b52a96db0a3a032696f7431 Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 24 Jan 2018 16:46:18 +0530 Subject: [PATCH] [fix] Sales order link to purchase order not working fixed --- erpnext/stock/doctype/material_request/material_request.py | 5 +++-- erpnext/stock/get_item_details.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index da310aa3d7..c4059c1848 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -65,7 +65,7 @@ class MaterialRequest(BuyingController): self.status = "Draft" from erpnext.controllers.status_updater import validate_status - validate_status(self.status, + validate_status(self.status, ["Draft", "Submitted", "Stopped", "Cancelled", "Pending", "Partially Ordered", "Ordered", "Issued", "Transferred"]) @@ -240,7 +240,8 @@ def make_purchase_order(source_name, target_doc=None): ["name", "material_request_item"], ["parent", "material_request"], ["uom", "stock_uom"], - ["uom", "uom"] + ["uom", "uom"], + ["sales_order", "sales_order"] ], "postprocess": update_item, "condition": lambda doc: doc.ordered_qty < doc.stock_qty diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index a7638b4169..6b6723331a 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -472,8 +472,8 @@ def get_projected_qty(item_code, warehouse): @frappe.whitelist() def get_bin_details(item_code, warehouse): return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, - ["projected_qty", "actual_qty"], as_dict=True) \ - or {"projected_qty": 0, "actual_qty": 0} + ["projected_qty", "actual_qty", "ordered_qty"], as_dict=True) \ + or {"projected_qty": 0, "actual_qty": 0, "ordered_qty": 0} @frappe.whitelist() def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):