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

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

Browse Source
This commit is contained in:
Nabin Hait 2016-12-15 11:52:59 +05:30
commit 0c9c6c9608
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ class TestSalarySlip(unittest.TestCase):
# set joinng date in the same month # set joinng date in the same month
self.make_employee("test_employee@salary.com") 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)) date_of_joining = getdate(add_days(nowdate(),-10))
relieving_date = getdate(add_days(nowdate(),-10)) relieving_date = getdate(add_days(nowdate(),-10))
elif getdate(nowdate()).day < 15 and getdate(nowdate()).day > 5: elif getdate(nowdate()).day < 15 and getdate(nowdate()).day > 5: