diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 6d61fe3..431adfb 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -22,6 +22,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "",
+   "fetch_if_empty": 0,
    "fieldname": "naming_series",
    "fieldtype": "Select",
    "hidden": 0,
@@ -55,6 +56,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "employee",
    "fieldtype": "Link",
    "hidden": 0,
@@ -90,6 +92,7 @@
    "collapsible": 0,
    "columns": 0,
    "fetch_from": "employee.employee_name",
+   "fetch_if_empty": 0,
    "fieldname": "employee_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -122,6 +125,7 @@
    "collapsible": 0,
    "columns": 0,
    "fetch_from": "employee.department",
+   "fetch_if_empty": 0,
    "fieldname": "department",
    "fieldtype": "Link",
    "hidden": 0,
@@ -155,6 +159,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break1",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -186,6 +191,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "leave_type",
    "fieldtype": "Link",
    "hidden": 0,
@@ -220,6 +226,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "from_date",
    "fieldtype": "Date",
    "hidden": 0,
@@ -252,6 +259,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "to_date",
    "fieldtype": "Date",
    "hidden": 0,
@@ -284,6 +292,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "section_break_6",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -316,6 +325,8 @@
    "bold": 1,
    "collapsible": 0,
    "columns": 0,
+   "depends_on": "eval: doc.is_carry_forward != 1",
+   "fetch_if_empty": 0,
    "fieldname": "new_leaves_allocated",
    "fieldtype": "Float",
    "hidden": 0,
@@ -347,7 +358,76 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "depends_on": "eval: doc.is_carry_forward == 1",
+   "fetch_if_empty": 0,
+   "fieldname": "old_leaves_allocated",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Old Leaves Allocated",
+   "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": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "is_carry_forward",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "is carry forward",
+   "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": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "carry_forward",
    "fieldtype": "Check",
    "hidden": 0,
@@ -380,6 +460,7 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "carry_forward",
+   "fetch_if_empty": 0,
    "fieldname": "carry_forwarded_leaves",
    "fieldtype": "Float",
    "hidden": 0,
@@ -411,6 +492,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "total_leaves_allocated",
    "fieldtype": "Float",
    "hidden": 0,
@@ -443,6 +525,7 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "eval:doc.total_leaves_encashed>0",
+   "fetch_if_empty": 0,
    "fieldname": "total_leaves_encashed",
    "fieldtype": "Float",
    "hidden": 0,
@@ -475,6 +558,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_10",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -506,6 +590,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "compensatory_request",
    "fieldtype": "Link",
    "hidden": 0,
@@ -539,6 +624,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "leave_period",
    "fieldtype": "Link",
    "hidden": 0,
@@ -572,6 +658,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "amended_from",
    "fieldtype": "Link",
    "hidden": 0,
@@ -606,6 +693,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "notes",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -638,6 +726,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "description",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -667,17 +756,15 @@
   }
  ],
  "has_web_view": 0,
- "hide_heading": 0,
  "hide_toolbar": 0,
  "icon": "fa fa-ok",
  "idx": 1,
- "image_view": 0,
  "in_create": 0,
  "is_submittable": 1,
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-30 11:28:09.360525",
+ "modified": "2019-04-04 15:09:33.421008",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Allocation",
@@ -724,7 +811,6 @@
  ],
  "quick_entry": 0,
  "read_only": 0,
- "read_only_onload": 0,
  "search_fields": "employee,employee_name,leave_type,total_leaves_allocated",
  "show_name_in_global_search": 1,
  "sort_field": "modified",