From b09f72ec939959f57fac903044cf597543cf4bbd Mon Sep 17 00:00:00 2001 From: "Victor Piryns (pivi)" Date: Thu, 13 Jul 2023 12:55:57 +0000 Subject: [PATCH] [FIX] sale_timesheet: don't count expense as recorded hours on SO 2 Description: Follow up on #128696, because the fw-port in 15.0 was merged before the additional changes could've been added. Affected versions: 15.0 -> master opw-3302460 closes odoo/odoo#129081 X-original-commit: 6435bcb144a72ccfec3107d81b96c7eb2f4089fa Signed-off-by: Piryns Victor (pivi) Signed-off-by: Xavier Bol (xbo) --- addons/sale_timesheet/models/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_timesheet/models/sale_order.py b/addons/sale_timesheet/models/sale_order.py index 7a26211aa87..8c033dbecbf 100644 --- a/addons/sale_timesheet/models/sale_order.py +++ b/addons/sale_timesheet/models/sale_order.py @@ -39,7 +39,7 @@ class SaleOrder(models.Model): @api.depends('company_id.project_time_mode_id', 'company_id.timesheet_encode_uom_id', 'order_line.timesheet_ids') def _compute_timesheet_total_duration(self): group_data = self.env['account.analytic.line']._read_group([ - ('order_id', 'in', self.ids) + ('order_id', 'in', self.ids), ('project_id', '!=', False) ], ['order_id'], ['unit_amount:sum']) timesheet_unit_amount_dict = defaultdict(float) timesheet_unit_amount_dict.update({order.id: unit_amount for order, unit_amount in group_data})