Skip to content

Commit 8ce1d91

Browse files
committed
Merge PR #786 into 16.0
Signed-off-by Saran440
2 parents 6500098 + 11d82b7 commit 8ce1d91

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

hr_timesheet_sheet_autodraft/models/account_analytic_line.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def _get_autodraft_sheet_values(self):
4444
self.company_id, self.date
4545
),
4646
"date_end": HrTimesheetSheet._get_period_end(self.company_id, self.date),
47+
"department_id": self.employee_id.department_id.id,
4748
}
4849

4950
def action_autodraft_timesheet_sheets(self):

hr_timesheet_sheet_autodraft/tests/test_hr_timesheet_sheet_autodraft.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ def setUp(self):
1111
self.ResUsers = self.env["res.users"]
1212
self.Company = self.env["res.company"]
1313
self.Project = self.env["project.project"]
14+
self.HrDepartment = self.env["hr.department"]
1415
self.HrEmployee = self.env["hr.employee"]
1516
self.HrTimesheetSheet = self.env["hr_timesheet.sheet"]
1617
self.AccountAnalyticLine = self.env["account.analytic.line"]
@@ -43,7 +44,10 @@ def test_autocreate(self):
4344
"company_id": self.company_id.id,
4445
}
4546
)
46-
employee = self.HrEmployee.create({"name": "Employee", "user_id": user.id})
47+
department = self.HrDepartment.create({"name": "Department 1"})
48+
employee = self.HrEmployee.create(
49+
{"name": "Employee", "user_id": user.id, "department_id": department.id}
50+
)
4751
project = self.Project.create({"name": "Project"})
4852

4953
aal_1 = self.AccountAnalyticLine.create(
@@ -67,6 +71,7 @@ def test_autocreate(self):
6771
self.assertTrue(aal_1.sheet_id)
6872
self.assertTrue(aal_2.sheet_id)
6973
self.assertEqual(aal_1.sheet_id, aal_2.sheet_id)
74+
self.assertEqual(aal_1.sheet_id.department_id, employee.department_id)
7075

7176
def test_already_confirmed(self):
7277
user = self.ResUsers.sudo().create(

0 commit comments

Comments
 (0)