Merge PR #1325 into 17.0

Signed-off-by pedrobaeza
pull/1352/head
OCA-git-bot 2024-03-25 07:42:15 +00:00
commit b16b65be2f
6 changed files with 33 additions and 12 deletions

View File

@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier # Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.19 _commit: v1.20
_src_path: gh:oca/oca-addons-repo-template _src_path: gh:oca/oca-addons-repo-template
additional_ruff_rules: [] additional_ruff_rules: []
ci: GitHub ci: GitHub

View File

@ -41,7 +41,7 @@ repos:
hooks: hooks:
- id: whool-init - id: whool-init
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60 rev: 9a170331575a265c092ee6b24b845ec508e8ef75
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
@ -110,7 +110,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix] args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format - id: ruff-format
- repo: https://github.com/OCA/pylint-odoo - repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19 rev: v9.0.4
hooks: hooks:
- id: pylint_odoo - id: pylint_odoo
name: pylint with optional checks name: pylint with optional checks

View File

@ -6,6 +6,7 @@ fix = true
extend-select = [ extend-select = [
"B", "B",
"C90", "C90",
"E501", # line too long (default 88)
"I", # isort "I", # isort
"UP", # pyupgrade "UP", # pyupgrade
] ]

View File

@ -8,7 +8,8 @@
"development_status": "Beta", "development_status": "Beta",
"category": "Social Network", "category": "Social Network",
"website": "https://github.com/OCA/social", "website": "https://github.com/OCA/social",
"author": "SDi, David Juaneda, Sodexis, ACSONE SA/NV, Odoo Community Association (OCA)", "author": "SDi, David Juaneda, Sodexis, ACSONE SA/NV,"
" Odoo Community Association (OCA)",
"license": "AGPL-3", "license": "AGPL-3",
"installable": True, "installable": True,
"depends": ["calendar", "spreadsheet_dashboard"], "depends": ["calendar", "spreadsheet_dashboard"],

View File

@ -159,7 +159,10 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
self.assertEqual( self.assertEqual(
used_mail_server, used_mail_server,
expected_mail_server, expected_mail_server,
f"It using {used_mail_server.name} but we expect to use {expected_mail_server.name}", (
f"It using {used_mail_server.name}"
f" but we expect to use {expected_mail_server.name}"
),
) )
def test_02_from_outgoing_server_domaintwo(self): def test_02_from_outgoing_server_domaintwo(self):
@ -179,7 +182,10 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
self.assertEqual( self.assertEqual(
used_mail_server, used_mail_server,
expected_mail_server, expected_mail_server,
f"It using {used_mail_server.name} but we expect to use {expected_mail_server.name}", (
f"It using {used_mail_server.name}"
f" but we expect to use {expected_mail_server.name}"
),
) )
def test_03_from_outgoing_server_another(self): def test_03_from_outgoing_server_another(self):
@ -201,7 +207,10 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
self.assertEqual( self.assertEqual(
used_mail_server, used_mail_server,
expected_mail_server, expected_mail_server,
f"It using {used_mail_server.name} but we expect to use {expected_mail_server.name}", (
f"It using {used_mail_server.name}"
f" but we expect to use {expected_mail_server.name}"
),
) )
def test_04_from_outgoing_server_none_use_config(self): def test_04_from_outgoing_server_none_use_config(self):
@ -277,7 +286,10 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
self.assertEqual( self.assertEqual(
used_mail_server, used_mail_server,
expected_mail_server, expected_mail_server,
f"It using {used_mail_server.name} but we expect to use {expected_mail_server.name}", (
f"It using {used_mail_server.name}"
f" but we expect to use {expected_mail_server.name}"
),
) )
def test_07_from_outgoing_server_multidomain_1(self): def test_07_from_outgoing_server_multidomain_1(self):
@ -297,7 +309,10 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
self.assertEqual( self.assertEqual(
used_mail_server, used_mail_server,
expected_mail_server, expected_mail_server,
f"It using {used_mail_server.name} but we expect to use {expected_mail_server.name}", (
f"It using {used_mail_server.name}"
f" but we expect to use {expected_mail_server.name}"
),
) )
def test_08_from_outgoing_server_multidomain_3(self): def test_08_from_outgoing_server_multidomain_3(self):
@ -317,7 +332,10 @@ class TestIrMailServer(TransactionCase, MockSmtplibCase):
self.assertEqual( self.assertEqual(
used_mail_server, used_mail_server,
expected_mail_server, expected_mail_server,
f"It using {used_mail_server.name} but we expect to use {expected_mail_server.name}", (
f"It using {used_mail_server.name}"
f" but we expect to use {expected_mail_server.name}"
),
) )
def test_09_not_valid_domain_whitelist(self): def test_09_not_valid_domain_whitelist(self):

View File

@ -7,6 +7,7 @@ class ResPartner(models.Model):
forwarding_partner_id = fields.Many2one( forwarding_partner_id = fields.Many2one(
"res.partner", "res.partner",
string="Forwarding Partner", string="Forwarding Partner",
help="Messages will be forwarded only for partners that are followers but no " help="Messages will be forwarded only for partners that are followers but no"
"partners being notify because they belong to channel that is following the thread", " partners being notify because they belong to channel that is following"
" the thread",
) )