From f97fbc3e9e467b9f40dbb2370f0a01413f4538e8 Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Tue, 17 Sep 2019 18:07:15 +0200 Subject: [PATCH] [UPT] oca dependencies to base_kanban_stage --- rma_kanban_stage/models/rma_order_line.py | 6 +++- rma_kanban_stage/tests/test_rma_kanban.py | 8 ------ .../views/rma_order_line_view.xml | 28 +++---------------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/rma_kanban_stage/models/rma_order_line.py b/rma_kanban_stage/models/rma_order_line.py index 3802837b..a7e8e22b 100644 --- a/rma_kanban_stage/models/rma_order_line.py +++ b/rma_kanban_stage/models/rma_order_line.py @@ -1,12 +1,16 @@ # Copyright 2019 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) -from odoo import api, models +from odoo import api, fields, models class RmaOrderLine(models.Model): _name = 'rma.order.line' _inherit = ['rma.order.line', 'base.kanban.abstract'] + user_id = fields.Many2one( + comodel_name='res.users', related='assigned_to' + ) + @api.multi def copy(self, default=None): self.ensure_one() diff --git a/rma_kanban_stage/tests/test_rma_kanban.py b/rma_kanban_stage/tests/test_rma_kanban.py index e1dc105b..b1d881b6 100644 --- a/rma_kanban_stage/tests/test_rma_kanban.py +++ b/rma_kanban_stage/tests/test_rma_kanban.py @@ -10,15 +10,7 @@ class TestRmaKanban(common.TransactionCase): self.rma_obj = self.env['rma.order'] self.rma_line_obj = self.env['rma.order.line'] - self.rma_op_obj = self.env['rma.operation'] self.kanban_stage_model = self.env['base.kanban.stage'] - self.kanban_abstract_model = self.env['base.kanban.abstract'] - self.product_obj = self.env['product.product'] - self.partner_obj = self.env['res.partner'] - - self.rma_route_cust = self.env.ref('rma.route_rma_customer') - self.cust_refund_op = self.env.ref( - 'rma_account.rma_operation_customer_refund') # Create partners customer1 = self.partner_obj.create({'name': 'Customer 1'}) diff --git a/rma_kanban_stage/views/rma_order_line_view.xml b/rma_kanban_stage/views/rma_order_line_view.xml index 1565652d..5bcf98a1 100644 --- a/rma_kanban_stage/views/rma_order_line_view.xml +++ b/rma_kanban_stage/views/rma_order_line_view.xml @@ -1,28 +1,6 @@ - - rma.order.line.form - rma.order.line - - -
- -
-
-
- - - rma.order.line.supplier.form - rma.order.line - - -
- -
-
-
- rma.order.line.kanban @@ -37,8 +15,10 @@
oe_kanban_text_red - date - - origin - + Date - + + origin - +
Operation -