From 188ef256d26d92f639166c897769354a9337e375 Mon Sep 17 00:00:00 2001 From: Joel Zilli Date: Fri, 2 Dec 2022 12:51:08 +0000 Subject: [PATCH] [FIX]hr_timesheet_attendance_ux: change domain in task_id X-original-commit: 629936e08947b1946f53c7d38085d9f8c218c8b0 --- hr_timesheet_attendance_ux/__manifest__.py | 6 ++++++ hr_timesheet_attendance_ux/models/account_analytic_line.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hr_timesheet_attendance_ux/__manifest__.py b/hr_timesheet_attendance_ux/__manifest__.py index 4d9ec5a..272ea27 100644 --- a/hr_timesheet_attendance_ux/__manifest__.py +++ b/hr_timesheet_attendance_ux/__manifest__.py @@ -19,7 +19,13 @@ ############################################################################## { "name": "Attendance Timesheet UX", +<<<<<<< HEAD 'version': "16.0.1.0.0", +||||||| parent of f361e76... temp + 'version': "15.0.1.0.0", +======= + 'version': "15.0.1.1.0", +>>>>>>> f361e76... temp 'category': 'Human Resources', 'sequence': 14, 'author': 'ADHOC SA', diff --git a/hr_timesheet_attendance_ux/models/account_analytic_line.py b/hr_timesheet_attendance_ux/models/account_analytic_line.py index 4149cba..5433b78 100644 --- a/hr_timesheet_attendance_ux/models/account_analytic_line.py +++ b/hr_timesheet_attendance_ux/models/account_analytic_line.py @@ -7,7 +7,7 @@ class AccountAnalyticLine(models.Model): _inherit = "account.analytic.line" task_id = fields.Many2one( - domain="[('company_id', '=', company_id), ('project_id.allow_timesheets', '=', True), ('project_id', '=?', project_id), ('stage_id.fold', '=', False)]") + domain="[('project_id.allow_timesheets', '=', True), ('project_id', '=?', project_id), ('stage_id.fold', '=', False)]") @api.onchange('employee_id', 'date') def onchange_compute_hours(self):