diff --git a/erpnext/hr/doctype/employee_promotion/employee_promotion.json b/erpnext/hr/doctype/employee_promotion/employee_promotion.json
index a7d49bcad36..845eaf98902 100644
--- a/erpnext/hr/doctype/employee_promotion/employee_promotion.json
+++ b/erpnext/hr/doctype/employee_promotion/employee_promotion.json
@@ -189,7 +189,7 @@
    "label": "Employee Promotion Detail", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Employee Promotion Detail", 
+   "options": "Employee Property History", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
diff --git a/erpnext/hr/doctype/employee_property_history/employee_property_history.py b/erpnext/hr/doctype/employee_property_history/employee_property_history.py~HEAD
similarity index 100%
rename from erpnext/hr/doctype/employee_property_history/employee_property_history.py
rename to erpnext/hr/doctype/employee_property_history/employee_property_history.py~HEAD
diff --git a/erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656) b/erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656)
new file mode 100644
index 00000000000..fb67852d164
--- /dev/null
+++ b/erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656)	
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeePropertyHistory(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_transfer/employee_transfer.json b/erpnext/hr/doctype/employee_transfer/employee_transfer.json
index 55fa073fa20..6b8d403159a 100644
--- a/erpnext/hr/doctype/employee_transfer/employee_transfer.json
+++ b/erpnext/hr/doctype/employee_transfer/employee_transfer.json
@@ -221,7 +221,7 @@
    "label": "Employee Transfer Detail", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Employee Transfer Detail", 
+   "options": "Employee Property History", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index 1d1aef2045e..02f585d68ee 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -113,7 +113,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "max_days_allowed", 
+   "fieldname": "max_continuous_days_allowed", 
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0,