diff options
| author | Yannick Tivisse <yti@odoo.com> | 2020-05-13 13:22:25 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2020-05-15 07:06:59 +0000 |
| commit | 152097d099a17dbfbfc3e37cd4cf3bf035fae9a4 (patch) | |
| tree | b66fbe8ed92361cc354a9df917d29af37d4773b7 /addons/hr_expense/models | |
| parent | b6537c4335356ed660d2acbd914783d4ceea2521 (diff) | |
[IMP] hr*: Use correct default employee_id based on company
Followup of https://github.com/odoo/odoo/pull/50982/commits
Courtesy of https://github.com/sswapnesh
In a multi-company environment `self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)` could be wrong while `employee_id`represents correct employee based on company.
https://github.com/odoo/odoo/blob/fb17af76d791488c69eb3829376940b32998d374/addons/hr/models/res_users.py#L13
Making behavior Similar to https://github.com/odoo/odoo/blob/fb17af76d791488c69eb3829376940b32998d374/addons/hr_expense/models/hr_expense.py#L663
closes odoo/odoo#51246
Taskid: 2254687
X-original-commit: d7d1557e7a0f613335a9ca5ca1355d246093f9d1
Related: odoo/enterprise#10599
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/hr_expense/models')
| -rw-r--r-- | addons/hr_expense/models/hr_expense.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index 51888cee2b3..a84b483ae98 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -18,7 +18,7 @@ class HrExpense(models.Model): @api.model def _default_employee_id(self): - return self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) + return self.env.user.employee_id @api.model def _default_product_uom_id(self): @@ -35,7 +35,7 @@ class HrExpense(models.Model): res = "['|', ('company_id', '=', False), ('company_id', '=', company_id)]" # Then, domain accepts everything elif self.user_has_groups('hr_expense.group_hr_expense_team_approver') and self.env.user.employee_ids: user = self.env.user - employee = user.employee_ids[0] + employee = self.env.user.employee_id res = [ '|', '|', '|', ('department_id.manager_id', '=', employee.id), @@ -44,8 +44,8 @@ class HrExpense(models.Model): ('expense_manager_id', '=', user.id), '|', ('company_id', '=', False), ('company_id', '=', employee.company_id.id), ] - elif self.env.user.employee_ids: - employee = self.env.user.employee_ids[0] + elif self.env.user.employee_id: + employee = self.env.user.employee_id res = [('id', '=', employee.id), '|', ('company_id', '=', False), ('company_id', '=', employee.company_id.id)] return res |