Merge pull request #1966 from anandpdoshi/anand-july-21
Stock Entry Warehouse prefill, Item autosuggest by description
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 2d41d0a..1486d2a 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -39,16 +39,16 @@
def validate_sales_order(self):
if self.sales_order:
so = frappe.db.sql("""select name, delivery_date from `tabSales Order`
- where name=%s and docstatus = 1""", self.sales_order, as_dict=1)[0]
+ where name=%s and docstatus = 1""", self.sales_order, as_dict=1)
- if not so.name:
+ if len(so):
+ if not self.expected_delivery_date:
+ self.expected_delivery_date = so[0].delivery_date
+
+ self.validate_production_order_against_so()
+ else:
frappe.throw(_("Sales Order {0} is not valid") % self.sales_order)
- if not self.expected_delivery_date:
- self.expected_delivery_date = so.delivery_date
-
- self.validate_production_order_against_so()
-
def validate_warehouse(self):
from erpnext.stock.utils import validate_warehouse_company