From f7dd9d769e8ddac8b0399b4ab4ed115c8952838d Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Thu, 20 Feb 2020 10:11:17 +0100 Subject: [PATCH 1/2] [FIX][12.0] database_cleanup: Mute logger on tests --- database_cleanup/tests/test_database_cleanup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database_cleanup/tests/test_database_cleanup.py b/database_cleanup/tests/test_database_cleanup.py index 9942efe6f..705b844f0 100644 --- a/database_cleanup/tests/test_database_cleanup.py +++ b/database_cleanup/tests/test_database_cleanup.py @@ -95,7 +95,8 @@ class TestDatabaseCleanup(TransactionCase): # reference to it original_registry = Registry.registries[self.env.cr.dbname] config.options['test_enable'] = False - purge_modules.purge_all() + with mute_logger('odoo.modules.graph', 'odoo.modules.loading'): + purge_modules.purge_all() config.options['test_enable'] = True # must be removed by the wizard self.assertFalse(self.env['ir.module.module'].search([ From dcd4f271bdb7be46f1ef514965133ab1bdb26dea Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Thu, 20 Feb 2020 10:16:06 +0100 Subject: [PATCH 2/2] [FIX][12.0] base_conditional_image: Fix descriptions and strings --- base_conditional_image/models/abstract_image.py | 5 +++-- base_conditional_image/models/image.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base_conditional_image/models/abstract_image.py b/base_conditional_image/models/abstract_image.py index 0aa43c578..30963958a 100644 --- a/base_conditional_image/models/abstract_image.py +++ b/base_conditional_image/models/abstract_image.py @@ -7,17 +7,18 @@ from odoo.tools.safe_eval import safe_eval class AbstractConditionalImage(models.AbstractModel): _name = 'abstract.conditional.image' + _description = 'Abstract image' image = fields.Binary( compute='_compute_image', string="Image", store=False, readonly=True ) image_medium = fields.Binary( - compute='_compute_image', string="Image", + compute='_compute_image', string="Medium-sized image", store=False, readonly=True ) image_small = fields.Binary( - compute='_compute_image', string="Image", + compute='_compute_image', string="Small-sized image", store=False, readonly=True ) diff --git a/base_conditional_image/models/image.py b/base_conditional_image/models/image.py index 6c32e0e9b..39d0a131c 100644 --- a/base_conditional_image/models/image.py +++ b/base_conditional_image/models/image.py @@ -7,6 +7,7 @@ from odoo.exceptions import ValidationError class Image(models.Model): _name = 'image' + _description = 'Image' name = fields.Char('Name', required=True) model_name = fields.Char('Model Name', required=True)