From 11918bbf4318e6c75733fb5fa7077f642fa673de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 5 Sep 2018 13:12:40 +0200
Subject: [PATCH] [FIX] mail: use contact app icon for partner-related
 activities in systray

As res.partner model is defined in base systray takes the base icon as icon
used in the systray when classifying activities by model. As base module has
no icon it leads to a blank icon being displayed in the systray. Purpose of
this commit is to use the icon from Contact application instead.

As contacts application now depends on mail we do it simply through
inheriting the systray_get_activities method that return the data to display
the systray elements.

This commit is linked to task ID 1882545 and PR #26797.
---
 addons/contacts/__init__.py         |  2 ++
 addons/contacts/models/__init__.py  |  4 ++++
 addons/contacts/models/res_users.py | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 addons/contacts/models/__init__.py
 create mode 100644 addons/contacts/models/res_users.py

diff --git a/addons/contacts/__init__.py b/addons/contacts/__init__.py
index 67dee8c60db..dc5e6b693d1 100644
--- a/addons/contacts/__init__.py
+++ b/addons/contacts/__init__.py
@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/addons/contacts/models/__init__.py b/addons/contacts/models/__init__.py
new file mode 100644
index 00000000000..74f3017f7e6
--- /dev/null
+++ b/addons/contacts/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import res_users
diff --git a/addons/contacts/models/res_users.py b/addons/contacts/models/res_users.py
new file mode 100644
index 00000000000..04e16b713c6
--- /dev/null
+++ b/addons/contacts/models/res_users.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, models, modules
+
+
+class Users(models.Model):
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    @api.model
+    def systray_get_activities(self):
+        """ Update the systray icon of res.partner activities to use the
+        contact application one instead of base icon. """
+        activities = super(Users, self).systray_get_activities()
+        for activity in activities:
+            if activity['model'] != 'res.partner':
+                continue
+            activity['icon'] = modules.module.get_module_icon('contacts')
+        return activities