nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Payroll): compute Year to Date for Salary Slip components

Browse Source
This commit is contained in:
Rucha Mahabal
2021-01-14 00:40:58 +05:30
committed by Deepesh Garg
parent ca966601a2
commit 10c069588f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/payroll/doctype/salary_detail/salary_detail.json
View File

@@ -9,6 +9,7 @@
"abbr", "abbr",
"column_break_3", "column_break_3",
"amount", "amount",
"year_to_date",
"section_break_5", "section_break_5",
"additional_salary", "additional_salary",
"statistical_component", "statistical_component",
@@ -226,11 +227,19 @@
{ {
"fieldname": "column_break_24", "fieldname": "column_break_24",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"description": "Total amount spent on this salary component from the beginning of the year (payroll or fiscal) to the current payroll date.",
"fieldname": "year_to_date",
"fieldtype": "Currency",
"label": "Year To Date",
"options": "currency",
"read_only": 1
} }
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-11-25 13:12:41.081106", "modified": "2021-01-13 17:33:19.184195",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Payroll", "module": "Payroll",
"name": "Salary Detail", "name": "Salary Detail",

8
erpnext/payroll/doctype/salary_slip/salary_slip.js
View File

@@ -138,11 +138,11 @@ frappe.ui.form.on("Salary Slip", {
}, },
change_grid_labels: function(frm) { change_grid_labels: function(frm) {
frm.set_currency_labels(["amount", "default_amount", "additional_amount", "tax_on_flexible_benefit", let fields = ["amount", "year_to_date", "default_amount", "additional_amount", "tax_on_flexible_benefit",
"tax_on_additional_salary"], frm.doc.currency, "earnings"); "tax_on_additional_salary"];
frm.set_currency_labels(["amount", "default_amount", "additional_amount", "tax_on_flexible_benefit", frm.set_currency_labels(fields, frm.doc.currency, "earnings");
"tax_on_additional_salary"], frm.doc.currency, "deductions"); frm.set_currency_labels(fields, frm.doc.currency, "deductions");
}, },
refresh: function(frm) { refresh: function(frm) {