diff --git a/rma_account/models/rma_order.py b/rma_account/models/rma_order.py index e16f4ca3..20d4f89b 100644 --- a/rma_account/models/rma_order.py +++ b/rma_account/models/rma_order.py @@ -93,13 +93,14 @@ class RmaOrder(models.Model): result = action.read()[0] invoice_ids = self.mapped( 'rma_line_ids.refund_line_ids.invoice_id').ids - # choose the view_mode accordingly - if len(invoice_ids) > 1: - result['domain'] = [('id', 'in', invoice_ids)] - else: - res = self.env.ref('account.invoice_supplier_form', False) - result['views'] = [(res and res.id or False, 'form')] - result['res_id'] = invoice_ids and invoice_ids[0] + if invoice_ids: + # choose the view_mode accordingly + if len(invoice_ids) > 1: + result['domain'] = [('id', 'in', invoice_ids)] + else: + res = self.env.ref('account.invoice_supplier_form', False) + result['views'] = [(res and res.id or False, 'form')] + result['res_id'] = invoice_ids[0] return result @api.multi @@ -112,10 +113,11 @@ class RmaOrder(models.Model): res = self.env.ref('account.invoice_form', False) result = action.read()[0] invoice_ids = self.mapped('rma_line_ids.invoice_id').ids - # choose the view_mode accordingly - if len(invoice_ids) > 1: - result['domain'] = [('id', 'in', invoice_ids)] - else: - result['views'] = [(res and res.id or False, 'form')] - result['res_id'] = invoice_ids and invoice_ids[0] + if invoice_ids: + # choose the view_mode accordingly + if len(invoice_ids) > 1: + result['domain'] = [('id', 'in', invoice_ids)] + else: + result['views'] = [(res and res.id or False, 'form')] + result['res_id'] = invoice_ids[0] return result diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py index 4cc4ee82..66abd2d9 100644 --- a/rma_account/models/rma_order_line.py +++ b/rma_account/models/rma_order_line.py @@ -210,13 +210,14 @@ class RmaOrderLine(models.Model): action = self.env.ref('account.action_invoice_tree2') result = action.read()[0] invoice_ids = self.mapped('refund_line_ids.invoice_id').ids - # choose the view_mode accordingly - if len(invoice_ids) > 1: - result['domain'] = [('id', 'in', invoice_ids)] - else: - res = self.env.ref('account.invoice_supplier_form', False) - result['views'] = [(res and res.id or False, 'form')] - result['res_id'] = invoice_ids and invoice_ids[0] + if invoice_ids: + # choose the view_mode accordingly + if len(invoice_ids) > 1: + result['domain'] = [('id', 'in', invoice_ids)] + else: + res = self.env.ref('account.invoice_supplier_form', False) + result['views'] = [(res and res.id or False, 'form')] + result['res_id'] = invoice_ids[0] return result @api.multi