diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8ddad4aa6c5..ec00f26a8a6 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -35,7 +35,11 @@ class SaleOrder(models.Model): @api.depends('state', 'order_line.invoice_status') def _get_invoiced(self): for order in self: - invoice_ids = order.order_line.mapped('invoice_lines').mapped('invoice_id').ids + invoice_ids = order.order_line.mapped('invoice_lines').mapped('invoice_id') + # Search for refunds as well + refund_ids = self.env['account.invoice'].browse() + if invoice_ids: + refund_ids = refund_ids.search([('type', '=', 'out_refund'), ('origin', 'in', invoice_ids.mapped('number'))]) if order.state not in ('sale', 'done'): invoice_status = 'no' @@ -49,8 +53,8 @@ class SaleOrder(models.Model): invoice_status = 'no' order.update({ - 'invoice_count': len(set(invoice_ids)), - 'invoice_ids': invoice_ids, + 'invoice_count': len(set(invoice_ids.ids + refund_ids.ids)), + 'invoice_ids': invoice_ids.ids + refund_ids.ids, 'invoice_status': invoice_status }) diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml index 811ab2540bf..074b0048185 100644 --- a/addons/stock/stock_demo.yml +++ b/addons/stock/stock_demo.yml @@ -25,7 +25,7 @@ name: Ice Cream type: product categ_id: product.product_category_1 - list_price: 100.0 + lst_price: 100.0 standard_price: 70.0 weight: 1.0 uom_id: product.product_uom_kgm