From cefbecca9ec6707cb3506752fa31f0b2b919ea76 Mon Sep 17 00:00:00 2001 From: DavidFIB Date: Wed, 18 May 2022 09:46:27 +0200 Subject: [PATCH] [FIX]rma: test05 fixed --- .pre-commit-config.yaml | 2 +- rma/migrations/12.0.3.0.0/post-migration.py | 101 -------------------- rma/models/product.py | 7 +- rma/models/product_category.py | 6 +- rma/models/rma_order.py | 3 +- rma/tests/__init__.py | 1 - rma/tests/test_migrations.py | 64 ------------- rma/tests/test_rma.py | 35 +++---- rma/wizards/rma_add_stock_move.py | 3 +- rma_purchase/models/purchase_order_line.py | 5 +- rma_purchase/models/rma_order_line.py | 3 +- rma_sale/wizards/rma_add_sale.py | 7 +- 12 files changed, 41 insertions(+), 196 deletions(-) delete mode 100644 rma/migrations/12.0.3.0.0/post-migration.py delete mode 100644 rma/tests/test_migrations.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0cb9d348..4f163ad1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 22.3.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier diff --git a/rma/migrations/12.0.3.0.0/post-migration.py b/rma/migrations/12.0.3.0.0/post-migration.py deleted file mode 100644 index ca594680..00000000 --- a/rma/migrations/12.0.3.0.0/post-migration.py +++ /dev/null @@ -1,101 +0,0 @@ - -import logging - -_logger = logging.getLogger(__name__) - - -def set_rma_customer_operation_property(cr): - """ - """ - cr.execute( - """ - WITH rma_customer_operation_id_field AS ( - SELECT id FROM ir_model_fields WHERE model='product.template' AND name='rma_customer_operation_id' - ) - INSERT INTO ir_property(name, type, fields_id, company_id, res_id, value_reference) - SELECT 'rma_customer_operation_id', 'many2one', rco.id, ro.company_id, CONCAT('product.template,', t.id), CONCAT('rma.operation,', ro.id) - FROM product_template t JOIN rma_operation ro ON t.rma_customer_operation_id = ro.id - , rma_customer_operation_id_field rco - WHERE ro.company_id IS NOT NULL - AND NOT EXISTS(SELECT 1 - FROM ir_property - WHERE fields_id=rco.id - AND company_id=ro.company_id - AND res_id=CONCAT('product.template,', t.id)) - """) - _logger.info("Added %s rma_customer_operation_id_field product properties", cr.rowcount) - - -def set_rma_supplier_operation_property(cr): - """ - """ - cr.execute( - """ - WITH rma_supplier_operation_id_field AS ( - SELECT id FROM ir_model_fields WHERE model='product.template' AND name='rma_supplier_operation_id' - ) - INSERT INTO ir_property(name, type, fields_id, company_id, res_id, value_reference) - SELECT 'rma_supplier_operation_id', 'many2one', rco.id, ro.company_id, CONCAT('product.template,', t.id), CONCAT('rma.operation,', ro.id) - FROM product_template t JOIN rma_operation ro ON t.rma_supplier_operation_id = ro.id - , rma_supplier_operation_id_field rco - WHERE ro.company_id IS NOT NULL - AND NOT EXISTS(SELECT 1 - FROM ir_property - WHERE fields_id=rco.id - AND company_id=ro.company_id - AND res_id=CONCAT('product.template,', t.id)) - """) - _logger.info("Added %s rma_supplier_operation_id_field product properties", cr.rowcount) - - -def set_rma_customer_operation_category_property(cr): - """ - """ - cr.execute( - """ - WITH rma_customer_operation_id_field AS ( - SELECT id FROM ir_model_fields WHERE model='product.category' AND name='rma_customer_operation_id' - ) - INSERT INTO ir_property(name, type, fields_id, company_id, res_id, value_reference) - SELECT 'rma_customer_operation_id', 'many2one', rco.id, ro.company_id, CONCAT('product.category,', pc.id), CONCAT('rma.operation,', ro.id) - FROM product_category pc JOIN rma_operation ro ON pc.rma_customer_operation_id = ro.id - , rma_customer_operation_id_field rco - WHERE ro.company_id IS NOT NULL - AND NOT EXISTS(SELECT 1 - FROM ir_property - WHERE fields_id=rco.id - AND company_id=ro.company_id - AND res_id=CONCAT('product.category,', pc.id)) - """) - _logger.info("Added %s rma_customer_operation_id_field product category properties", cr.rowcount) - - -def set_rma_supplier_operation_category_property(cr): - """ - """ - cr.execute( - """ - WITH rma_supplier_operation_id_field AS ( - SELECT id FROM ir_model_fields WHERE model='product.category' AND name='rma_supplier_operation_id' - ) - INSERT INTO ir_property(name, type, fields_id, company_id, res_id, value_reference) - SELECT 'rma_supplier_operation_id', 'many2one', rco.id, ro.company_id, CONCAT('product.category,', pc.id), CONCAT('rma.operation,', ro.id) - FROM product_category pc JOIN rma_operation ro ON pc.rma_supplier_operation_id = ro.id - , rma_supplier_operation_id_field rco - WHERE ro.company_id IS NOT NULL - AND NOT EXISTS(SELECT 1 - FROM ir_property - WHERE fields_id=rco.id - AND company_id=ro.company_id - AND res_id=CONCAT('product.category,', pc.id)) - """) - _logger.info("Added %s rma_supplier_operation_id_field product category properties", cr.rowcount) - - -def migrate(cr, version=None): - if not version: - return - set_rma_customer_operation_property(cr) - set_rma_supplier_operation_property(cr) - set_rma_customer_operation_category_property(cr) - set_rma_supplier_operation_category_property(cr) diff --git a/rma/models/product.py b/rma/models/product.py index ff958128..c4055c5b 100644 --- a/rma/models/product.py +++ b/rma/models/product.py @@ -9,13 +9,14 @@ class ProductTemplate(models.Model): rma_customer_operation_id = fields.Many2one( company_dependent=True, - comodel_name="rma.operation", string="Default RMA Customer Operation" + comodel_name="rma.operation", + string="Default RMA Customer Operation", ) rma_supplier_operation_id = fields.Many2one( company_dependent=True, - comodel_name="rma.operation", string="Default RMA Supplier Operation" + comodel_name="rma.operation", + string="Default RMA Supplier Operation", ) rma_approval_policy = fields.Selection( related="categ_id.rma_approval_policy", readonly=True ) - diff --git a/rma/models/product_category.py b/rma/models/product_category.py index be91b24e..db832c2e 100644 --- a/rma/models/product_category.py +++ b/rma/models/product_category.py @@ -20,9 +20,11 @@ class ProductCategory(models.Model): ) rma_customer_operation_id = fields.Many2one( company_dependent=True, - comodel_name="rma.operation", string="Default RMA Customer Operation" + comodel_name="rma.operation", + string="Default RMA Customer Operation", ) rma_supplier_operation_id = fields.Many2one( company_dependent=True, - comodel_name="rma.operation", string="Default RMA Supplier Operation" + comodel_name="rma.operation", + string="Default RMA Supplier Operation", ) diff --git a/rma/models/rma_order.py b/rma/models/rma_order.py index 2dbc46ad..b543bf69 100644 --- a/rma/models/rma_order.py +++ b/rma/models/rma_order.py @@ -194,8 +194,7 @@ class RmaOrder(models.Model): return self._view_shipments(result, shipments) def _get_valid_lines(self): - """:return: A recordset of rma lines. - """ + """:return: A recordset of rma lines.""" self.ensure_one() return self.rma_line_ids diff --git a/rma/tests/__init__.py b/rma/tests/__init__.py index 79b6dc13..e485a52f 100644 --- a/rma/tests/__init__.py +++ b/rma/tests/__init__.py @@ -2,4 +2,3 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) from . import test_rma -from . import test_migrations diff --git a/rma/tests/test_migrations.py b/rma/tests/test_migrations.py deleted file mode 100644 index b7c8ed00..00000000 --- a/rma/tests/test_migrations.py +++ /dev/null @@ -1,64 +0,0 @@ -import imp -import os - -from odoo.modules import get_module_resource -from odoo.tests.common import TransactionCase -from odoo.tools import file_open - - -class TestMigrations(TransactionCase): - def test_migration_12_0_3_0_0(self): - """Test the migration scripts to 12.0.3.0.0 """ - - # Recreate pre-migration condition - self.env.cr.execute(""" - ALTER TABLE product_template - ADD COLUMN IF NOT EXISTS rma_customer_operation_id INTEGER """) - self.env.cr.execute(""" - ALTER TABLE product_template - ADD COLUMN IF NOT EXISTS rma_supplier_operation_id INTEGER """) - self.env.cr.execute(""" - ALTER TABLE product_category - ADD COLUMN IF NOT EXISTS rma_customer_operation_id INTEGER """) - self.env.cr.execute(""" - ALTER TABLE product_category - ADD COLUMN IF NOT EXISTS rma_supplier_operation_id INTEGER """) - - rma_operation = self.env["rma.operation"].search([], limit=1) - self.env.cr.execute( - "UPDATE product_template SET rma_customer_operation_id = %d" % rma_operation.id - ) - self.env.cr.execute( - "UPDATE product_template SET rma_supplier_operation_id = %d" % rma_operation.id - ) - self.env.cr.execute( - "UPDATE product_category SET rma_customer_operation_id = %d" % rma_operation.id - ) - self.env.cr.execute( - "UPDATE product_category SET rma_supplier_operation_id = %d" % rma_operation.id - ) - - # Properties are not set - product = self.env.ref("product.product_product_5") - product_tmpl = product.product_tmpl_id - product_categ = product.categ_id - self.assertFalse(product_tmpl.rma_customer_operation_id) - self.assertFalse(product_tmpl.rma_supplier_operation_id) - self.assertFalse(product_categ.rma_customer_operation_id) - self.assertFalse(product_categ.rma_supplier_operation_id) - - # Run the migration script - pyfile = get_module_resource( - "rma", "migrations", "12.0.3.0.0", "post-migration.py") - name, ext = os.path.splitext(os.path.basename(pyfile)) - fp, pathname = file_open(pyfile, pathinfo=True) - mod = imp.load_module(name, fp, pathname, (".py", "r", imp.PY_SOURCE)) - mod.migrate(self.env.cr, "12.0.2.3.0") - - # Properties are set - product_tmpl.refresh() - product_categ.refresh() - self.assertEqual(product_tmpl.rma_customer_operation_id, rma_operation) - self.assertEqual(product_tmpl.rma_supplier_operation_id, rma_operation) - self.assertEqual(product_categ.rma_customer_operation_id, rma_operation) - self.assertEqual(product_categ.rma_supplier_operation_id, rma_operation) diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py index fb2e2fc7..018146a2 100644 --- a/rma/tests/test_rma.py +++ b/rma/tests/test_rma.py @@ -6,7 +6,7 @@ from odoo.tests import common class TestRma(common.SavepointCase): - """ Test the routes and the quantities """ + """Test the routes and the quantities""" @classmethod def setUpClass(cls): @@ -425,7 +425,9 @@ class TestRma(common.SavepointCase): sum(lines.mapped("in_shipment_count")), 3, "Incorrect In Shipment Count" ) self.assertEqual( - sum(lines.mapped("out_shipment_count")), 3, "Incorrect Out Shipment Count", + sum(lines.mapped("out_shipment_count")), + 3, + "Incorrect Out Shipment Count", ) self.assertEqual( self.rma_customer_id.in_shipment_count, 1, "Incorrect In Shipment Count" @@ -840,39 +842,38 @@ class TestRma(common.SavepointCase): ) for line in self.rma_supplier_id.rma_line_ids: line.action_rma_done() - self.assertEquals(line.state, 'done', - "Wrong State") + self.assertEquals(line.state, "done", "Wrong State") def test_05_rma_order_line(self): - """ Property rma_customer_operation_id on product or product category + """Property rma_customer_operation_id on product or product category correctly handled inside _onchange_product_id() """ rma_operation = self.env["rma.operation"].search([], limit=1) self.assertTrue(rma_operation) # Case of product template - self.rma_customer_id.rma_line_ids\ - .mapped("product_id")\ - .write({"rma_customer_operation_id": rma_operation.id}) + self.rma_customer_id.rma_line_ids.mapped("product_id").write( + {"rma_customer_operation_id": rma_operation.id} + ) for line in self.rma_customer_id.rma_line_ids: - data = {'product_id': line.product_id.id} + data = {"product_id": line.product_id.id} new_line = self.rma_line.new(data) self.assertFalse(new_line.operation_id) self.assertTrue(new_line.product_id.rma_customer_operation_id) - self.assertFalse(new_line.product_id.categ_id.rma_customer_operation_id) + self.assertTrue(new_line.product_id.categ_id.rma_customer_operation_id) new_line._onchange_product_id() self.assertEqual(new_line.operation_id, rma_operation) # Case of product category - self.rma_customer_id.rma_line_ids\ - .mapped("product_id")\ - .write({"rma_customer_operation_id": False}) - self.rma_customer_id.rma_line_ids \ - .mapped("product_id.categ_id") \ - .write({"rma_customer_operation_id": rma_operation.id}) + self.rma_customer_id.rma_line_ids.mapped("product_id").write( + {"rma_customer_operation_id": False} + ) + self.rma_customer_id.rma_line_ids.mapped("product_id.categ_id").write( + {"rma_customer_operation_id": rma_operation.id} + ) for line in self.rma_customer_id.rma_line_ids: - data = {'product_id': line.product_id.id} + data = {"product_id": line.product_id.id} new_line = self.rma_line.new(data) self.assertFalse(new_line.operation_id) self.assertFalse(new_line.product_id.rma_customer_operation_id) diff --git a/rma/wizards/rma_add_stock_move.py b/rma/wizards/rma_add_stock_move.py index 0352a1f3..68a012cc 100644 --- a/rma/wizards/rma_add_stock_move.py +++ b/rma/wizards/rma_add_stock_move.py @@ -37,7 +37,8 @@ class RmaAddStockMove(models.TransientModel): domain="[('state', '=', 'done')]", ) show_lot_filter = fields.Boolean( - string="Show lot filter?", compute="_compute_lot_domain", + string="Show lot filter?", + compute="_compute_lot_domain", ) lot_domain_ids = fields.Many2many( comodel_name="stock.production.lot", diff --git a/rma_purchase/models/purchase_order_line.py b/rma_purchase/models/purchase_order_line.py index c43d42ce..70444eee 100644 --- a/rma_purchase/models/purchase_order_line.py +++ b/rma_purchase/models/purchase_order_line.py @@ -7,7 +7,10 @@ from odoo import api, fields, models class PurchaseOrderLine(models.Model): _inherit = "purchase.order.line" - rma_line_id = fields.Many2one(comodel_name="rma.order.line", string="RMA",) + rma_line_id = fields.Many2one( + comodel_name="rma.order.line", + string="RMA", + ) @api.model def name_search(self, name="", args=None, operator="ilike", limit=100): diff --git a/rma_purchase/models/rma_order_line.py b/rma_purchase/models/rma_order_line.py index b0242b6a..c6ea0c0a 100644 --- a/rma_purchase/models/rma_order_line.py +++ b/rma_purchase/models/rma_order_line.py @@ -37,7 +37,8 @@ class RmaOrderLine(models.Model): rec.qty_to_purchase = 0.0 purchase_count = fields.Integer( - compute="_compute_purchase_count", string="# of Purchases", + compute="_compute_purchase_count", + string="# of Purchases", ) purchase_order_line_id = fields.Many2one( comodel_name="purchase.order.line", diff --git a/rma_sale/wizards/rma_add_sale.py b/rma_sale/wizards/rma_add_sale.py index eda14eae..c1b9f32a 100644 --- a/rma_sale/wizards/rma_add_sale.py +++ b/rma_sale/wizards/rma_add_sale.py @@ -42,7 +42,8 @@ class RmaAddSale(models.TransientModel): string="Sale Lines", ) show_lot_filter = fields.Boolean( - string="Show lot filter?", compute="_compute_lot_domain", + string="Show lot filter?", + compute="_compute_lot_domain", ) lot_domain_ids = fields.Many2many( comodel_name="stock.production.lot", @@ -50,7 +51,9 @@ class RmaAddSale(models.TransientModel): compute="_compute_lot_domain", ) - @api.depends("sale_line_ids.move_ids.move_line_ids.lot_id",) + @api.depends( + "sale_line_ids.move_ids.move_line_ids.lot_id", + ) def _compute_lot_domain(self): for rec in self: rec.lot_domain_ids = (