diff --git a/addons/hr_timesheet/models/hr_timesheet.py b/addons/hr_timesheet/models/hr_timesheet.py index 40c3bc39f3b..e77b3833098 100644 --- a/addons/hr_timesheet/models/hr_timesheet.py +++ b/addons/hr_timesheet/models/hr_timesheet.py @@ -26,11 +26,9 @@ class AccountAnalyticLine(models.Model): @api.model def default_get(self, field_list): result = super(AccountAnalyticLine, self).default_get(field_list) - if 'encoding_uom_id' in field_list: - result['encoding_uom_id'] = self.env.company.timesheet_encode_uom_id.id if not self.env.context.get('default_employee_id') and 'employee_id' in field_list and result.get('user_id'): result['employee_id'] = self.env['hr.employee'].search([('user_id', '=', result['user_id']), ('company_id', '=', result.get('company_id', self.env.company.id))], limit=1).id - if not self._context.get('default_project_id') and 'project_id' in field_list: + if not self._context.get('default_project_id') and self._context.get('is_timesheet'): employee_id = result.get('employee_id', self.env.context.get('default_employee_id', False)) favorite_project_id = self._get_favorite_project_id(employee_id) if favorite_project_id: diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml index a4c598008d0..697757f6fd5 100644 --- a/addons/hr_timesheet/views/hr_timesheet_views.xml +++ b/addons/hr_timesheet/views/hr_timesheet_views.xml @@ -274,6 +274,7 @@ [('project_id', '!=', False), ('user_id', '=', uid)] { "search_default_week":1, + "is_timesheet": 1, } @@ -336,6 +337,9 @@ Task's Timesheets account.analytic.line + { + 'is_timesheet': 1, + } [('task_id', 'in', active_ids)] tree @@ -344,6 +348,9 @@ Project's Timesheets account.analytic.line + { + 'is_timesheet': 1, + } [('project_id', 'in', active_ids)] tree @@ -357,6 +364,7 @@ [('project_id', '!=', False)] { 'search_default_week':1, + 'is_timesheet': 1, }

diff --git a/addons/hr_timesheet/views/hr_views.xml b/addons/hr_timesheet/views/hr_views.xml index 3790953e8b7..15eab5d169a 100644 --- a/addons/hr_timesheet/views/hr_views.xml +++ b/addons/hr_timesheet/views/hr_views.xml @@ -9,7 +9,8 @@ { 'search_default_month':1, 'search_default_employee_id': [active_id], - 'default_employee_id': active_id + 'default_employee_id': active_id, + "is_timesheet": 1, } diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 44756de5497..ed560aead8f 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -7,7 +7,10 @@ tree,kanban,pivot,graph,form [('project_id', '=', active_id)] - {"default_project_id": active_id} + { + "default_project_id": active_id, + "is_timesheet": 1, + }

diff --git a/addons/sale_timesheet/views/account_invoice_views.xml b/addons/sale_timesheet/views/account_invoice_views.xml index 5290d75510e..40f3d6795ec 100644 --- a/addons/sale_timesheet/views/account_invoice_views.xml +++ b/addons/sale_timesheet/views/account_invoice_views.xml @@ -6,7 +6,12 @@ ir.actions.act_window account.analytic.line tree,form,graph,pivot,kanban - {'create': False, 'edit': False, 'delete': False} + { + 'create': False, + 'edit': False, + 'delete': False, + "is_timesheet": 1, + } [('timesheet_invoice_id', '=', active_id)]

diff --git a/addons/sale_timesheet/views/hr_timesheet_views.xml b/addons/sale_timesheet/views/hr_timesheet_views.xml index 05e412c796e..0bd691cdf5e 100644 --- a/addons/sale_timesheet/views/hr_timesheet_views.xml +++ b/addons/sale_timesheet/views/hr_timesheet_views.xml @@ -95,6 +95,9 @@ Timesheets account.analytic.line + { + "is_timesheet": 1, + } [('project_id', '!=', False)] @@ -123,6 +126,7 @@ 'search_default_week': 1, 'default_so_line': active_id, 'default_is_so_line_edited': True, + "is_timesheet": 1, }

@@ -177,6 +181,9 @@ account.analytic.line pivot,tree,form [('project_id', '!=', False)] + { + "is_timesheet": 1, + } @@ -185,6 +192,9 @@ account.analytic.line tree,form [('project_id', '!=', False)] + { + "is_timesheet": 1, + }