diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py index 44541c1bc7bec..77f34f856d030 100644 --- a/addons/delivery/models/delivery_carrier.py +++ b/addons/delivery/models/delivery_carrier.py @@ -174,7 +174,7 @@ def log_xml(self, xml_string, func): env = api.Environment(cr, SUPERUSER_ID, {}) IrLogging = env['ir.logging'] IrLogging.sudo().create({'name': 'delivery.carrier', - 'logging_type': 'server', + 'type': 'server', 'dbname': db_name, 'level': 'DEBUG', 'message': xml_string, diff --git a/odoo/addons/base/models/ir_actions.py b/odoo/addons/base/models/ir_actions.py index 12bd655bd56d0..634e5f60ca84c 100644 --- a/odoo/addons/base/models/ir_actions.py +++ b/odoo/addons/base/models/ir_actions.py @@ -507,7 +507,7 @@ def _get_eval_context(self, action=None): def log(message, level="info"): with self.pool.cursor() as cr: cr.execute(""" - INSERT INTO ir_logging(create_date, create_uid, logging_type, dbname, name, level, message, path, line, func) + INSERT INTO ir_logging(create_date, create_uid, type, dbname, name, level, message, path, line, func) VALUES (NOW() at time zone 'UTC', %s, %s, %s, %s, %s, %s, %s, %s, %s) """, (self.env.uid, 'server', self._cr.dbname, __name__, level, message, "action", action.id, action.name)) diff --git a/odoo/addons/base/models/ir_logging.py b/odoo/addons/base/models/ir_logging.py index 6e93e5bb23952..8d8a21f6d6cea 100644 --- a/odoo/addons/base/models/ir_logging.py +++ b/odoo/addons/base/models/ir_logging.py @@ -10,7 +10,7 @@ class IrLogging(models.Model): create_date = fields.Datetime(readonly=True) create_uid = fields.Integer(string='Uid', readonly=True) # Integer not m2o is intentionnal name = fields.Char(required=True) - logging_type = fields.Selection([('client', 'Client'), ('server', 'Server')], string='Type', required=True, index=True, oldname='type') + type = fields.Selection([('client', 'Client'), ('server', 'Server')], required=True, index=True) dbname = fields.Char(string='Database Name', index=True) level = fields.Char(index=True) message = fields.Text(required=True) diff --git a/odoo/addons/base/views/ir_logging_views.xml b/odoo/addons/base/views/ir_logging_views.xml index 2fccaaae2160a..baa21f2b89ddc 100644 --- a/odoo/addons/base/views/ir_logging_views.xml +++ b/odoo/addons/base/views/ir_logging_views.xml @@ -7,7 +7,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -39,14 +39,14 @@ - + - + diff --git a/odoo/netsvc.py b/odoo/netsvc.py index fbf2a055087fb..286ee740584cb 100644 --- a/odoo/netsvc.py +++ b/odoo/netsvc.py @@ -51,7 +51,7 @@ def emit(self, record): val = ('server', ct_db, record.name, levelname, msg, record.pathname[len(path_prefix)+1:], record.lineno, record.funcName) cr.execute(""" - INSERT INTO ir_logging(create_date, logging_type, dbname, name, level, message, path, line, func) + INSERT INTO ir_logging(create_date, type, dbname, name, level, message, path, line, func) VALUES (NOW() at time zone 'UTC', %s, %s, %s, %s, %s, %s, %s, %s) """, val)