| commit | 0c9c6c96085654d9daf39dde29bce552ec223496 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Thu Dec 15 11:52:59 2016 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Thu Dec 15 11:52:59 2016 +0530 |
| tree | 990e5d1471c801af8620dbaedb08c13bfbdb82ad | |
| parent | b08aaa5e208f5ca83820440cd7062b828868f783 [diff] | |
| parent | 01fab2ae1ce4f00fdb27378db477233133bdc24d [diff] |
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py index dfa704a..54faa64 100644 --- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -73,7 +73,7 @@ # set joinng date in the same month self.make_employee("test_employee@salary.com") - if getdate(nowdate()).day > 15: + if getdate(nowdate()).day >= 15: date_of_joining = getdate(add_days(nowdate(),-10)) relieving_date = getdate(add_days(nowdate(),-10)) elif getdate(nowdate()).day < 15 and getdate(nowdate()).day > 5: