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

fix: tests (#29051)

Browse Source 
* fix(test): create salary slip as per timesheet dates for Project Profitability

* fix(test): reload salary slip before checking for payment days
This commit is contained in:
Rucha Mahabal 2021-12-28 17:09:46 +05:30 committed by GitHub
parent 087ebcae5a
commit 88df5ce530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/payroll/doctype/salary_slip/test_salary_slip.py
View File

@ -171,6 +171,7 @@ class TestSalarySlip(unittest.TestCase):
salary_slip.end_date = month_end_date salary_slip.end_date = month_end_date
salary_slip.save() salary_slip.save()
salary_slip.submit() salary_slip.submit()
salary_slip.reload()
no_of_days = self.get_no_of_days() no_of_days = self.get_no_of_days()
days_in_month = no_of_days[0] days_in_month = no_of_days[0]

5
erpnext/projects/report/project_profitability/test_project_profitability.py
View File

@ -25,6 +25,7 @@ class TestProjectProfitability(unittest.TestCase):
self.timesheet = make_timesheet(emp, is_billable=1) self.timesheet = make_timesheet(emp, is_billable=1)
self.salary_slip = make_salary_slip(self.timesheet.name) self.salary_slip = make_salary_slip(self.timesheet.name)
self.salary_slip.start_date = self.timesheet.start_date
holidays = self.salary_slip.get_holidays_for_employee(date, date) holidays = self.salary_slip.get_holidays_for_employee(date, date)
if holidays: if holidays:
@ -41,8 +42,8 @@ class TestProjectProfitability(unittest.TestCase):
def test_project_profitability(self): def test_project_profitability(self):
filters = { filters = {
'company': '_Test Company', 'company': '_Test Company',
'start_date': add_days(getdate(), -3), 'start_date': add_days(self.timesheet.start_date, -3),
'end_date': getdate() 'end_date': self.timesheet.start_date
} }
report = execute(filters) report = execute(filters)