diff options
| author | Yannick Tivisse <yti@odoo.com> | 2020-01-15 10:58:00 +0000 |
|---|---|---|
| committer | jbm-odoo <jbm@odoo.com> | 2020-01-15 15:36:21 +0000 |
| commit | daaf5f00d201c730dc12f8ad0cfec73f1d4f84da (patch) | |
| tree | e09bf4b97acf84d5343a82edaaa4d24947d2e3b3 | |
| parent | 0392e4e62d83b8123cf8d15dd33a24a6d7e89c5c (diff) | |
[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) <yti@odoo.com>
| -rw-r--r-- | addons/sale_timesheet/models/sale_order.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |