Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 60f3e9ee2930001f8007a09f5b1383589f01c481.
This commit is contained in:
Anurag Mishra 2021-05-06 17:45:58 +05:30 committed by GitHub
parent 60f3e9ee29
commit 80c5c866db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats 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" "label": "Leave Settings"
}, },
{ {
"default": "Leave Approval Notification",
"depends_on": "eval: doc.send_leave_notification == 1", "depends_on": "eval: doc.send_leave_notification == 1",
"fieldname": "leave_approval_notification_template", "fieldname": "leave_approval_notification_template",
"fieldtype": "Link", "fieldtype": "Link",
@ -80,7 +79,6 @@
"options": "Email Template" "options": "Email Template"
}, },
{ {
"default": "Leave Status Notification",
"depends_on": "eval: doc.send_leave_notification == 1", "depends_on": "eval: doc.send_leave_notification == 1",
"fieldname": "leave_status_notification_template", "fieldname": "leave_status_notification_template",
"fieldtype": "Link", "fieldtype": "Link",
@ -157,7 +155,7 @@
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-05-05 12:25:24.082705", "modified": "2021-04-26 10:52:56.192773",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "HR Settings", "name": "HR Settings",

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

@ -423,7 +423,7 @@
{ {
"fieldname": "net_pay_info", "fieldname": "net_pay_info",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Net Pay Info" "label": "net pay info"
}, },
{ {
"fieldname": "net_pay", "fieldname": "net_pay",
@ -631,7 +631,7 @@
"idx": 9, "idx": 9,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-05-05 12:21:27.836273", "modified": "2021-03-31 22:44:09.772331",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Payroll", "module": "Payroll",
"name": "Salary Slip", "name": "Salary Slip",