From f245cf377b81b26f45e438eba9b708d4db0e3d92 Mon Sep 17 00:00:00 2001 From: aaron Date: Fri, 4 May 2018 09:26:54 +0200 Subject: [PATCH] [FIX]reverting changes applied to v11 --- rma_sale/models/sale_order_line.py | 15 +++++++++++++++ rma_sale/views/rma_order_line_view.xml | 1 + 2 files changed, 16 insertions(+) diff --git a/rma_sale/models/sale_order_line.py b/rma_sale/models/sale_order_line.py index 0687c034..84041190 100644 --- a/rma_sale/models/sale_order_line.py +++ b/rma_sale/models/sale_order_line.py @@ -27,6 +27,21 @@ class SaleOrderLine(models.Model): name='', args=args, operator=operator, limit=limit, name_get_uid=name_get_uid) + @api.multi + def name_get(self): + res = [] + if self.env.context.get('rma'): + for sale in self: + if sale.order_id.name: + res.append((sale.id, "%s %s qty:%s" % ( + sale.order_id.name, + sale.product_id.name, sale.product_uom_qty))) + else: + res.append(super(SaleOrderLine, sale).name_get()[0]) + return res + else: + return super(SaleOrderLine, self).name_get() + rma_line_id = fields.Many2one( comodel_name='rma.order.line', string='RMA', ondelete='restrict') diff --git a/rma_sale/views/rma_order_line_view.xml b/rma_sale/views/rma_order_line_view.xml index e0d45183..d3d4199f 100644 --- a/rma_sale/views/rma_order_line_view.xml +++ b/rma_sale/views/rma_order_line_view.xml @@ -18,6 +18,7 @@