From fb1b99195419939e3402448ecca0475d5e656f6e Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Tue, 29 Oct 2019 16:36:59 +0100 Subject: [PATCH] [FIX]move constraint from the rma order to the line --- rma/models/rma_order.py | 10 ---------- rma/models/rma_order_line.py | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/rma/models/rma_order.py b/rma/models/rma_order.py index b87d61a3..59fd7343 100644 --- a/rma/models/rma_order.py +++ b/rma/models/rma_order.py @@ -88,16 +88,6 @@ class RmaOrder(models.Model): required=True, default=lambda self: self.env.user.company_id) - @api.constrains("partner_id", "rma_line_ids") - def _check_partner_id(self): - if self.rma_line_ids and self.partner_id != self.mapped( - "rma_line_ids.partner_id"): - raise UserError(_( - "Group partner and RMA's partner must be the same.")) - if len(self.mapped("rma_line_ids.partner_id")) > 1: - raise UserError(_( - "All grouped RMA's should have same partner.")) - @api.model def create(self, vals): if (self.env.context.get('supplier') or diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py index 89554e53..05a358cf 100644 --- a/rma/models/rma_order_line.py +++ b/rma/models/rma_order_line.py @@ -622,3 +622,9 @@ class RmaOrderLine(models.Model): result['views'] = [(res and res.id or False, 'form')] result['res_id'] = rma_lines[0] return result + + @api.constrains("partner_id", "rma_id") + def _check_partner_id(self): + if self.rma_id and self.partner_id != self.rma_id.partner_id: + raise UserError(_( + "Group partner and RMA's partner must be the same."))