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

2020-12-31 17:41:34 +05:30 · 2020-12-31 17:41:34 +05:30 · 4edcf813e7
commit 4edcf813e7
parent e69148c266 d7ea2bd705
1 changed files with 10 additions and 8 deletions
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.js
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.js
@ -214,6 +214,7 @@ frappe.ui.form.on('Salary Slip Timesheet', {
 });

 var calculate_totals = function(frm) {
+	if (frm.doc.docstatus === 0) {
 		if (frm.doc.earnings || frm.doc.deductions) {
 			frappe.call({
 				method: "set_totals",
@ -223,6 +224,7 @@ var calculate_totals = function(frm) {
 				}
 			});
 		}
+	}
 };

 frappe.ui.form.on('Salary Detail', {