From 6550cd0e1abd6125debd5f4aa5b9134b05827979 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Fri, 15 Jul 2016 18:14:52 +0200 Subject: [PATCH] Minor fixes --- mrp_workcenter_hierarchical/__init__.py | 2 +- mrp_workcenter_hierarchical/__openerp__.py | 2 +- mrp_workcenter_hierarchical/model/__init__.py | 6 ++++++ mrp_workcenter_hierarchical/{ => model}/workcenter.py | 4 ++-- mrp_workcenter_hierarchical/tests/test_compute_level.py | 2 +- mrp_workcenter_hierarchical/{ => views}/workcenter_view.xml | 0 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 mrp_workcenter_hierarchical/model/__init__.py rename mrp_workcenter_hierarchical/{ => model}/workcenter.py (95%) rename mrp_workcenter_hierarchical/{ => views}/workcenter_view.xml (100%) diff --git a/mrp_workcenter_hierarchical/__init__.py b/mrp_workcenter_hierarchical/__init__.py index f605ba5bb..d8dfddcf3 100644 --- a/mrp_workcenter_hierarchical/__init__.py +++ b/mrp_workcenter_hierarchical/__init__.py @@ -3,4 +3,4 @@ # David BEAL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import workcenter +from . import model diff --git a/mrp_workcenter_hierarchical/__openerp__.py b/mrp_workcenter_hierarchical/__openerp__.py index cc30e602f..b6130c0c2 100644 --- a/mrp_workcenter_hierarchical/__openerp__.py +++ b/mrp_workcenter_hierarchical/__openerp__.py @@ -14,7 +14,7 @@ ], 'website': 'http://www.akretion.com/', 'data': [ - 'workcenter_view.xml', + 'views/workcenter_view.xml', ], 'demo': [ 'demo/mrp_demo.xml', diff --git a/mrp_workcenter_hierarchical/model/__init__.py b/mrp_workcenter_hierarchical/model/__init__.py new file mode 100644 index 000000000..f605ba5bb --- /dev/null +++ b/mrp_workcenter_hierarchical/model/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © 2016 Akretion (http://www.akretion.com) +# David BEAL +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import workcenter diff --git a/mrp_workcenter_hierarchical/workcenter.py b/mrp_workcenter_hierarchical/model/workcenter.py similarity index 95% rename from mrp_workcenter_hierarchical/workcenter.py rename to mrp_workcenter_hierarchical/model/workcenter.py index 30d4ed68b..bdc47f4f9 100644 --- a/mrp_workcenter_hierarchical/workcenter.py +++ b/mrp_workcenter_hierarchical/model/workcenter.py @@ -31,8 +31,8 @@ class MrpWorkcenter(models.Model): compute='_compute_parent_level', string='Parent Level 3', store=True) - parent_left = fields.Integer(select=1) - parent_right = fields.Integer(select=1) + parent_left = fields.Integer(select=True) + parent_right = fields.Integer(select=True) @api.multi def _get_parent_ids(self): diff --git a/mrp_workcenter_hierarchical/tests/test_compute_level.py b/mrp_workcenter_hierarchical/tests/test_compute_level.py index b28cde6f9..3446c9376 100644 --- a/mrp_workcenter_hierarchical/tests/test_compute_level.py +++ b/mrp_workcenter_hierarchical/tests/test_compute_level.py @@ -66,7 +66,7 @@ class ComputeParentLevel(TransactionCase): self.assertEqual( workcenter_child.parent_level_1_id, workcenter_parent1) - def test_compute_parent_level3(self): + def test_compute_parent_level3_bis(self): workcenter_child = self.env.ref( 'mrp_workcenter_hierarchical.mrp_workcenter_C') workcenter_parent3 = self.env.ref( diff --git a/mrp_workcenter_hierarchical/workcenter_view.xml b/mrp_workcenter_hierarchical/views/workcenter_view.xml similarity index 100% rename from mrp_workcenter_hierarchical/workcenter_view.xml rename to mrp_workcenter_hierarchical/views/workcenter_view.xml