diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index d4c40f2ade9..0dcf9f5d0af 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -685,13 +685,13 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", 
-   "fieldname": "by_supplier", 
+   "fieldname": "drop_ship", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Delivered By Sypplier", 
+   "label": "Drop Ship", 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -718,7 +718,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "read_only": 0, 
+   "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1327,8 +1327,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-27 16:59:39.595490", 
- "modified_by": "saurabh@erpnext.com", 
+ "modified": "2015-11-02 15:14:02.306067", 
+ "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
  "owner": "Administrator", 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 146694e27d6..463b5d99014 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -166,7 +166,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		cur_frm.cscript.update_status('Stop', 'Stopped')
 	},
 	unstop_purchase_order: function(){
-		cur_frm.cscript.update_status('UNSTOP', 'Submitted')
+		cur_frm.cscript.update_status('Resume', 'Submitted')
 	},
 	close_purchase_order: function(){
 		cur_frm.cscript.update_status('Close', 'Closed')
@@ -174,7 +174,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 	delivered_by_supplier: function(){
 		return frappe.call({
 			method: "erpnext.buying.doctype.purchase_order.purchase_order.delivered_by_supplier",
-			freez: true,
+			freeze: true,
 			args:{
 				purchase_order: cur_frm.doc.name
 			},
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index e8ad1e82f53..93ba3a5f94b 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -688,17 +688,17 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier", 
-   "fieldname": "by_supplier", 
+   "fieldname": "drop_ship", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Delivered by Supplier", 
+   "label": "Drop Ship", 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1206,8 +1206,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-27 17:00:01.005108", 
- "modified_by": "saurabh@erpnext.com", 
+ "modified": "2015-11-02 15:15:05.774529", 
+ "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
  "owner": "Administrator",