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

fix: ytd gross salary unique label

Browse Source
This commit is contained in:
Devin Slauenwhite
2021-09-01 10:25:11 -04:00
parent 0dea937b89
commit a68b387ac2
1 changed files with 691 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -631,14 +631,14 @@
{ {
"fieldname": "gross_year_to_date", "fieldname": "gross_year_to_date",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Year To Date", "label": "Gross Year To Date",
"options": "currency", "options": "currency",
"read_only": 1 "read_only": 1
}, },
{ {
"fieldname": "base_gross_year_to_date", "fieldname": "base_gross_year_to_date",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Year To Date(Company Currency)", "label": "Gross Year To Date(Company Currency)",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"read_only": 1 "read_only": 1
} }
@@ -647,7 +647,7 @@
"idx": 9, "idx": 9,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-08-28 11:42:52.374549", "modified": "2021-09-01 10:22:52.374549",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Payroll", "module": "Payroll",
"name": "Salary Slip", "name": "Salary Slip",
@@ -689,3 +689,4 @@
"timeline_field": "employee", "timeline_field": "employee",
"title_field": "employee_name" "title_field": "employee_name"
} }