From 9dce0cd298765c9b6793ce24aa56fef4cd6068d8 Mon Sep 17 00:00:00 2001 From: ps-tubtim Date: Thu, 12 Mar 2020 12:19:44 +0700 Subject: [PATCH] [IMP] mrp_bom_note: black, isort --- mrp_bom_note/__manifest__.py | 18 ++-- mrp_bom_note/models/mrp_bom.py | 4 +- mrp_bom_note/tests/__init__.py | 2 +- mrp_bom_note/tests/test_mrp_bom_note.py | 121 +++++++++++------------- 4 files changed, 66 insertions(+), 79 deletions(-) diff --git a/mrp_bom_note/__manifest__.py b/mrp_bom_note/__manifest__.py index 1a14d99aa..5804db1ef 100644 --- a/mrp_bom_note/__manifest__.py +++ b/mrp_bom_note/__manifest__.py @@ -3,19 +3,15 @@ { "name": "Notes in Bill of Materials", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "license": "AGPL-3", "author": "OdooMRP team," - "AvanzOSC," - "Serv. Tecnol. Avanzados - Pedro M. Baeza, " - "Odoo Community Association (OCA)", + "AvanzOSC," + "Serv. Tecnol. Avanzados - Pedro M. Baeza, " + "Odoo Community Association (OCA)", "website": "https://github.com/OCA/manufacture", "category": "Manufacturing", - "depends": [ - "mrp", - ], - "data": [ - "views/mrp_bom_view.xml", - ], - "installable": True + "depends": ["mrp"], + "data": ["views/mrp_bom_view.xml"], + "installable": True, } diff --git a/mrp_bom_note/models/mrp_bom.py b/mrp_bom_note/models/mrp_bom.py index 86a9ee4fb..0e4d64149 100644 --- a/mrp_bom_note/models/mrp_bom.py +++ b/mrp_bom_note/models/mrp_bom.py @@ -1,10 +1,10 @@ # © 2015 Oihane Crucelaegui - AvanzOSC # License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html -from odoo import models, fields +from odoo import fields, models class MrpBom(models.Model): - _inherit = 'mrp.bom' + _inherit = "mrp.bom" notes = fields.Html() diff --git a/mrp_bom_note/tests/__init__.py b/mrp_bom_note/tests/__init__.py index 344cedcdb..58683a6f2 100644 --- a/mrp_bom_note/tests/__init__.py +++ b/mrp_bom_note/tests/__init__.py @@ -1,4 +1,4 @@ # © 2018 Agung Rachmatullah # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import test_mrp_bom_note \ No newline at end of file +from . import test_mrp_bom_note diff --git a/mrp_bom_note/tests/test_mrp_bom_note.py b/mrp_bom_note/tests/test_mrp_bom_note.py index e82a22ed4..9e6cae134 100644 --- a/mrp_bom_note/tests/test_mrp_bom_note.py +++ b/mrp_bom_note/tests/test_mrp_bom_note.py @@ -7,71 +7,62 @@ from odoo.tests.common import TransactionCase class TestMrpBomNote(TransactionCase): def setUp(self): super(TestMrpBomNote, self).setUp() - self.product_t = self.env['product.template'] - self.product_p = self.env['product.product'] - self.bom = self.env['mrp.bom'] + self.product_t = self.env["product.template"] + self.product_p = self.env["product.product"] + self.bom = self.env["mrp.bom"] def test_notes(self): - uom_unit = self.env.ref('uom.product_uom_unit') - product_t_fg = self.product_t.create({ - 'name': 'Chair', - 'type': 'product', - 'uom_id': uom_unit.id, - 'uom_po_id': uom_unit.id, - }) - product_t_1 = self.product_t.create({ - 'name': 'Log 1', - 'type': 'product', - 'uom_id': uom_unit.id, - 'uom_po_id': uom_unit.id, - }) - product_t_2 = self.product_t.create({ - 'name': 'Log 2', - 'type': 'product', - 'uom_id': uom_unit.id, - 'uom_po_id': uom_unit.id, - }) - product_t_3 = self.product_t.create({ - 'name': 'Log 3', - 'type': 'product', - 'uom_id': uom_unit.id, - 'uom_po_id': uom_unit.id, - }) - product_fg = self.product_p.create({ - 'product_tmpl_id': product_t_fg.id - }) - product_1 = self.product_p.create({ - 'product_tmpl_id': product_t_1.id - }) - product_2 = self.product_p.create({ - 'product_tmpl_id': product_t_2.id - }) - product_3 = self.product_p.create({ - 'product_tmpl_id': product_t_3.id - }) - BoM1 = self.bom.create({ - 'product_id': product_fg.id, - 'product_tmpl_id': product_fg.product_tmpl_id.id, - 'product_uom_id': uom_unit.id, - 'product_qty': 1.0, - 'type': 'normal', - 'move_raw_ids': [ - (0, 0, { - 'product_id': product_1.id, - 'product_qty': 4, - }), - (0, 0, { - 'product_id': product_2.id, - 'product_qty': 2, - }), - (0, 0, { - 'product_id': product_3.id, - 'product_qty': 2, - }) - ] - }) + uom_unit = self.env.ref("uom.product_uom_unit") + product_t_fg = self.product_t.create( + { + "name": "Chair", + "type": "product", + "uom_id": uom_unit.id, + "uom_po_id": uom_unit.id, + } + ) + product_t_1 = self.product_t.create( + { + "name": "Log 1", + "type": "product", + "uom_id": uom_unit.id, + "uom_po_id": uom_unit.id, + } + ) + product_t_2 = self.product_t.create( + { + "name": "Log 2", + "type": "product", + "uom_id": uom_unit.id, + "uom_po_id": uom_unit.id, + } + ) + product_t_3 = self.product_t.create( + { + "name": "Log 3", + "type": "product", + "uom_id": uom_unit.id, + "uom_po_id": uom_unit.id, + } + ) + product_fg = self.product_p.create({"product_tmpl_id": product_t_fg.id}) + product_1 = self.product_p.create({"product_tmpl_id": product_t_1.id}) + product_2 = self.product_p.create({"product_tmpl_id": product_t_2.id}) + product_3 = self.product_p.create({"product_tmpl_id": product_t_3.id}) + BoM1 = self.bom.create( + { + "product_id": product_fg.id, + "product_tmpl_id": product_fg.product_tmpl_id.id, + "product_uom_id": uom_unit.id, + "product_qty": 1.0, + "type": "normal", + "move_raw_ids": [ + (0, 0, {"product_id": product_1.id, "product_qty": 4}), + (0, 0, {"product_id": product_2.id, "product_qty": 2}), + (0, 0, {"product_id": product_3.id, "product_qty": 2}), + ], + } + ) - BoM1.write({ - 'notes': '

Test

' - }) - self.assertEqual(BoM1.notes, '

Test

') + BoM1.write({"notes": "

Test

"}) + self.assertEqual(BoM1.notes, "

Test

")