diff --git a/mail_activity_board/static/description/index.html b/mail_activity_board/static/description/index.html
index ec1cdf9..0e9a687 100644
--- a/mail_activity_board/static/description/index.html
+++ b/mail_activity_board/static/description/index.html
@@ -409,6 +409,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
SDi
David Juaneda
Sodexis
+ACSONE SA/NV
diff --git a/mail_activity_board/tests/test_mail_activity_board.py b/mail_activity_board/tests/test_mail_activity_board.py
index 6aede0d..f83d971 100644
--- a/mail_activity_board/tests/test_mail_activity_board.py
+++ b/mail_activity_board/tests/test_mail_activity_board.py
@@ -202,3 +202,11 @@ class TestMailActivityBoardMethods(TransactionCase):
for act in acts:
self.assertIn(act, self.partner_client.activity_ids.ids)
+
+ def test_related_model_instance(self):
+ """This test case checks the direct access from the activity to the
+ linked model instance
+ """
+ self.assertEqual(self.act3.related_model_instance, self.partner_client)
+ self.act3.write({"res_id": False, "res_model": False})
+ self.assertFalse(self.act3.related_model_instance)
diff --git a/mail_activity_board/views/mail_activity_view.xml b/mail_activity_board/views/mail_activity_view.xml
index 2949532..9c3f365 100644
--- a/mail_activity_board/views/mail_activity_view.xml
+++ b/mail_activity_board/views/mail_activity_view.xml
@@ -4,6 +4,45 @@
VIEWS
-->
+
+
+
+
+
+ mail.activity.view.form.calendar (in mail_activity_board)
+ mail.activity
+
+
+
+
+
+
+ 1
+
+
+
+
mail.activity.boards.view.form
@@ -18,7 +57,8 @@
class="centre oe_link"
nolabel="1"
>
-
+
+
@@ -88,7 +128,12 @@
name="decoration-success"
>(date_deadline > current_date)
-
+
+
+
+
+ 1
+
diff --git a/mail_autosubscribe/README.rst b/mail_autosubscribe/README.rst
index 67a6ed9..3ba053c 100644
--- a/mail_autosubscribe/README.rst
+++ b/mail_autosubscribe/README.rst
@@ -80,6 +80,10 @@ Contributors
* Iván Todorovich
+* `Moduon `__
+
+ * Jairo Llopis
+
Maintainers
~~~~~~~~~~~
diff --git a/mail_autosubscribe/__manifest__.py b/mail_autosubscribe/__manifest__.py
index 2a9e5d6..03c582c 100644
--- a/mail_autosubscribe/__manifest__.py
+++ b/mail_autosubscribe/__manifest__.py
@@ -5,11 +5,14 @@
{
"name": "Mail Autosubscribe",
"summary": "Automatically subscribe partners to its company's business documents",
- "version": "15.0.1.0.1",
+ "version": "15.0.1.0.3",
"author": "Camptocamp SA, Odoo Community Association (OCA)",
"license": "AGPL-3",
"category": "Marketing",
"depends": ["mail"],
+ "external_dependencies": {
+ "python": ["odoo_test_helper"],
+ },
"website": "https://github.com/OCA/social",
"data": [
"security/ir.model.access.csv",
diff --git a/mail_autosubscribe/models/mail_thread.py b/mail_autosubscribe/models/mail_thread.py
index be8d473..e8ffece 100644
--- a/mail_autosubscribe/models/mail_thread.py
+++ b/mail_autosubscribe/models/mail_thread.py
@@ -19,7 +19,10 @@ class MailThread(models.AbstractModel):
for follower in followers
if follower not in partners and follower not in self.message_partner_ids
]
- partner_ids += follower_ids
+ if isinstance(partner_ids, tuple):
+ partner_ids += tuple(follower_ids)
+ else:
+ partner_ids += follower_ids
return super().message_subscribe(
partner_ids=partner_ids,
subtype_ids=subtype_ids,
diff --git a/mail_autosubscribe/readme/CONTRIBUTORS.rst b/mail_autosubscribe/readme/CONTRIBUTORS.rst
index df7472d..0024277 100644
--- a/mail_autosubscribe/readme/CONTRIBUTORS.rst
+++ b/mail_autosubscribe/readme/CONTRIBUTORS.rst
@@ -1,3 +1,7 @@
* `Camptocamp `_
* Iván Todorovich
+
+* `Moduon `__
+
+ * Jairo Llopis
diff --git a/mail_autosubscribe/static/description/index.html b/mail_autosubscribe/static/description/index.html
index d075ad7..3f280f7 100644
--- a/mail_autosubscribe/static/description/index.html
+++ b/mail_autosubscribe/static/description/index.html
@@ -429,6 +429,13 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
+Moduon
+
+
+
+
diff --git a/mail_autosubscribe/tests/test_mail_autosubscribe.py b/mail_autosubscribe/tests/test_mail_autosubscribe.py
index 6c16f03..27969c8 100644
--- a/mail_autosubscribe/tests/test_mail_autosubscribe.py
+++ b/mail_autosubscribe/tests/test_mail_autosubscribe.py
@@ -28,8 +28,8 @@ class TestMailAutosubscribe(TransactionCase):
{
"model_id": cls.fake_order_model.id,
"name": "Fake Order: Send by Mail",
- "subject": "Fake Order: ${object.partner_id.name}",
- "partner_to": "${object.partner_id.id}",
+ "subject": "Fake Order: {{object.partner_id.name}}",
+ "partner_to": "{{object.partner_id.id}}",
"body_html": "Hello, this is a fake order",
}
)
@@ -111,7 +111,7 @@ class TestMailAutosubscribe(TransactionCase):
default_composition_mode="comment",
)
)
- composer.save().send_mail()
+ composer.save().action_send_mail()
message = self.order.message_ids[0]
self.assertEqual(message.partner_ids, self.partner_2 | self.partner_3)
@@ -127,6 +127,6 @@ class TestMailAutosubscribe(TransactionCase):
default_composition_mode="comment",
)
)
- composer.save().send_mail()
+ composer.save().action_send_mail()
message = self.order.message_ids[0]
self.assertEqual(message.partner_ids, self.partner_2)
diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py
index 0bf6574..9b44e9e 100644
--- a/mail_debrand/__manifest__.py
+++ b/mail_debrand/__manifest__.py
@@ -12,7 +12,7 @@
( for powerd by) form all the templates
removes any 'odoo' that are in tempalte texts > 20characters
""",
- "version": "15.0.1.2.1",
+ "version": "15.0.1.2.2",
"category": "Social Network",
"website": "https://github.com/OCA/social",
"author": """Tecnativa, ForgeFlow, Onestein, Sodexis, Nexterp Romania,
diff --git a/mail_debrand/tests/test_mail_debrand_digest.py b/mail_debrand/tests/test_mail_debrand_digest.py
index 10aca89..238b377 100644
--- a/mail_debrand/tests/test_mail_debrand_digest.py
+++ b/mail_debrand/tests/test_mail_debrand_digest.py
@@ -38,7 +38,7 @@ class TestMailDebrandDigest(common.TransactionCase):
"digest.digest_mail_main",
"digest.digest",
self.mail_digest_id.ids,
- engine="qweb",
+ engine="qweb_view",
add_context={
"title": self.mail_digest_id.name,
"top_button_label": _("Connect"),
@@ -48,13 +48,13 @@ class TestMailDebrandDigest(common.TransactionCase):
"tips_count": 1,
"formatted_date": datetime.today().strftime("%B %d, %Y"),
"display_mobile_banner": True,
- "kpi_data": self.mail_digest_id.compute_kpis(
+ "kpi_data": self.mail_digest_id._compute_kpis(
self.env.user.company_id, self.env.user
),
- "tips": self.mail_digest_id.compute_tips(
+ "tips": self.mail_digest_id._compute_tips(
self.env.user.company_id, self.env.user, tips_count=1, consumed=True
),
- "preferences": self.mail_digest_id.compute_preferences(
+ "preferences": self.mail_digest_id._compute_preferences(
self.env.user.company_id, self.env.user
),
},
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..fb06c6f
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+# generated from manifests external_dependencies
+odoo_test_helper