From 1515170639517dd6b792fb072a6c357ec3ede8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 11 Jul 2022 12:32:20 +0000 Subject: [PATCH 1/4] [FIX] base: ir_cron trigger methods are not model Trigger methods are defined as api.model but actually use self. Those are therefore not model. Smart. Spotted during Task-2207626 (Rating: Delay rating notification to ease feedback) Part-of: odoo/odoo#98661 --- odoo/addons/base/models/ir_cron.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/odoo/addons/base/models/ir_cron.py b/odoo/addons/base/models/ir_cron.py index 1361aa793fd..bdd2cc86751 100644 --- a/odoo/addons/base/models/ir_cron.py +++ b/odoo/addons/base/models/ir_cron.py @@ -442,7 +442,6 @@ class ir_cron(models.Model): active = bool(self.env[model].search_count(domain)) return self.try_write({'active': active}) - @api.model def _trigger(self, at=None): """ Schedule a cron job to be executed soon independently of its @@ -470,7 +469,6 @@ class ir_cron(models.Model): self._trigger_list(at_list) - @api.model def _trigger_list(self, at_list): """ Implementation of :meth:`~._trigger`. From 36239e15942aa8a1a9f2dc38bd70abba4eb8d3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 19 Aug 2022 06:46:43 +0000 Subject: [PATCH 2/4] [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')]) From 0419de7ff2e29d55a1c6dbdc0e770c6a22b736f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 23 Aug 2022 12:05:05 +0000 Subject: [PATCH 3/4] [MOV] various: move / rename rating files Just doing the summer file cleaning. Move rating code into files named based on their model, easing maintenance and searching for those data. Spotted during Task-2207626 (Rating: Delay rating notification to ease feedback) Part-of: odoo/odoo#98661 --- addons/hr_timesheet/__manifest__.py | 2 +- .../views/{rating_views.xml => rating_rating_views.xml} | 0 addons/im_livechat/__manifest__.py | 2 +- addons/im_livechat/models/__init__.py | 2 +- addons/im_livechat/models/{rating.py => rating_rating.py} | 0 .../views/{rating_views.xml => rating_rating_views.xml} | 0 addons/portal_rating/__manifest__.py | 2 +- addons/portal_rating/models/__init__.py | 2 +- addons/portal_rating/models/{rating.py => rating_rating.py} | 0 .../views/{rating_views.xml => rating_rating_views.xml} | 0 addons/project/__manifest__.py | 2 +- .../project/views/{rating_views.xml => rating_rating_views.xml} | 0 12 files changed, 6 insertions(+), 6 deletions(-) rename addons/hr_timesheet/views/{rating_views.xml => rating_rating_views.xml} (100%) rename addons/im_livechat/models/{rating.py => rating_rating.py} (100%) rename addons/im_livechat/views/{rating_views.xml => rating_rating_views.xml} (100%) rename addons/portal_rating/models/{rating.py => rating_rating.py} (100%) rename addons/portal_rating/views/{rating_views.xml => rating_rating_views.xml} (100%) rename addons/project/views/{rating_views.xml => rating_rating_views.xml} (100%) diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py index 17d8503deb3..abb6c43b1bf 100644 --- a/addons/hr_timesheet/__manifest__.py +++ b/addons/hr_timesheet/__manifest__.py @@ -37,7 +37,7 @@ up a management by affair. 'views/hr_views.xml', 'data/hr_timesheet_data.xml', 'views/project_sharing_views.xml', - 'views/rating_views.xml', + 'views/rating_rating_views.xml', 'views/project_update_views.xml', ], 'demo': [ diff --git a/addons/hr_timesheet/views/rating_views.xml b/addons/hr_timesheet/views/rating_rating_views.xml similarity index 100% rename from addons/hr_timesheet/views/rating_views.xml rename to addons/hr_timesheet/views/rating_rating_views.xml diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index f8e2720db74..e3c1bfdb1f4 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -28,7 +28,7 @@ Help your customers with this chat, and analyse their feedback. 'views/chatbot_script_answer_views.xml', 'views/chatbot_script_step_views.xml', 'views/chatbot_script_views.xml', - "views/rating_views.xml", + "views/rating_rating_views.xml", "views/mail_channel_views.xml", "views/im_livechat_channel_views.xml", "views/im_livechat_channel_templates.xml", diff --git a/addons/im_livechat/models/__init__.py b/addons/im_livechat/models/__init__.py index 069dc2a6422..52c1c79d942 100644 --- a/addons/im_livechat/models/__init__.py +++ b/addons/im_livechat/models/__init__.py @@ -11,5 +11,5 @@ from . import mail_channel from . import mail_channel_member from . import mail_message from . import res_users_settings -from . import rating +from . import rating_rating from . import digest diff --git a/addons/im_livechat/models/rating.py b/addons/im_livechat/models/rating_rating.py similarity index 100% rename from addons/im_livechat/models/rating.py rename to addons/im_livechat/models/rating_rating.py diff --git a/addons/im_livechat/views/rating_views.xml b/addons/im_livechat/views/rating_rating_views.xml similarity index 100% rename from addons/im_livechat/views/rating_views.xml rename to addons/im_livechat/views/rating_rating_views.xml diff --git a/addons/portal_rating/__manifest__.py b/addons/portal_rating/__manifest__.py index 61891ae48ad..2ffa6deccc6 100644 --- a/addons/portal_rating/__manifest__.py +++ b/addons/portal_rating/__manifest__.py @@ -14,7 +14,7 @@ inclusion of rating directly within the customer portal discuss widget. 'rating', ], 'data': [ - 'views/rating_views.xml', + 'views/rating_rating_views.xml', 'views/portal_templates.xml', 'views/rating_templates.xml', ], diff --git a/addons/portal_rating/models/__init__.py b/addons/portal_rating/models/__init__.py index dc338926a17..4bd60c9d22f 100644 --- a/addons/portal_rating/models/__init__.py +++ b/addons/portal_rating/models/__init__.py @@ -3,4 +3,4 @@ from . import ir_http from . import mail_message -from . import rating +from . import rating_rating diff --git a/addons/portal_rating/models/rating.py b/addons/portal_rating/models/rating_rating.py similarity index 100% rename from addons/portal_rating/models/rating.py rename to addons/portal_rating/models/rating_rating.py diff --git a/addons/portal_rating/views/rating_views.xml b/addons/portal_rating/views/rating_rating_views.xml similarity index 100% rename from addons/portal_rating/views/rating_views.xml rename to addons/portal_rating/views/rating_rating_views.xml diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py index 90b314cbc3c..29d45547987 100644 --- a/addons/project/__manifest__.py +++ b/addons/project/__manifest__.py @@ -28,7 +28,7 @@ 'report/project_task_burndown_chart_report_views.xml', 'views/analytic_views.xml', 'views/digest_views.xml', - 'views/rating_views.xml', + 'views/rating_rating_views.xml', 'views/project_update_views.xml', 'views/project_update_templates.xml', 'views/project_project_stage_views.xml', diff --git a/addons/project/views/rating_views.xml b/addons/project/views/rating_rating_views.xml similarity index 100% rename from addons/project/views/rating_views.xml rename to addons/project/views/rating_rating_views.xml From d13d251a2f66a9fd170fb7745f05025818be7ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 23 Aug 2022 13:27:16 +0000 Subject: [PATCH 4/4] [MOV] various: move and split mail data Just doing the summer file cleaning. Move mail data into files named based on their model, easing maintenance and searching for those data. Spotted during Task-2207626 (Rating: Delay rating notification to ease feedback) Part-of: odoo/odoo#98661 --- addons/calendar/__manifest__.py | 3 +- .../calendar/data/mail_activity_type_data.xml | 8 ++++++ ...ious.xml => mail_message_subtype_data.xml} | 4 --- addons/crm/__manifest__.py | 4 +-- ...y_demo.xml => mail_activity_type_demo.xml} | 0 ...data.xml => mail_message_subtype_data.xml} | 0 addons/event_booth/__manifest__.py | 2 +- ...data.xml => mail_message_subtype_data.xml} | 0 addons/event_sale/__manifest__.py | 2 +- .../{mail_data.xml => mail_templates.xml} | 0 addons/fleet/__manifest__.py | 3 +- addons/fleet/data/mail_activity_type_data.xml | 10 +++++++ ...data.xml => mail_message_subtype_data.xml} | 6 ---- addons/hr_expense/__manifest__.py | 4 ++- .../data/mail_activity_type_data.xml | 10 +++++++ addons/hr_expense/data/mail_alias_data.xml | 12 ++++++++ ...data.xml => mail_message_subtype_data.xml} | 14 ---------- addons/hr_holidays/__manifest__.py | 3 +- .../data/mail_activity_type_data.xml | 28 +++++++++++++++++++ ...data.xml => mail_message_subtype_data.xml} | 24 ---------------- addons/hr_recruitment/__manifest__.py | 3 +- .../hr_recruitment/data/mail_alias_data.xml | 11 ++++++++ ...data.xml => mail_message_subtype_data.xml} | 8 ------ addons/im_livechat/__manifest__.py | 2 +- .../{mail_data.xml => mail_templates.xml} | 0 addons/mail/__manifest__.py | 1 - addons/mail/data/fetchmail_data.xml | 17 ----------- addons/mail/data/ir_cron_data.xml | 12 ++++++++ addons/maintenance/__manifest__.py | 4 ++- .../data/mail_activity_type_data.xml | 11 ++++++++ addons/maintenance/data/mail_alias_data.xml | 11 ++++++++ ...data.xml => mail_message_subtype_data.xml} | 14 ---------- addons/note/__manifest__.py | 2 +- ...y_data.xml => mail_activity_type_data.xml} | 0 addons/product_expiry/__manifest__.py | 4 ++- .../data/mail_activity_type_data.xml | 10 +++++++ .../data/product_expiry_data.xml | 8 ------ addons/project/__manifest__.py | 2 +- ...data.xml => mail_message_subtype_data.xml} | 0 addons/sale/__manifest__.py | 3 +- addons/sale/data/mail_activity_type_data.xml | 11 ++++++++ ...ious.xml => mail_message_subtype_data.xml} | 7 ----- addons/sale_purchase/__manifest__.py | 2 +- .../{mail_data.xml => mail_templates.xml} | 0 addons/website_blog/__manifest__.py | 2 +- ...data.xml => mail_message_subtype_data.xml} | 0 addons/website_event_track/__manifest__.py | 4 +-- ...data.xml => mail_message_subtype_data.xml} | 0 .../{views => data}/mail_templates.xml | 0 addons/website_forum/__manifest__.py | 2 +- ...data.xml => mail_message_subtype_data.xml} | 0 addons/website_payment/__manifest__.py | 3 +- .../data/mail_template_data.xml | 10 +++++++ .../{donation_data.xml => mail_templates.xml} | 10 ++----- addons/website_slides/__manifest__.py | 3 +- .../data/mail_activity_type_data.xml | 9 ++++++ ...data.xml => mail_message_subtype_data.xml} | 7 ----- 57 files changed, 190 insertions(+), 140 deletions(-) create mode 100644 addons/calendar/data/mail_activity_type_data.xml rename addons/calendar/data/{mail_data_various.xml => mail_message_subtype_data.xml} (71%) rename addons/crm/data/{mail_activity_demo.xml => mail_activity_type_demo.xml} (100%) rename addons/crm/data/{mail_data.xml => mail_message_subtype_data.xml} (100%) rename addons/event_booth/data/{mail_data.xml => mail_message_subtype_data.xml} (100%) rename addons/event_sale/data/{mail_data.xml => mail_templates.xml} (100%) create mode 100644 addons/fleet/data/mail_activity_type_data.xml rename addons/fleet/data/{mail_data.xml => mail_message_subtype_data.xml} (62%) create mode 100644 addons/hr_expense/data/mail_activity_type_data.xml create mode 100644 addons/hr_expense/data/mail_alias_data.xml rename addons/hr_expense/data/{mail_data.xml => mail_message_subtype_data.xml} (63%) create mode 100644 addons/hr_holidays/data/mail_activity_type_data.xml rename addons/hr_holidays/data/{mail_data.xml => mail_message_subtype_data.xml} (56%) create mode 100644 addons/hr_recruitment/data/mail_alias_data.xml rename addons/hr_recruitment/data/{mail_data.xml => mail_message_subtype_data.xml} (90%) rename addons/im_livechat/data/{mail_data.xml => mail_templates.xml} (100%) delete mode 100644 addons/mail/data/fetchmail_data.xml create mode 100644 addons/maintenance/data/mail_activity_type_data.xml create mode 100644 addons/maintenance/data/mail_alias_data.xml rename addons/maintenance/data/{mail_data.xml => mail_message_subtype_data.xml} (76%) rename addons/note/data/{mail_activity_data.xml => mail_activity_type_data.xml} (100%) create mode 100644 addons/product_expiry/data/mail_activity_type_data.xml rename addons/project/data/{mail_data.xml => mail_message_subtype_data.xml} (100%) create mode 100644 addons/sale/data/mail_activity_type_data.xml rename addons/sale/data/{mail_data_various.xml => mail_message_subtype_data.xml} (89%) rename addons/sale_purchase/data/{mail_data.xml => mail_templates.xml} (100%) rename addons/website_blog/data/{mail_data.xml => mail_message_subtype_data.xml} (100%) rename addons/website_event_track/data/{mail_data.xml => mail_message_subtype_data.xml} (100%) rename addons/website_event_track/{views => data}/mail_templates.xml (100%) rename addons/website_forum/data/{mail_data.xml => mail_message_subtype_data.xml} (100%) create mode 100644 addons/website_payment/data/mail_template_data.xml rename addons/website_payment/data/{donation_data.xml => mail_templates.xml} (90%) create mode 100644 addons/website_slides/data/mail_activity_type_data.xml rename addons/website_slides/data/{mail_data.xml => mail_message_subtype_data.xml} (59%) diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py index c735665be15..f8aec351693 100644 --- a/addons/calendar/__manifest__.py +++ b/addons/calendar/__manifest__.py @@ -28,7 +28,8 @@ If you need to manage your meetings, you should install the CRM module. 'data/calendar_cron.xml', 'data/mail_template_data.xml', 'data/calendar_data.xml', - 'data/mail_data_various.xml', + 'data/mail_activity_type_data.xml', + 'data/mail_message_subtype_data.xml', 'views/mail_activity_views.xml', 'views/calendar_templates.xml', 'views/calendar_views.xml', diff --git a/addons/calendar/data/mail_activity_type_data.xml b/addons/calendar/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..544696fbd60 --- /dev/null +++ b/addons/calendar/data/mail_activity_type_data.xml @@ -0,0 +1,8 @@ + + + + + meeting + + + diff --git a/addons/calendar/data/mail_data_various.xml b/addons/calendar/data/mail_message_subtype_data.xml similarity index 71% rename from addons/calendar/data/mail_data_various.xml rename to addons/calendar/data/mail_message_subtype_data.xml index aef25277b0f..92d1c289dac 100644 --- a/addons/calendar/data/mail_data_various.xml +++ b/addons/calendar/data/mail_message_subtype_data.xml @@ -1,10 +1,6 @@ - - meeting - - Invitation calendar.event diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py index 5d0ed383a24..a247d683053 100644 --- a/addons/crm/__manifest__.py +++ b/addons/crm/__manifest__.py @@ -34,7 +34,7 @@ 'data/digest_data.xml', 'data/ir_action_data.xml', 'data/ir_cron_data.xml', - 'data/mail_data.xml', + 'data/mail_message_subtype_data.xml', 'data/crm_recurring_plan_data.xml', 'wizard/crm_lead_lost_views.xml', @@ -64,7 +64,7 @@ 'data/crm_team_demo.xml', 'data/mail_template_demo.xml', 'data/crm_team_member_demo.xml', - 'data/mail_activity_demo.xml', + 'data/mail_activity_type_demo.xml', 'data/crm_lead_demo.xml', ], 'installable': True, diff --git a/addons/crm/data/mail_activity_demo.xml b/addons/crm/data/mail_activity_type_demo.xml similarity index 100% rename from addons/crm/data/mail_activity_demo.xml rename to addons/crm/data/mail_activity_type_demo.xml diff --git a/addons/crm/data/mail_data.xml b/addons/crm/data/mail_message_subtype_data.xml similarity index 100% rename from addons/crm/data/mail_data.xml rename to addons/crm/data/mail_message_subtype_data.xml diff --git a/addons/event_booth/__manifest__.py b/addons/event_booth/__manifest__.py index 22f4026f3e1..80ae450a0be 100644 --- a/addons/event_booth/__manifest__.py +++ b/addons/event_booth/__manifest__.py @@ -19,7 +19,7 @@ Create booths for your favorite event. 'views/event_event_views.xml', 'views/event_menus.xml', 'data/event_booth_category_data.xml', - 'data/mail_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_templates.xml', ], 'demo': [ diff --git a/addons/event_booth/data/mail_data.xml b/addons/event_booth/data/mail_message_subtype_data.xml similarity index 100% rename from addons/event_booth/data/mail_data.xml rename to addons/event_booth/data/mail_message_subtype_data.xml diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py index c114a046c85..caff9de6f23 100644 --- a/addons/event_sale/__manifest__.py +++ b/addons/event_sale/__manifest__.py @@ -25,7 +25,7 @@ this event. 'views/event_views.xml', 'views/sale_order_views.xml', 'data/event_sale_data.xml', - 'data/mail_data.xml', + 'data/mail_templates.xml', 'report/event_event_templates.xml', 'report/event_sale_report_views.xml', 'security/ir.model.access.csv', diff --git a/addons/event_sale/data/mail_data.xml b/addons/event_sale/data/mail_templates.xml similarity index 100% rename from addons/event_sale/data/mail_data.xml rename to addons/event_sale/data/mail_templates.xml diff --git a/addons/fleet/__manifest__.py b/addons/fleet/__manifest__.py index 3f52117fafa..53f9082c39e 100644 --- a/addons/fleet/__manifest__.py +++ b/addons/fleet/__manifest__.py @@ -39,7 +39,8 @@ Main Features 'views/res_config_settings_views.xml', 'data/fleet_cars_data.xml', 'data/fleet_data.xml', - 'data/mail_data.xml', + 'data/mail_message_subtype_data.xml', + 'data/mail_activity_type_data.xml', ], 'demo': ['data/fleet_demo.xml'], diff --git a/addons/fleet/data/mail_activity_type_data.xml b/addons/fleet/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..3ee9a3c04ff --- /dev/null +++ b/addons/fleet/data/mail_activity_type_data.xml @@ -0,0 +1,10 @@ + + + + + Contract to Renew + fa-car + fleet.vehicle.log.contract + + + diff --git a/addons/fleet/data/mail_data.xml b/addons/fleet/data/mail_message_subtype_data.xml similarity index 62% rename from addons/fleet/data/mail_data.xml rename to addons/fleet/data/mail_message_subtype_data.xml index 969438a86fd..3d907ed40f7 100644 --- a/addons/fleet/data/mail_data.xml +++ b/addons/fleet/data/mail_message_subtype_data.xml @@ -1,12 +1,6 @@ - - Contract to Renew - fa-car - fleet.vehicle.log.contract - - Changed Driver 0 diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py index fed61af59be..dc357795505 100644 --- a/addons/hr_expense/__manifest__.py +++ b/addons/hr_expense/__manifest__.py @@ -31,7 +31,9 @@ This module also uses analytic accounting and is compatible with the invoice on 'security/hr_expense_security.xml', 'security/ir.model.access.csv', 'data/digest_data.xml', - 'data/mail_data.xml', + 'data/mail_activity_type_data.xml', + 'data/mail_alias_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_templates.xml', 'data/hr_expense_sequence.xml', 'data/hr_expense_data.xml', diff --git a/addons/hr_expense/data/mail_activity_type_data.xml b/addons/hr_expense/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..94821dd5501 --- /dev/null +++ b/addons/hr_expense/data/mail_activity_type_data.xml @@ -0,0 +1,10 @@ + + + + + Expense Approval + fa-dollar + hr.expense.sheet + + + diff --git a/addons/hr_expense/data/mail_alias_data.xml b/addons/hr_expense/data/mail_alias_data.xml new file mode 100644 index 00000000000..7c8470c5cb5 --- /dev/null +++ b/addons/hr_expense/data/mail_alias_data.xml @@ -0,0 +1,12 @@ + + + + + + expense + + + employees + + + diff --git a/addons/hr_expense/data/mail_data.xml b/addons/hr_expense/data/mail_message_subtype_data.xml similarity index 63% rename from addons/hr_expense/data/mail_data.xml rename to addons/hr_expense/data/mail_message_subtype_data.xml index 72ed9f43ff8..ba954e6cfad 100644 --- a/addons/hr_expense/data/mail_data.xml +++ b/addons/hr_expense/data/mail_message_subtype_data.xml @@ -1,20 +1,6 @@ - - Expense Approval - fa-dollar - hr.expense.sheet - - - - - expense - - - employees - - Approved diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py index 370f1859c2c..e08ad3d6e81 100644 --- a/addons/hr_holidays/__manifest__.py +++ b/addons/hr_holidays/__manifest__.py @@ -27,7 +27,8 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p 'depends': ['hr', 'calendar', 'resource'], 'data': [ 'data/report_paperformat.xml', - 'data/mail_data.xml', + 'data/mail_activity_type_data.xml', + 'data/mail_message_subtype_data.xml', 'data/hr_holidays_data.xml', 'data/ir_cron_data.xml', diff --git a/addons/hr_holidays/data/mail_activity_type_data.xml b/addons/hr_holidays/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..b5bac396e0d --- /dev/null +++ b/addons/hr_holidays/data/mail_activity_type_data.xml @@ -0,0 +1,28 @@ + + + + + + Time Off Approval + fa-sun-o + hr.leave + + + Time Off Second Approve + fa-sun-o + hr.leave + + + + + Allocation Approval + fa-sun-o + hr.leave.allocation + + + Allocation Second Approve + fa-sun-o + hr.leave.allocation + + + diff --git a/addons/hr_holidays/data/mail_data.xml b/addons/hr_holidays/data/mail_message_subtype_data.xml similarity index 56% rename from addons/hr_holidays/data/mail_data.xml rename to addons/hr_holidays/data/mail_message_subtype_data.xml index c5d6c162b51..22c06844868 100644 --- a/addons/hr_holidays/data/mail_data.xml +++ b/addons/hr_holidays/data/mail_message_subtype_data.xml @@ -1,30 +1,6 @@ - - - Time Off Approval - fa-sun-o - hr.leave - - - Time Off Second Approve - fa-sun-o - hr.leave - - - - - Allocation Approval - fa-sun-o - hr.leave.allocation - - - Allocation Second Approve - fa-sun-o - hr.leave.allocation - - Time Off diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py index b23708310f7..77e5192064d 100644 --- a/addons/hr_recruitment/__manifest__.py +++ b/addons/hr_recruitment/__manifest__.py @@ -20,7 +20,8 @@ 'security/hr_recruitment_security.xml', 'security/ir.model.access.csv', 'data/digest_data.xml', - 'data/mail_data.xml', + 'data/mail_alias_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_template_data.xml', 'data/mail_templates.xml', 'data/hr_recruitment_data.xml', diff --git a/addons/hr_recruitment/data/mail_alias_data.xml b/addons/hr_recruitment/data/mail_alias_data.xml new file mode 100644 index 00000000000..8a3df2c9f23 --- /dev/null +++ b/addons/hr_recruitment/data/mail_alias_data.xml @@ -0,0 +1,11 @@ + + + + + jobs + + + + + + diff --git a/addons/hr_recruitment/data/mail_data.xml b/addons/hr_recruitment/data/mail_message_subtype_data.xml similarity index 90% rename from addons/hr_recruitment/data/mail_data.xml rename to addons/hr_recruitment/data/mail_message_subtype_data.xml index f14f899c204..b255f071f7b 100644 --- a/addons/hr_recruitment/data/mail_data.xml +++ b/addons/hr_recruitment/data/mail_message_subtype_data.xml @@ -1,14 +1,6 @@ - - - jobs - - - - - New Applicant diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index e3c1bfdb1f4..428cfa36ed3 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -21,7 +21,7 @@ Help your customers with this chat, and analyse their feedback. "security/im_livechat_channel_security.xml", "security/ir.model.access.csv", "data/mail_shortcode_data.xml", - "data/mail_data.xml", + "data/mail_templates.xml", "data/im_livechat_channel_data.xml", "data/im_livechat_chatbot_data.xml", 'data/digest_data.xml', diff --git a/addons/im_livechat/data/mail_data.xml b/addons/im_livechat/data/mail_templates.xml similarity index 100% rename from addons/im_livechat/data/mail_data.xml rename to addons/im_livechat/data/mail_templates.xml diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py index 561d3534771..002c3707485 100644 --- a/addons/mail/__manifest__.py +++ b/addons/mail/__manifest__.py @@ -61,7 +61,6 @@ For more specific needs, you may also assign custom-defined actions 'website': 'https://www.odoo.com/app/discuss', 'depends': ['base', 'base_setup', 'bus', 'web_tour'], 'data': [ - 'data/fetchmail_data.xml', 'data/mail_groups.xml', 'wizard/mail_blacklist_remove_views.xml', 'wizard/mail_compose_message_views.xml', diff --git a/addons/mail/data/fetchmail_data.xml b/addons/mail/data/fetchmail_data.xml deleted file mode 100644 index d98c3d1f92f..00000000000 --- a/addons/mail/data/fetchmail_data.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Mail: Fetchmail Service - - code - model._fetch_mails() - 5 - minutes - -1 - - - - - - diff --git a/addons/mail/data/ir_cron_data.xml b/addons/mail/data/ir_cron_data.xml index 2945e687420..8362160d762 100644 --- a/addons/mail/data/ir_cron_data.xml +++ b/addons/mail/data/ir_cron_data.xml @@ -42,5 +42,17 @@ code + + Mail: Fetchmail Service + + code + model._fetch_mails() + 5 + minutes + -1 + + + + diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py index 3449dec937d..8dcf13dd0a7 100644 --- a/addons/maintenance/__manifest__.py +++ b/addons/maintenance/__manifest__.py @@ -14,7 +14,9 @@ 'security/maintenance.xml', 'security/ir.model.access.csv', 'data/maintenance_data.xml', - 'data/mail_data.xml', + 'data/mail_alias_data.xml', + 'data/mail_activity_type_data.xml', + 'data/mail_message_subtype_data.xml', 'views/maintenance_views.xml', 'views/mail_activity_views.xml', 'data/maintenance_cron.xml', diff --git a/addons/maintenance/data/mail_activity_type_data.xml b/addons/maintenance/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..1f31a1c9e2d --- /dev/null +++ b/addons/maintenance/data/mail_activity_type_data.xml @@ -0,0 +1,11 @@ + + + + + + Maintenance Request + fa-wrench + maintenance.request + + + diff --git a/addons/maintenance/data/mail_alias_data.xml b/addons/maintenance/data/mail_alias_data.xml new file mode 100644 index 00000000000..c0922547099 --- /dev/null +++ b/addons/maintenance/data/mail_alias_data.xml @@ -0,0 +1,11 @@ + + + + + + helpdesk + + + + + diff --git a/addons/maintenance/data/mail_data.xml b/addons/maintenance/data/mail_message_subtype_data.xml similarity index 76% rename from addons/maintenance/data/mail_data.xml rename to addons/maintenance/data/mail_message_subtype_data.xml index 0d9b18c9a9e..70b286ef39f 100644 --- a/addons/maintenance/data/mail_data.xml +++ b/addons/maintenance/data/mail_message_subtype_data.xml @@ -1,20 +1,6 @@ - - - Maintenance Request - fa-wrench - maintenance.request - - - - - helpdesk - - - - Request Created diff --git a/addons/note/__manifest__.py b/addons/note/__manifest__.py index ed4a5fd6d65..bb4ecebaee3 100644 --- a/addons/note/__manifest__.py +++ b/addons/note/__manifest__.py @@ -14,7 +14,7 @@ 'data': [ 'security/note_security.xml', 'security/ir.model.access.csv', - 'data/mail_activity_data.xml', + 'data/mail_activity_type_data.xml', 'data/note_data.xml', 'data/res_users_data.xml', 'views/note_views.xml', diff --git a/addons/note/data/mail_activity_data.xml b/addons/note/data/mail_activity_type_data.xml similarity index 100% rename from addons/note/data/mail_activity_data.xml rename to addons/note/data/mail_activity_type_data.xml diff --git a/addons/product_expiry/__manifest__.py b/addons/product_expiry/__manifest__.py index 2ff8acdd2d3..cbdf579abda 100644 --- a/addons/product_expiry/__manifest__.py +++ b/addons/product_expiry/__manifest__.py @@ -27,6 +27,8 @@ Also implements the removal strategy First Expiry First Out (FEFO) widely used, 'report/report_deliveryslip.xml', 'report/report_lot_barcode.xml', 'report/report_package_barcode.xml', - 'data/product_expiry_data.xml'], + 'data/product_expiry_data.xml', + 'data/mail_activity_type_data.xml', + ], 'license': 'LGPL-3', } diff --git a/addons/product_expiry/data/mail_activity_type_data.xml b/addons/product_expiry/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..4a40dbdb948 --- /dev/null +++ b/addons/product_expiry/data/mail_activity_type_data.xml @@ -0,0 +1,10 @@ + + + + Alert Date Reached + default + stock.lot + fa-tasks + 0 + + diff --git a/addons/product_expiry/data/product_expiry_data.xml b/addons/product_expiry/data/product_expiry_data.xml index 9cb695b5f2f..03609fb2e93 100644 --- a/addons/product_expiry/data/product_expiry_data.xml +++ b/addons/product_expiry/data/product_expiry_data.xml @@ -4,12 +4,4 @@ First Expiry First Out (FEFO) fefo - - Alert Date Reached - default - stock.lot - fa-tasks - 0 - - diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py index 29d45547987..2fc4fa7763d 100644 --- a/addons/project/__manifest__.py +++ b/addons/project/__manifest__.py @@ -44,7 +44,7 @@ 'views/project_task_templates.xml', 'views/project_sharing_templates.xml', 'data/ir_cron_data.xml', - 'data/mail_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_template_data.xml', 'data/project_data.xml', 'wizard/project_task_type_delete_views.xml', diff --git a/addons/project/data/mail_data.xml b/addons/project/data/mail_message_subtype_data.xml similarity index 100% rename from addons/project/data/mail_data.xml rename to addons/project/data/mail_message_subtype_data.xml diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py index 8026aeacf9b..879890f0e83 100644 --- a/addons/sale/__manifest__.py +++ b/addons/sale/__manifest__.py @@ -22,7 +22,8 @@ This module contains all the common features of Sales Management and eCommerce. 'report/sale_report_views.xml', 'data/ir_sequence_data.xml', - 'data/mail_data_various.xml', + 'data/mail_activity_type_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_template_data.xml', 'data/sale_data.xml', diff --git a/addons/sale/data/mail_activity_type_data.xml b/addons/sale/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..730202c88ce --- /dev/null +++ b/addons/sale/data/mail_activity_type_data.xml @@ -0,0 +1,11 @@ + + + + + + Order Upsell + fa-line-chart + sale.order + + + diff --git a/addons/sale/data/mail_data_various.xml b/addons/sale/data/mail_message_subtype_data.xml similarity index 89% rename from addons/sale/data/mail_data_various.xml rename to addons/sale/data/mail_message_subtype_data.xml index 0d6177b2f17..3203945ad6a 100644 --- a/addons/sale/data/mail_data_various.xml +++ b/addons/sale/data/mail_message_subtype_data.xml @@ -1,13 +1,6 @@ - - - Order Upsell - fa-line-chart - sale.order - - Quotation sent diff --git a/addons/sale_purchase/__manifest__.py b/addons/sale_purchase/__manifest__.py index a776c7e0993..246908cf239 100644 --- a/addons/sale_purchase/__manifest__.py +++ b/addons/sale_purchase/__manifest__.py @@ -16,7 +16,7 @@ by external providers and will automatically generate purchase orders directed t 'purchase', ], 'data': [ - 'data/mail_data.xml', + 'data/mail_templates.xml', 'views/product_views.xml', 'views/sale_order_views.xml', 'views/purchase_order_views.xml', diff --git a/addons/sale_purchase/data/mail_data.xml b/addons/sale_purchase/data/mail_templates.xml similarity index 100% rename from addons/sale_purchase/data/mail_data.xml rename to addons/sale_purchase/data/mail_templates.xml diff --git a/addons/website_blog/__manifest__.py b/addons/website_blog/__manifest__.py index 097ccfb2438..f58d1d9781c 100644 --- a/addons/website_blog/__manifest__.py +++ b/addons/website_blog/__manifest__.py @@ -10,7 +10,7 @@ 'version': '1.1', 'depends': ['website_mail', 'website_partner'], 'data': [ - 'data/mail_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_templates.xml', 'data/website_blog_data.xml', 'data/blog_snippet_template_data.xml', diff --git a/addons/website_blog/data/mail_data.xml b/addons/website_blog/data/mail_message_subtype_data.xml similarity index 100% rename from addons/website_blog/data/mail_data.xml rename to addons/website_blog/data/mail_message_subtype_data.xml diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py index c21039525d1..5cc49d378a3 100644 --- a/addons/website_event_track/__manifest__.py +++ b/addons/website_event_track/__manifest__.py @@ -11,10 +11,10 @@ 'security/ir.model.access.csv', 'security/event_track_security.xml', 'data/event_data.xml', - 'data/mail_data.xml', 'data/mail_template_data.xml', + 'data/mail_templates.xml', + 'data/mail_message_subtype_data.xml', 'data/event_track_data.xml', - 'views/mail_templates.xml', 'views/event_templates.xml', 'views/event_track_templates_agenda.xml', 'views/event_track_templates_list.xml', diff --git a/addons/website_event_track/data/mail_data.xml b/addons/website_event_track/data/mail_message_subtype_data.xml similarity index 100% rename from addons/website_event_track/data/mail_data.xml rename to addons/website_event_track/data/mail_message_subtype_data.xml diff --git a/addons/website_event_track/views/mail_templates.xml b/addons/website_event_track/data/mail_templates.xml similarity index 100% rename from addons/website_event_track/views/mail_templates.xml rename to addons/website_event_track/data/mail_templates.xml diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py index 68f93d0e1c9..a2a8313edee 100644 --- a/addons/website_forum/__manifest__.py +++ b/addons/website_forum/__manifest__.py @@ -19,7 +19,7 @@ Ask questions, get answers, no distractions 'data': [ 'data/forum_default_faq.xml', 'data/forum_data.xml', - 'data/mail_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_templates.xml', 'views/forum.xml', 'views/res_users_views.xml', diff --git a/addons/website_forum/data/mail_data.xml b/addons/website_forum/data/mail_message_subtype_data.xml similarity index 100% rename from addons/website_forum/data/mail_data.xml rename to addons/website_forum/data/mail_message_subtype_data.xml diff --git a/addons/website_payment/__manifest__.py b/addons/website_payment/__manifest__.py index e286ab7acd6..a0185b28c48 100644 --- a/addons/website_payment/__manifest__.py +++ b/addons/website_payment/__manifest__.py @@ -14,7 +14,8 @@ This is a bridge module that adds multi-website support for payment acquirers. 'portal', ], 'data': [ - 'data/donation_data.xml', + 'data/mail_templates.xml', + 'data/mail_template_data.xml', 'data/ir_action_data.xml', 'views/payment_acquirer.xml', 'views/res_config_settings_views.xml', diff --git a/addons/website_payment/data/mail_template_data.xml b/addons/website_payment/data/mail_template_data.xml new file mode 100644 index 00000000000..ab7c8239cc1 --- /dev/null +++ b/addons/website_payment/data/mail_template_data.xml @@ -0,0 +1,10 @@ + + + + + Donation + + {{ object.partner_id.lang }} + + + diff --git a/addons/website_payment/data/donation_data.xml b/addons/website_payment/data/mail_templates.xml similarity index 90% rename from addons/website_payment/data/donation_data.xml rename to addons/website_payment/data/mail_templates.xml index 189c34dbcbc..e0fd147c6e1 100644 --- a/addons/website_payment/data/donation_data.xml +++ b/addons/website_payment/data/mail_templates.xml @@ -1,13 +1,6 @@ - - - Donation - - {{ object.partner_id.lang }} - - - + + diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index 30fb086c955..e7642c7f5fc 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -50,7 +50,8 @@ Featuring 'views/slide_channel_add.xml', 'wizard/slide_channel_invite_views.xml', 'data/gamification_data.xml', - 'data/mail_data.xml', + 'data/mail_activity_type_data.xml', + 'data/mail_message_subtype_data.xml', 'data/mail_template_data.xml', 'data/mail_templates.xml', 'data/slide_data.xml', diff --git a/addons/website_slides/data/mail_activity_type_data.xml b/addons/website_slides/data/mail_activity_type_data.xml new file mode 100644 index 00000000000..62f94299d08 --- /dev/null +++ b/addons/website_slides/data/mail_activity_type_data.xml @@ -0,0 +1,9 @@ + + + + Access Request + fa-check-circle + 50 + slide.channel + + diff --git a/addons/website_slides/data/mail_data.xml b/addons/website_slides/data/mail_message_subtype_data.xml similarity index 59% rename from addons/website_slides/data/mail_data.xml rename to addons/website_slides/data/mail_message_subtype_data.xml index 69548124965..378744d78b0 100644 --- a/addons/website_slides/data/mail_data.xml +++ b/addons/website_slides/data/mail_message_subtype_data.xml @@ -7,11 +7,4 @@ Presentation Published - - - Access Request - fa-check-circle - 50 - slide.channel -