diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json index 48cef04a8d..3db6c239ef 100644 --- a/erpnext/hr/doctype/hr_settings/hr_settings.json +++ b/erpnext/hr/doctype/hr_settings/hr_settings.json @@ -71,7 +71,6 @@ "label": "Leave Settings" }, { - "default": "Leave Approval Notification", "depends_on": "eval: doc.send_leave_notification == 1", "fieldname": "leave_approval_notification_template", "fieldtype": "Link", @@ -80,7 +79,6 @@ "options": "Email Template" }, { - "default": "Leave Status Notification", "depends_on": "eval: doc.send_leave_notification == 1", "fieldname": "leave_status_notification_template", "fieldtype": "Link", @@ -157,7 +155,7 @@ "idx": 1, "issingle": 1, "links": [], - "modified": "2021-05-05 12:25:24.082705", + "modified": "2021-04-26 10:52:56.192773", "modified_by": "Administrator", "module": "HR", "name": "HR Settings", diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.json b/erpnext/payroll/doctype/salary_slip/salary_slip.json index 27409ccff2..42a0f290cb 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.json +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.json @@ -423,7 +423,7 @@ { "fieldname": "net_pay_info", "fieldtype": "Section Break", - "label": "Net Pay Info" + "label": "net pay info" }, { "fieldname": "net_pay", @@ -631,7 +631,7 @@ "idx": 9, "is_submittable": 1, "links": [], - "modified": "2021-05-05 12:21:27.836273", + "modified": "2021-03-31 22:44:09.772331", "modified_by": "Administrator", "module": "Payroll", "name": "Salary Slip",