From 36239e15942aa8a1a9f2dc38bd70abba4eb8d3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Fri, 19 Aug 2022 06:46:43 +0000
Subject: [PATCH] [MOV] calendar: move activity (type) code and views

Purpose is to have one file / model, easier when searching for inherited parts
of the code and see at a glance various usage of those models.

Spotted during Task-2207626 (Rating: Delay rating notification to ease feedback)

Part-of: odoo/odoo#98661
---
 addons/calendar/models/__init__.py           |  1 +
 addons/calendar/models/mail_activity.py      |  7 +------
 addons/calendar/models/mail_activity_type.py | 10 ++++++++++
 addons/note/models/__init__.py               |  1 +
 addons/note/models/mail_activity.py          |  6 ------
 addons/note/models/mail_activity_type.py     | 10 ++++++++++
 6 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 addons/calendar/models/mail_activity_type.py
 create mode 100644 addons/note/models/mail_activity_type.py

diff --git a/addons/calendar/models/__init__.py b/addons/calendar/models/__init__.py
index 536dde9919d..7f7cb86aad2 100644
--- a/addons/calendar/models/__init__.py
+++ b/addons/calendar/models/__init__.py
@@ -12,4 +12,5 @@ from . import calendar_event_type
 from . import calendar_recurrence
 from . import mail_activity
 from . import mail_activity_mixin
+from . import mail_activity_type
 from . import res_users
diff --git a/addons/calendar/models/mail_activity.py b/addons/calendar/models/mail_activity.py
index 14a72164363..4ceed29cc11 100644
--- a/addons/calendar/models/mail_activity.py
+++ b/addons/calendar/models/mail_activity.py
@@ -1,14 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, models, fields, tools, _
+from odoo import models, fields, tools, _
 from odoo.tools import is_html_empty
 
-class MailActivityType(models.Model):
-    _inherit = "mail.activity.type"
-
-    category = fields.Selection(selection_add=[('meeting', 'Meeting')])
-
 
 class MailActivity(models.Model):
     _inherit = "mail.activity"
diff --git a/addons/calendar/models/mail_activity_type.py b/addons/calendar/models/mail_activity_type.py
new file mode 100644
index 00000000000..0ad70222d40
--- /dev/null
+++ b/addons/calendar/models/mail_activity_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields
+
+
+class MailActivityType(models.Model):
+    _inherit = "mail.activity.type"
+
+    category = fields.Selection(selection_add=[('meeting', 'Meeting')])
diff --git a/addons/note/models/__init__.py b/addons/note/models/__init__.py
index db6de6e3c7f..11615bf4301 100644
--- a/addons/note/models/__init__.py
+++ b/addons/note/models/__init__.py
@@ -2,5 +2,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import mail_activity
+from . import mail_activity_type
 from . import note
 from . import res_users
diff --git a/addons/note/models/mail_activity.py b/addons/note/models/mail_activity.py
index 67f7ea82966..0b03a60ff5f 100644
--- a/addons/note/models/mail_activity.py
+++ b/addons/note/models/mail_activity.py
@@ -4,12 +4,6 @@
 from odoo import models, fields
 
 
-class MailActivityType(models.Model):
-    _inherit = "mail.activity.type"
-
-    category = fields.Selection(selection_add=[('reminder', 'Reminder')])
-
-
 class MailActivity(models.Model):
     _inherit = "mail.activity"
 
diff --git a/addons/note/models/mail_activity_type.py b/addons/note/models/mail_activity_type.py
new file mode 100644
index 00000000000..bc5902a53ed
--- /dev/null
+++ b/addons/note/models/mail_activity_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields
+
+
+class MailActivityType(models.Model):
+    _inherit = "mail.activity.type"
+
+    category = fields.Selection(selection_add=[('reminder', 'Reminder')])