From daaf5f00d201c730dc12f8ad0cfec73f1d4f84da Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 15 Jan 2020 10:58:00 +0000 Subject: [PATCH] [FIX] sale_timesheet: Ignore cancelled invoices to compute qty_to_invoice closes odoo/odoo#43359 Related: odoo/enterprise#7747 Signed-off-by: Yannick Tivisse (yti) --- addons/sale_timesheet/models/sale_order.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/sale_timesheet/models/sale_order.py b/addons/sale_timesheet/models/sale_order.py index fad76f7a94d..dddc6626b30 100644 --- a/addons/sale_timesheet/models/sale_order.py +++ b/addons/sale_timesheet/models/sale_order.py @@ -124,7 +124,9 @@ class SaleOrderLine(models.Model): domain = lines_by_timesheet._timesheet_compute_delivered_quantity_domain() domain = expression.AND([domain, [ ('date', '<=', date), - ('timesheet_invoice_id', '=', False)]]) + '|', + ('timesheet_invoice_id', '=', False), + ('timesheet_invoice_id.state', '=', 'cancel')]]) mapping = lines_by_timesheet.sudo()._get_delivered_quantity_by_analytic(domain) for line in lines_by_timesheet: