From cff9dd86065ec7586e25202f3c63a9caffbf8bf6 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Mon, 18 Mar 2019 17:38:46 +0100 Subject: [PATCH] Use strings on fields compute to allow inheritance --- rma_account/models/invoice.py | 4 ++-- rma_account/models/rma_order.py | 4 ++-- rma_account/models/rma_order_line.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rma_account/models/invoice.py b/rma_account/models/invoice.py index 6a88d0cc..1b8b9fa9 100644 --- a/rma_account/models/invoice.py +++ b/rma_account/models/invoice.py @@ -58,7 +58,7 @@ class AccountInvoice(models.Model): return {} rma_count = fields.Integer( - compute=_compute_rma_count, string='# of RMA') + compute='_compute_rma_count', string='# of RMA') add_rma_line_id = fields.Many2one( comodel_name='rma.order.line', @@ -156,7 +156,7 @@ class AccountInvoiceLine(models.Model): invl.rma_line_count = len(rma_lines) rma_line_count = fields.Integer( - compute=_compute_rma_count, string='# of RMA') + compute='_compute_rma_count', string='# of RMA') rma_line_ids = fields.One2many( comodel_name='rma.order.line', inverse_name='invoice_line_id', string="RMA", readonly=True, diff --git a/rma_account/models/rma_order.py b/rma_account/models/rma_order.py index 20d4f89b..82a4591b 100644 --- a/rma_account/models/rma_order.py +++ b/rma_account/models/rma_order.py @@ -25,9 +25,9 @@ class RmaOrder(models.Model): ondelete='set null', readonly=True, ) invoice_refund_count = fields.Integer( - compute=_compute_invoice_refund_count, string='# of Refunds') + compute='_compute_invoice_refund_count', string='# of Refunds') invoice_count = fields.Integer( - compute=_compute_invoice_count, string='# of Invoices') + compute='_compute_invoice_count', string='# of Invoices') def _prepare_rma_line_from_inv_line(self, line): if self.type == 'customer': diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py index bfe24b6c..5f4d41f5 100644 --- a/rma_account/models/rma_order_line.py +++ b/rma_account/models/rma_order_line.py @@ -48,7 +48,7 @@ class RmaOrderLine(models.Model): help="Invoice address for current rma order.", ) refund_count = fields.Integer( - compute=_compute_refund_count, string='# of Refunds', default=0) + compute='_compute_refund_count', string='# of Refunds', default=0) invoice_line_id = fields.Many2one( comodel_name='account.invoice.line', string='Originating Invoice Line', @@ -73,11 +73,11 @@ class RmaOrderLine(models.Model): qty_to_refund = fields.Float( string='Qty To Refund', copy=False, digits=dp.get_precision('Product Unit of Measure'), readonly=True, - compute=_compute_qty_to_refund, store=True) + compute='_compute_qty_to_refund', store=True) qty_refunded = fields.Float( string='Qty Refunded', copy=False, digits=dp.get_precision('Product Unit of Measure'), - readonly=True, compute=_compute_qty_refunded, store=True) + readonly=True, compute='_compute_qty_refunded', store=True) @api.onchange('product_id') def _onchange_product_id(self):