diff --git a/mrp_sale_info/README.rst b/mrp_sale_info/README.rst index 742d8ac12..16a14b865 100644 --- a/mrp_sale_info/README.rst +++ b/mrp_sale_info/README.rst @@ -2,7 +2,7 @@ MRP Sale Info ============= -.. +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! diff --git a/mrp_sale_info/__manifest__.py b/mrp_sale_info/__manifest__.py index 902e9da12..3d90fb7f5 100644 --- a/mrp_sale_info/__manifest__.py +++ b/mrp_sale_info/__manifest__.py @@ -20,6 +20,5 @@ "data": [ "views/mrp_production.xml", "views/mrp_workorder.xml", - "views/sale_order.xml", ], } diff --git a/mrp_sale_info/models/sale_order.py b/mrp_sale_info/models/sale_order.py index dacc9e3fd..2deace591 100644 --- a/mrp_sale_info/models/sale_order.py +++ b/mrp_sale_info/models/sale_order.py @@ -1,27 +1,10 @@ # Copyright 2018 Alex Comba - Agile Business Group # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import fields, models class SaleOrder(models.Model): _inherit = "sale.order" production_ids = fields.One2many("mrp.production", "sale_id") - production_count = fields.Integer(compute="_compute_production_count", store=True) - - @api.depends("production_ids") - def _compute_production_count(self): - for sale in self: - sale.production_count = len(sale.production_ids) - - def action_view_production(self): - action = self.env.ref("mrp.mrp_production_action").read()[0] - if self.production_count > 1: - action["domain"] = [("id", "in", self.production_ids.ids)] - else: - action["views"] = [ - (self.env.ref("mrp.mrp_production_form_view").id, "form") - ] - action["res_id"] = self.production_ids.id - return action diff --git a/mrp_sale_info/tests/test_mrp_sale_info.py b/mrp_sale_info/tests/test_mrp_sale_info.py index a1c431ecd..09fb94294 100644 --- a/mrp_sale_info/tests/test_mrp_sale_info.py +++ b/mrp_sale_info/tests/test_mrp_sale_info.py @@ -53,6 +53,6 @@ class TestMrpSaleInfo(common.SavepointCase): self.assertEqual(production.sale_id, self.sale_order) self.assertEqual(production.partner_id, self.partner) self.assertEqual(production.client_order_ref, self.sale_order.client_order_ref) - self.assertEqual(self.sale_order.production_count, 1) - sale_action = self.sale_order.action_view_production() + self.assertEqual(self.sale_order.mrp_production_count, 1) + sale_action = self.sale_order.action_view_mrp_production() self.assertEqual(sale_action["res_id"], production.id) diff --git a/mrp_sale_info/views/sale_order.xml b/mrp_sale_info/views/sale_order.xml deleted file mode 100644 index 8842dfcb9..000000000 --- a/mrp_sale_info/views/sale_order.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - sale.order.form - sale.order - - - - - - - - -