pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_timesheet: Avoid calling super() into the void

Browse Source 
Before this commit:
In helpdesk_timesheet, we have a compute_task_id with super.
But in hr_timesheet, task_id is not a compute field, so this
compute has no effect.

After this commit:
Task_id is changed to compute stored field.

taskId 2285926

closes odoo/odoo#54117

Related: odoo/enterprise#11682
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
jbm-odoo
2020-07-09 07:15:26 +00:00
committed by Yannick Tivisse
parent 8d02a85c1d
commit ec52933bce
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/models/hr_timesheet.py
+6 -10
View File
@@ -39,10 +39,10 @@ class AccountAnalyticLine(models.Model):
return []
task_id = fields.Many2one(
'project.task', 'Task', index=True,
'project.task', 'Task', compute='_compute_project_task_id', store=True, readonly=False, index=True,
domain="[('company_id', '=', company_id), ('project_id.allow_timesheets', '=', True), ('project_id', '=?', project_id)]")
project_id = fields.Many2one(
'project.project', 'Project', compute='_compute_project_id', store=True, readonly=False,
'project.project', 'Project', compute='_compute_project_task_id', store=True, readonly=False,
domain=_domain_project_id)
user_id = fields.Many2one(compute='_compute_user_id', store=True, readonly=False)
employee_id = fields.Many2one('hr.employee', "Employee", check_company=True, domain=_domain_employee_id)
@@ -53,16 +53,12 @@ class AccountAnalyticLine(models.Model):
for analytic_line in self:
analytic_line.encoding_uom_id = analytic_line.company_id.timesheet_encode_uom_id
@api.onchange('project_id')
def onchange_project_id(self):
if self.project_id and self.project_id != self.task_id.project_id:
# reset task when changing project
self.task_id = False
@api.depends('task_id.project_id')
def _compute_project_id(self):
@api.depends('task_id', 'task_id.project_id', 'project_id')
def _compute_project_task_id(self):
for line in self.filtered(lambda line: not line.project_id):
line.project_id = line.task_id.project_id
for line in self.filtered(lambda line: not line.project_id and line.project_id != line.task_id.project_id):
line.task_id = False
@api.depends('employee_id')
def _compute_user_id(self):