diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 0d6d6f5..9e60dde 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -13,7 +13,8 @@
 
 erpnext.support.WarrantyClaim = frappe.ui.form.Controller.extend({
 	refresh: function() {
-		if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
+		if(!cur_frm.doc.__islocal &&
+			(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
 			cur_frm.add_custom_button(__('Make Maintenance Visit'),
 				this.make_maintenance_visit, frappe.boot.doctype_icons["Maintenance Visit"], "btn-default")
 		}
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index a977940..cabbdae 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -60,6 +60,15 @@
    "width": "50%"
   }, 
   {
+   "description": "", 
+   "fieldname": "serial_no", 
+   "fieldtype": "Link", 
+   "in_list_view": 0, 
+   "label": "Serial No", 
+   "options": "Serial No", 
+   "permlevel": 0
+  }, 
+  {
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -108,15 +117,6 @@
    "reqd": 1
   }, 
   {
-   "description": "Item, Warranty, AMC (Annual Maintenance Contract) details will be automatically fetched when Serial Number is selected.", 
-   "fieldname": "serial_no", 
-   "fieldtype": "Link", 
-   "in_list_view": 0, 
-   "label": "Serial No", 
-   "options": "Serial No", 
-   "permlevel": 0
-  }, 
-  {
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "in_filter": 1, 
@@ -396,7 +396,7 @@
  "icon": "icon-bug", 
  "idx": 1, 
  "is_submittable": 0, 
- "modified": "2015-02-20 05:08:06.361985", 
+ "modified": "2015-02-21 04:11:40.653543", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Warranty Claim",