| commit | e9b5e7cb855879c8ed0d5129e9b4190d978fcda0 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Mon Dec 03 17:27:34 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Mon Dec 03 17:27:34 2012 +0530 |
| tree | ecc6e77a705c7765e942732d8266db4ecd9c32d3 | |
| parent | 74c4cc1845d4e40b9387d6f378fc8cf653191f01 [diff] | |
| parent | 4c70cd974ae23efc55dae1ffac4f0f6b328ecfef [diff] |
Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/salary_manager/salary_manager.py b/hr/doctype/salary_manager/salary_manager.py index d8f1288..45b78a6 100644 --- a/hr/doctype/salary_manager/salary_manager.py +++ b/hr/doctype/salary_manager/salary_manager.py
@@ -48,7 +48,7 @@ from `tabEmployee` t1, `tabSalary Structure` t2 where t1.docstatus!=2 and t2.docstatus != 2 and t1.name = t2.employee - %s """% cond, debug=1) + %s """% cond) return emp_list