nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-04-01 15:05:53 +05:30
parent 11eb30d082 bee9c73730
commit 7f7b3608bb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ frappe.ui.form.on('Salary Slip Timesheet', {
}); });
var set_totals = function(frm) { var set_totals = function(frm) {
if (frm.doc.docstatus === 0) { if (frm.doc.docstatus === 0 && frm.doc.doctype === "Salary Slip") {
if (frm.doc.earnings || frm.doc.deductions) { if (frm.doc.earnings || frm.doc.deductions) {
frappe.call({ frappe.call({
method: "set_totals", method: "set_totals",