fix: UX changes

erpnext/hr/doctype/leave_application/leave_application.json

@@ -485,7 +485,7 @@
    "read_only": 0,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
    "translatable": 0,
@@ -507,6 +507,7 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
+   "label": "Approval",
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
@@ -652,39 +653,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "salary_slip",
-   "fieldtype": "Link",
-   "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": "Salary Slip",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Salary Slip",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "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,
@@ -748,6 +716,38 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "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": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 1,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -780,38 +780,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "color",
-   "fieldtype": "Color",
-   "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": "Color",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "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,
@@ -849,7 +817,7 @@
     "bold": 0,
     "collapsible": 0,
     "columns": 0,
-   "fieldname": "company",
+    "fieldname": "salary_slip",
     "fieldtype": "Link",
     "hidden": 0,
     "ignore_user_permissions": 0,
@@ -858,17 +826,18 @@
     "in_global_search": 0,
     "in_list_view": 0,
     "in_standard_filter": 0,
-   "label": "Company",
+    "label": "Salary Slip",
     "length": 0,
     "no_copy": 0,
-   "options": "Company",
+    "options": "Salary Slip",
     "permlevel": 0,
-   "print_hide": 0,
+    "precision": "",
+    "print_hide": 1,
     "print_hide_if_no_value": 0,
     "read_only": 0,
-   "remember_last_selected_value": 1,
+    "remember_last_selected_value": 0,
     "report_hide": 0,
-   "reqd": 1,
+    "reqd": 0,
     "search_index": 0,
     "set_only_once": 0,
     "translatable": 0,
@@ -906,6 +875,38 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "color",
+   "fieldtype": "Color",
+   "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": "Color",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "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,
@@ -950,7 +951,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 3,
- "modified": "2019-01-30 11:28:14.745572",
+ "modified": "2019-05-30 11:28:14.745572",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Application",

erpnext/hr/doctype/leave_ledger_entry/leave_ledger_entry.json

@@ -9,6 +9,7 @@
   "transaction_type",
   "transaction_name",
   "leaves",
+  "column_break_7",
   "from_date",
   "to_date",
   "is_carry_forward",
@@ -20,6 +21,7 @@
    "fieldname": "employee",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Employee",
    "options": "Employee"
   },
@@ -32,6 +34,7 @@
    "fieldname": "leave_type",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Leave Type",
    "options": "Leave Type"
   },
@@ -83,11 +86,15 @@
    "fieldname": "is_expired",
    "fieldtype": "Check",
    "label": "Is Expired"
+  },
+  {
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break"
   }
  ],
  "in_create": 1,
  "is_submittable": 1,
- "modified": "2019-05-29 15:58:29.656351",
+ "modified": "2019-05-30 14:45:16.577534",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Ledger Entry",
@@ -149,5 +156,6 @@
   }
  ],
  "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_order": "ASC",
+ "title_field": "employee"
 }

erpnext/hr/doctype/leave_period/leave_period.json

@@ -77,6 +77,38 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_active",
+   "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 Active",
+   "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,
@@ -141,38 +173,6 @@
    "translatable": 0,
    "unique": 0
   },
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_active", 
-   "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 Active", 
-   "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,
@@ -217,7 +217,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2018-08-21 16:15:43.305502", 
+ "modified": "2019-05-30 16:15:43.305502",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Period",

erpnext/hr/doctype/leave_type/leave_type.json

@@ -418,7 +418,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "default": "1",
    "depends_on": "",
    "description": "calculated in days",
    "fetch_if_empty": 0,
@@ -431,7 +430,7 @@
    "in_global_search": 0,
    "in_list_view": 0,
    "in_standard_filter": 0,
-   "label": "Carry Forward Leave Expiry",
+   "label": "Expire Carried Forward Leaves",
    "length": 0,
    "no_copy": 0,
    "permlevel": 0,
@@ -729,7 +728,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-04-11 15:38:39.334283",
+ "modified": "2019-05-30 15:38:39.334283",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Type",

erpnext/patches/v12_0/generate_leave_ledger_entries.py

@@ -8,6 +8,7 @@ def execute():
     """ Generates leave ledger entries for leave allocation/application/encashment
         for last allocation """
     frappe.reload_doc("HR","doctype", "Leave Ledger Entry")
+    frappe.reload_doc("HR","doctype", "Leave Encashment")
     if frappe.db.a_row_exists("Leave Ledger Entry"):
         return