From 9fad1ac1ae5c8f2a3c3434c38d397b9660cf5017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Pulver?= Date: Wed, 25 Nov 2020 16:36:59 +0100 Subject: [PATCH] [FIX] Get search domain for orders to invoice in separate method, in order to extend it in delivery module We had already made this fix earlier, but it was overwritten by odoo upstream --- addons/sale/models/sale.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index 406547d281..3e557f7fc3 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -54,9 +54,9 @@ class SaleOrder(models.Model): for possible refunds created directly from existing invoices. This is necessary since such a refund is not directly linked to the SO. """ - # Ignore the status of the deposit product - deposit_product_id = self.env['sale.advance.payment.inv']._default_product_id() - line_invoice_status_all = [(d['order_id'][0], d['invoice_status']) for d in self.env['sale.order.line'].read_group([('order_id', 'in', self.ids), ('product_id', '!=', deposit_product_id.id)], ['order_id', 'invoice_status'], ['order_id', 'invoice_status'], lazy=False)] + line_domain = self._get_domain_for_invoice_status() + line_invoice_status_all = [(d['order_id'][0], d['invoice_status']) for d in self.env['sale.order.line'].read_group( + line_domain, ['order_id', 'invoice_status'], ['order_id', 'invoice_status'], lazy=False)] for order in self: invoice_ids = order.order_line.mapped('invoice_lines').mapped('invoice_id').filtered(lambda r: r.type in ['out_invoice', 'out_refund']) # Search for invoices which have been 'cancelled' (filter_refund = 'modify' in