Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14468 from manassolanki/fix-travis-1

Browse Source 
fix the salary slip test cases
This commit is contained in:
Manas Solanki 2018-06-11 19:29:28 +05:30 committed by GitHub
commit d7f6d45e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -447,7 +447,7 @@ class SalarySlip(TransactionBase):
else: else:
self.set_status() self.set_status()
self.update_status(self.name) self.update_status(self.name)
if(frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")) and not frappe.flags.via_payroll_entry: if (frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")) and not frappe.flags.via_payroll_entry:
self.email_salary_slip() self.email_salary_slip()
def on_cancel(self): def on_cancel(self):
@ -466,7 +466,10 @@ class SalarySlip(TransactionBase):
"reference_doctype": self.doctype, "reference_doctype": self.doctype,
"reference_name": self.name "reference_name": self.name
} }
enqueue(method=frappe.sendmail, queue='short', timeout=300, async=True, **email_args) if not frappe.flags.in_test:
enqueue(method=frappe.sendmail, queue='short', timeout=300, async=True, **email_args)
else:
frappe.sendmail(**email_args)
else: else:
msgprint(_("{0}: Employee email not found, hence email not sent").format(self.employee_name)) msgprint(_("{0}: Employee email not found, hence email not sent").format(self.employee_name))

2
erpnext/hr/doctype/salary_slip/test_salary_slip.py
View File

@ -279,7 +279,7 @@ def make_salary_structure(sal_struct, payroll_frequency, employee):
"payroll_frequency": payroll_frequency, "payroll_frequency": payroll_frequency,
"payment_account": get_random("Account") "payment_account": get_random("Account")
}).insert() }).insert()
create_salary_structure_assignment(employee, salary_structure) create_salary_structure_assignment(employee, salary_structure.name)
elif not frappe.db.get_value("Salary Structure Assignment",{'salary_structure':sal_struct, 'employee':employee},'name'): elif not frappe.db.get_value("Salary Structure Assignment",{'salary_structure':sal_struct, 'employee':employee},'name'):
create_salary_structure_assignment(employee, sal_struct) create_salary_structure_assignment(employee, sal_struct)