[minor fixes]
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index d0b454e..98dbfbe 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -151,6 +151,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "depends_on": "eval:doc.drop_ship==1",
"fieldname": "customer",
"fieldtype": "Link",
"hidden": 0,
@@ -174,7 +175,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "depends_on": "eval:doc.order_type==\"Drop Shipment\"",
+ "depends_on": "eval:doc.drop_ship==1",
"fieldname": "customer_name",
"fieldtype": "Data",
"hidden": 0,
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index d7f287b..b087b8a 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -143,7 +143,7 @@
throw(_("Total allocated percentage for sales team should be 100"))
def validate_order_type(self):
- valid_types = ["Sales", "Maintenance", "Shopping Cart", "Drop Shipment"]
+ valid_types = ["Sales", "Maintenance", "Shopping Cart"]
if not self.order_type:
self.order_type = "Sales"
elif self.order_type not in valid_types:
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 25c8182..c9cda38 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -499,6 +499,7 @@
target.contact_display = ""
target.contact_mobile = ""
target.contact_email = ""
+ target.contact_person = ""
target.ignore_pricing_rule = 1
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")