diff --git a/erpnext/hr/doctype/employee_promotion/employee_promotion.json b/erpnext/hr/doctype/employee_promotion/employee_promotion.json
index 1dee7ea..0bf2031 100644
--- a/erpnext/hr/doctype/employee_promotion/employee_promotion.json
+++ b/erpnext/hr/doctype/employee_promotion/employee_promotion.json
@@ -157,7 +157,7 @@
    "label": "Employee Promotion Detail", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Employee Promotion Detail", 
+   "options": "Employee Property History", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -213,7 +213,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-13 18:34:01.662392", 
+ "modified": "2018-04-14 11:45:04.685356", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Promotion", 
diff --git a/erpnext/hr/doctype/employee_promotion_detail/employee_promotion_detail.json b/erpnext/hr/doctype/employee_promotion_detail/employee_promotion_detail.json
deleted file mode 100644
index 56823ea..0000000
--- a/erpnext/hr/doctype/employee_promotion_detail/employee_promotion_detail.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-04-13 18:32:35.242437", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 4, 
-   "fieldname": "property", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Property", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "current", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Current", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "new", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "New", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-04-13 18:37:09.265584", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Employee Promotion Detail", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_promotion_detail/employee_promotion_detail.py b/erpnext/hr/doctype/employee_promotion_detail/employee_promotion_detail.py
deleted file mode 100644
index 35f1297..0000000
--- a/erpnext/hr/doctype/employee_promotion_detail/employee_promotion_detail.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- 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 EmployeePromotionDetail(Document):
-	pass
diff --git a/erpnext/hr/doctype/employee_promotion_detail/__init__.py b/erpnext/hr/doctype/employee_property_history/__init__.py
similarity index 100%
rename from erpnext/hr/doctype/employee_promotion_detail/__init__.py
rename to erpnext/hr/doctype/employee_property_history/__init__.py
diff --git a/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.json b/erpnext/hr/doctype/employee_property_history/employee_property_history.json
similarity index 96%
rename from erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.json
rename to erpnext/hr/doctype/employee_property_history/employee_property_history.json
index 3ec8ffe..7a416b2 100644
--- a/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.json
+++ b/erpnext/hr/doctype/employee_property_history/employee_property_history.json
@@ -116,10 +116,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-04-13 18:38:59.649399", 
+ "modified": "2018-04-14 11:44:36.458039", 
  "modified_by": "Administrator", 
  "module": "HR", 
- "name": "Employee Transfer Detail", 
+ "name": "Employee Property History", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
diff --git a/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.py b/erpnext/hr/doctype/employee_property_history/employee_property_history.py
similarity index 85%
rename from erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.py
rename to erpnext/hr/doctype/employee_property_history/employee_property_history.py
index d23c4fe..fb67852 100644
--- a/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.py
+++ b/erpnext/hr/doctype/employee_property_history/employee_property_history.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class EmployeeTransferDetail(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 78da7c5..5d0a367 100644
--- a/erpnext/hr/doctype/employee_transfer/employee_transfer.json
+++ b/erpnext/hr/doctype/employee_transfer/employee_transfer.json
@@ -189,7 +189,7 @@
    "label": "Employee Transfer Detail", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Employee Transfer Detail", 
+   "options": "Employee Property History", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -307,7 +307,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-13 18:33:00.045834", 
+ "modified": "2018-04-14 11:45:36.493830", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Transfer", 
diff --git a/erpnext/hr/doctype/employee_transfer_detail/__init__.py b/erpnext/hr/doctype/employee_transfer_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/hr/doctype/employee_transfer_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.js b/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.js
deleted file mode 100644
index c453d9d..0000000
--- a/erpnext/hr/doctype/employee_transfer_detail/employee_transfer_detail.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Employee Transfer Detail', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/erpnext/hr/doctype/employee_transfer_detail/test_employee_transfer_detail.js b/erpnext/hr/doctype/employee_transfer_detail/test_employee_transfer_detail.js
deleted file mode 100644
index 8fa15ea..0000000
--- a/erpnext/hr/doctype/employee_transfer_detail/test_employee_transfer_detail.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-// rename this file from _test_[name] to test_[name] to activate
-// and remove above this line
-
-QUnit.test("test: Employee Transfer Detail", function (assert) {
-	let done = assert.async();
-
-	// number of asserts
-	assert.expect(1);
-
-	frappe.run_serially([
-		// insert a new Employee Transfer Detail
-		() => frappe.tests.make('Employee Transfer Detail', [
-			// values to be set
-			{key: 'value'}
-		]),
-		() => {
-			assert.equal(cur_frm.doc.key, 'value');
-		},
-		() => done()
-	]);
-
-});
diff --git a/erpnext/hr/doctype/employee_transfer_detail/test_employee_transfer_detail.py b/erpnext/hr/doctype/employee_transfer_detail/test_employee_transfer_detail.py
deleted file mode 100644
index 7537f34..0000000
--- a/erpnext/hr/doctype/employee_transfer_detail/test_employee_transfer_detail.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-class TestEmployeeTransferDetail(unittest.TestCase):
-	pass
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index 6b0433f..1a001c5 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, 
@@ -746,7 +746,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-13 19:54:03.588288", 
+ "modified": "2018-04-14 11:53:59.503513", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Type", 
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 71802b4..8eab16d 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -523,3 +523,4 @@
 erpnext.patches.v11_0.add_default_email_template_for_leave
 erpnext.patches.v11_0.set_default_email_template_in_hr
 erpnext.patches.v10_0.taxes_issue_with_pos
+erpnext.patches.v11_0.rename_field_max_days_allowed
diff --git a/erpnext/patches/v11_0/rename_field_max_days_allowed.py b/erpnext/patches/v11_0/rename_field_max_days_allowed.py
new file mode 100644
index 0000000..bdf87f4
--- /dev/null
+++ b/erpnext/patches/v11_0/rename_field_max_days_allowed.py
@@ -0,0 +1,7 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	frappe.reload_doc("hr", "doctype", "leave_type")
+	frappe.db.sql("""ALTER table `tabLeave Type` modify max_days_allowed int(8) NOT NULL""")
+	rename_field("Leave Type", "max_days_allowed", "max_continuous_days_allowed") 
\ No newline at end of file