diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index ea76e91b3f3..d6e42f3ee1c 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -34,7 +34,7 @@ class MaintenanceSchedule(TransactionBase):
 				count = count + 1
 				child.sales_person = d.sales_person
 				child.completion_status = "Pending"
-				child.item_ref = d.name
+				child.item_reference = d.name
 
 	@frappe.whitelist()
 	def validate_end_date_visits(self):
@@ -314,11 +314,12 @@ def update_serial_nos(s_id):
 def make_maintenance_visit(source_name, target_doc=None, item_name=None, s_id=None):
 	from frappe.model.mapper import get_mapped_doc
 
-	def update_status(source, target, parent):
+	def update_status_and_detail(source, target, parent):
 		target.maintenance_type = "Scheduled"
+		target.maintenance_schedule = source.name
+		target.maintenance_schedule_detail = s_id
 		
-	def update_sid(source, target, parent):
-		target.prevdoc_detail_docname = s_id
+	def update_sales(source, target, parent):
 		sales_person = frappe.db.get_value('Maintenance Schedule Detail', s_id, 'sales_person')
 		target.service_person = sales_person
 		target.serial_no = ''
@@ -332,16 +333,12 @@ def make_maintenance_visit(source_name, target_doc=None, item_name=None, s_id=No
 			"validation": {
 				"docstatus": ["=", 1]
 			},
-			"postprocess": update_status
+			"postprocess": update_status_and_detail
 		},
 		"Maintenance Schedule Item": {
 			"doctype": "Maintenance Visit Purpose",
-			"field_map": {
-				"parent": "prevdoc_docname",
-				"parenttype": "prevdoc_doctype",
-			},
 			"condition": lambda doc: doc.item_name == item_name,
-			"postprocess": update_sid
+			"postprocess": update_sales
 		}
 	}, target_doc)
 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
index 58ee964fb5f..08282b4c3db 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
@@ -57,16 +57,18 @@ class TestMaintenanceSchedule(unittest.TestCase):
 		test = make_maintenance_visit(source_name = ms.name, item_name = "_Test Item", s_id = s_id)
 		visit = frappe.new_doc('Maintenance Visit')
 		visit = test
+		visit.maintenance_schedule = ms.name
+		visit.maintenance_schedule_detail = s_id
 		visit.completion_status = "Partially Completed"
-
 		visit.set('purposes', [{
 			'item_code': i.item_code,
 			'description': "test",
 			'work_done': "test",
+			'service_person': "Sales Team",
 			'prevdoc_docname' :ms.name,
 			'prevdoc_doctype': ms.doctype,
-			'prevdoc_detail_docname': s_id
 		}])
+		visit.save()
 		visit.submit()
 		ms = frappe.get_doc('Maintenance Schedule', ms.name)