Merge remote-tracking branch 'origin/17.0' into 17.0

# Conflicts:
#	testserver_o2b/__manifest__.py
This commit is contained in:
2024-09-17 11:28:21 +02:00
17 changed files with 317 additions and 68 deletions

View File

@@ -22,8 +22,9 @@ class IrLogging(models.Model):
DELETE FROM mail_mail;
UPDATE ir_config_parameter set value = 'M160129258730' where key = 'database.enterprise_code';
UPDATE ir_config_parameter set value = (NOW() + INTERVAL '30 DAY') where key = 'database.expiration_date';
UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid';
INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.199','1025','mailcatcher','login','name','t');
UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid';
INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('127.0.0.1','1025','Lokale mailcatcher','login','name','t');
INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.199','1025','Algemene mailcatcher','login','name','t');
""" %(db_id))
if self.env['ir.config_parameter'].search([('key','=','web.base.url.freeze')]):
self.env.cr.execute("""DELETE FROM ir_config_parameter WHERE key = 'web.base.url.freeze';""")