commit f2ee3cec19862ba364202e02fd58839c0fabc9a1
author Nabin Hait <nabinhait@gmail.com> Thu Jun 12 10:19:27 2014 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Jun 12 10:19:27 2014 +0530
tree 6ff96a103d43c660e5239d7e132bfa3223d25c2c
parent 94c17bdf854edb9a3e67d42b7e43b5423f325f37
parent 589a2980960cd201e79058b3886cdb81c4722242

Merge pull request #1784 from nabinhait/v4-hotfix

Minor fixes in salary manager. Fixes #1754

erpnext/hr/doctype/salary_manager/salary_manager.py

diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.py b/erpnext/hr/doctype/salary_manager/salary_manager.py
index dcc1665..7d962e3 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.py
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.py
@@ -128,7 +128,7 @@
 		for ss in ss_list:
 			ss_obj = frappe.get_doc("Salary Slip",ss[0])
 			try:
-				frappe.db.set(ss_obj, 'email_check', cint(self.send_mail))
+				frappe.db.set(ss_obj, 'email_check', cint(self.send_email))
 				if cint(self.send_email) == 1:
 					ss_obj.send_mail_funct()