nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 20:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: default value for Templates (#25591)" (#25608)

Browse Source 
This reverts commit 60f3e9ee29.
This commit is contained in:
Anurag Mishra
2021-05-06 17:45:58 +05:30
committed by GitHub
parent 60f3e9ee29
commit 80c5c866db
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/hr_settings/hr_settings.json
View File

@@ -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",

4
erpnext/payroll/doctype/salary_slip/salary_slip.json
View File

@@ -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",