diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 1cd1c38822..3700d96f4e 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -35,7 +35,9 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 				break;
 			}
 		}
-
+		
+		cur_frm.set_df_property("drop_ship", "hidden", !allow_delivery);
+		
 		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
 			if (this.frm.has_perm("submit")) {
 				if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index b5a1bde206..74fe371627 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -51,7 +51,7 @@ class PurchaseOrder(BuyingController):
 		self.validate_for_subcontracting()
 		self.validate_minimum_order_qty()
 		self.create_raw_materials_supplied("supplied_items")
-		self.set_received_qtyand_billed_amount_for_drop_ship_items()
+		self.set_received_qty_and_billed_amount_for_drop_ship_items()
 
 	def validate_with_previous_doc(self):
 		super(PurchaseOrder, self).validate_with_previous_doc({
@@ -254,7 +254,7 @@ class PurchaseOrder(BuyingController):
 		
 		return is_drop_ship
 	
-	def set_received_qtyand_billed_amount_for_drop_ship_items(self):
+	def set_received_qty_and_billed_amount_for_drop_ship_items(self):
 		for item in self.items:
 			if item.delivered_by_supplier == 1:
 				item.received_qty = item.qty