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

Merge branch 'develop' into allow-cancel-leave-policy

Browse Source
This commit is contained in:
Afshan
2020-12-31 17:41:34 +05:30
committed by GitHub
parent e69148c266 d7ea2bd705
commit 4edcf813e7
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,7 @@ frappe.ui.form.on('Salary Slip Timesheet', {
}); });
var calculate_totals = function(frm) { var calculate_totals = function(frm) {
if (frm.doc.docstatus === 0) {
if (frm.doc.earnings || frm.doc.deductions) { if (frm.doc.earnings || frm.doc.deductions) {
frappe.call({ frappe.call({
method: "set_totals", method: "set_totals",
@@ -223,6 +224,7 @@ var calculate_totals = function(frm) {
} }
}); });
} }
}
}; };
frappe.ui.form.on('Salary Detail', { frappe.ui.form.on('Salary Detail', {