From e383c786acbb2bf4ca1b5a388231abeed5ee392c Mon Sep 17 00:00:00 2001 From: AaronHForgeFlow Date: Tue, 31 Oct 2023 10:44:56 +0100 Subject: [PATCH] [IMP] rma_kanban_stage: black, isort, prettier --- rma_kanban_stage/__manifest__.py | 24 +++++----- rma_kanban_stage/models/rma_order_line.py | 29 ++++++------ rma_kanban_stage/tests/__init__.py | 1 - rma_kanban_stage/tests/test_rma_kanban.py | 26 +++++------ .../views/rma_order_line_view.xml | 44 +++++++++++-------- .../odoo/addons/rma_kanban_stage | 1 + setup/rma_kanban_stage/setup.py | 6 +++ 7 files changed, 72 insertions(+), 59 deletions(-) create mode 120000 setup/rma_kanban_stage/odoo/addons/rma_kanban_stage create mode 100644 setup/rma_kanban_stage/setup.py diff --git a/rma_kanban_stage/__manifest__.py b/rma_kanban_stage/__manifest__.py index 6ab3e5ae..6bc3bd3f 100644 --- a/rma_kanban_stage/__manifest__.py +++ b/rma_kanban_stage/__manifest__.py @@ -1,18 +1,18 @@ # Copyright 2019 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) { - 'name': 'RMA Kanban Stages', - 'summary': 'Stages on RMA', - 'version': '12.0.1.1.0', - 'website': 'https://www.eficent.com/', - 'author': 'Eficent', - 'depends': [ - 'rma', - 'base_kanban_stage', + "name": "RMA Kanban Stages", + "summary": "Stages on RMA", + "version": "12.0.1.1.0", + "website": "https://github.com/ForgeFlow/stock-rma", + "author": "Eficent", + "depends": [ + "rma", + "base_kanban_stage", ], - 'data': [ - 'views/rma_order_line_view.xml', + "data": [ + "views/rma_order_line_view.xml", ], - 'license': 'AGPL-3', - 'installable': True, + "license": "AGPL-3", + "installable": True, } diff --git a/rma_kanban_stage/models/rma_order_line.py b/rma_kanban_stage/models/rma_order_line.py index 400de19c..e26953ba 100644 --- a/rma_kanban_stage/models/rma_order_line.py +++ b/rma_kanban_stage/models/rma_order_line.py @@ -1,36 +1,35 @@ # 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, fields, models +from odoo import api, fields, models class RmaOrderLine(models.Model): - _name = 'rma.order.line' - _inherit = ['rma.order.line', 'base.kanban.abstract'] + _name = "rma.order.line" + _inherit = ["rma.order.line", "base.kanban.abstract"] - user_id = fields.Many2one( - comodel_name='res.users', related='assigned_to' - ) + user_id = fields.Many2one(comodel_name="res.users", related="assigned_to") kanban_color = fields.Integer( - compute='compute_color', - string='Base - Background Color', - help='Default color for the background.') + compute="compute_color", + string="Base - Background Color", + help="Default color for the background.", + ) @api.multi def copy(self, default=None): self.ensure_one() default = default or {} stage = self.stage_id.search([], order="sequence asc", limit=1) - default.update({'stage_id': stage.id}) + default.update({"stage_id": stage.id}) return super(RmaOrderLine, self).copy(default=default) - @api.depends('state') + @api.depends("state") @api.multi def compute_color(self): - for rec in self.filtered(lambda l: l.state == 'draft'): + for rec in self.filtered(lambda l: l.state == "draft"): rec.kanban_color = 1 - for rec in self.filtered(lambda l: l.state == 'approved'): + for rec in self.filtered(lambda l: l.state == "approved"): rec.kanban_color = 2 - for rec in self.filtered(lambda l: l.state == 'to_approve'): + for rec in self.filtered(lambda l: l.state == "to_approve"): rec.kanban_color = 5 - for rec in self.filtered(lambda l: l.state == 'done'): + for rec in self.filtered(lambda l: l.state == "done"): rec.kanban_color = 7 diff --git a/rma_kanban_stage/tests/__init__.py b/rma_kanban_stage/tests/__init__.py index f644f22a..d4ecb955 100644 --- a/rma_kanban_stage/tests/__init__.py +++ b/rma_kanban_stage/tests/__init__.py @@ -1,2 +1 @@ - from . import test_rma_kanban diff --git a/rma_kanban_stage/tests/test_rma_kanban.py b/rma_kanban_stage/tests/test_rma_kanban.py index c6c00f74..451b5f5b 100644 --- a/rma_kanban_stage/tests/test_rma_kanban.py +++ b/rma_kanban_stage/tests/test_rma_kanban.py @@ -4,28 +4,28 @@ from odoo.tests import common class TestRmaKanban(common.TransactionCase): - def setUp(self): super(TestRmaKanban, self).setUp() - self.rma_obj = self.env['rma.order'] - self.partner_obj = self.env['res.partner'] - self.rma_line_obj = self.env['rma.order.line'] - self.kanban_stage_model = self.env['base.kanban.stage'] + self.rma_obj = self.env["rma.order"] + self.partner_obj = self.env["res.partner"] + self.rma_line_obj = self.env["rma.order.line"] + self.kanban_stage_model = self.env["base.kanban.stage"] # Create partners - customer1 = self.partner_obj.create({'name': 'Customer 1'}) + customer1 = self.partner_obj.create({"name": "Customer 1"}) # Create RMA group and operation: - self.rma_group_customer = self.rma_obj.create({ - 'partner_id': customer1.id, - 'type': 'customer', - }) + self.rma_group_customer = self.rma_obj.create( + { + "partner_id": customer1.id, + "type": "customer", + } + ) def test_read_group_stage_ids(self): self.assertEqual( - self.rma_line_obj._read_group_stage_ids( - self.kanban_stage_model, [], 'id'), - self.kanban_stage_model.search([], order='id'), + self.rma_line_obj._read_group_stage_ids(self.kanban_stage_model, [], "id"), + self.kanban_stage_model.search([], order="id"), ) def test_copy_method(self): diff --git a/rma_kanban_stage/views/rma_order_line_view.xml b/rma_kanban_stage/views/rma_order_line_view.xml index c68d98b6..1532208c 100644 --- a/rma_kanban_stage/views/rma_order_line_view.xml +++ b/rma_kanban_stage/views/rma_order_line_view.xml @@ -1,34 +1,42 @@ - + rma.order.line.kanban rma.order.line - + primary
- Partner: -
+ Partner: +
-

- Origin: +
+ Origin: - oe_kanban_text_red + oe_kanban_text_red - Date: + Date: -

- Product: -

- QTY: +
+ Product: +
+ QTY: -
+
- Operation -
+ Operation -
@@ -38,22 +46,22 @@ rma.order.line.select rma.order.line - + - + kanban,tree,form - + kanban,tree,form - + diff --git a/setup/rma_kanban_stage/odoo/addons/rma_kanban_stage b/setup/rma_kanban_stage/odoo/addons/rma_kanban_stage new file mode 120000 index 00000000..d116c5ae --- /dev/null +++ b/setup/rma_kanban_stage/odoo/addons/rma_kanban_stage @@ -0,0 +1 @@ +../../../../rma_kanban_stage \ No newline at end of file diff --git a/setup/rma_kanban_stage/setup.py b/setup/rma_kanban_stage/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/rma_kanban_stage/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)