From 65dc880f73698d17a873889f8cecf862e8461c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Tue, 29 Oct 2019 10:33:19 +0000
Subject: [PATCH] [IMP] mail: add a new entry in technical menu for discuss

Purpose is to lessen size of technical "Email" menu and move some
discuss menu entries in their own menu. It will be the new first menu
entry in technical, before Emails that is more technical.

Some menu items are moved in this new menu, notably followers, messages
or mail blacklist.

Emails menu is also reordered, to have notably all channels related
entries together, ...

Task 2118599
PR #39460
---
 addons/calendar/views/calendar_views.xml              |  1 +
 addons/digest/views/digest_views.xml                  |  2 +-
 addons/fetchmail/views/fetchmail_views.xml            |  2 +-
 addons/iap/views/iap_views.xml                        |  2 +-
 addons/mail/__manifest__.py                           |  1 +
 addons/mail/views/mail_activity_views.xml             |  6 ++++--
 addons/mail/views/mail_alias_views.xml                |  2 +-
 addons/mail/views/mail_blacklist_views.xml            |  6 +++++-
 addons/mail/views/mail_channel_views.xml              | 10 +++++++---
 addons/mail/views/mail_followers_views.xml            | 10 ++++++++--
 addons/mail/views/mail_mail_views.xml                 |  6 +++++-
 addons/mail/views/mail_menus.xml                      | 11 +++++++++++
 addons/mail/views/mail_message_subtype_views.xml      |  6 +++++-
 addons/mail/views/mail_message_views.xml              |  6 +++++-
 addons/mail/views/mail_moderation_views.xml           |  1 +
 addons/mail/views/mail_template_views.xml             |  2 +-
 addons/mail/views/mail_tracking_views.xml             |  6 +++++-
 .../views/mailing_mailing_views_menus.xml             |  2 +-
 .../phone_validation/views/phone_blacklist_views.xml  |  2 +-
 addons/snailmail/views/snailmail_views.xml            |  2 +-
 odoo/addons/base/views/ir_mail_server_views.xml       |  2 +-
 21 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 addons/mail/views/mail_menus.xml

diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index bd25633798e..d5f3703fb43 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -344,6 +344,7 @@
         id="menu_calendar_configuration"
         name="Calendar"
         parent="base.menu_custom"
+        sequence="30"
         groups="base.group_no_one"/>
 
     <menuitem
diff --git a/addons/digest/views/digest_views.xml b/addons/digest/views/digest_views.xml
index 96e26828951..3c0db223d24 100644
--- a/addons/digest/views/digest_views.xml
+++ b/addons/digest/views/digest_views.xml
@@ -134,5 +134,5 @@
         action="digest_digest_action"
         parent="base.menu_email"
         groups="base.group_erp_manager"
-        sequence="93"/>
+        sequence="80"/>
 </odoo>
diff --git a/addons/fetchmail/views/fetchmail_views.xml b/addons/fetchmail/views/fetchmail_views.xml
index 811046f2e93..a7d1be15ca4 100644
--- a/addons/fetchmail/views/fetchmail_views.xml
+++ b/addons/fetchmail/views/fetchmail_views.xml
@@ -98,7 +98,7 @@
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Incoming Mail Servers"
-            sequence="14"
+            sequence="6"
             groups="base.group_no_one"
         />
 
diff --git a/addons/iap/views/iap_views.xml b/addons/iap/views/iap_views.xml
index e6da74da002..129a2f0c296 100644
--- a/addons/iap/views/iap_views.xml
+++ b/addons/iap/views/iap_views.xml
@@ -40,7 +40,7 @@
         id="iap_root_menu"
         name="IAP"
         parent="base.menu_custom"
-        sequence="4"/>
+        sequence="5"/>
 
     <menuitem
         id="iap_account_menu"
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 4fece68c14b..14512c9ef86 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -9,6 +9,7 @@
     'website': 'https://www.odoo.com/page/discuss',
     'depends': ['base', 'base_setup', 'bus', 'web_tour'],
     'data': [
+        'views/mail_menus.xml',
         'wizard/invite_view.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_resend_cancel_views.xml',
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 7c115deb1ee..b0732c7c8cf 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -88,7 +88,8 @@
     <menuitem
       id="menu_mail_activity_type"
       action="mail_activity_type_action"
-      parent="base.menu_email"
+      parent="mail.mail_menu_technical"
+      sequence="10"
     />
 
     <record id="mail_activity_action" model="ir.actions.act_window">
@@ -100,7 +101,8 @@
     <menuitem
       id="menu_mail_activities"
       action="mail_activity_action"
-      parent="base.menu_email"
+      parent="mail.mail_menu_technical"
+      sequence="11"
     />
 
     <record id="mail_activity_view_form_popup" model="ir.ui.view">
diff --git a/addons/mail/views/mail_alias_views.xml b/addons/mail/views/mail_alias_views.xml
index 5bccd139530..5bfe53265b4 100644
--- a/addons/mail/views/mail_alias_views.xml
+++ b/addons/mail/views/mail_alias_views.xml
@@ -80,7 +80,7 @@
         <menuitem id="mail_alias_menu"
                   parent="base.menu_email"
                   action="action_view_mail_alias"
-                  sequence="50"
+                  sequence="11"
                   groups="base.group_no_one"/>
 
     </data>
diff --git a/addons/mail/views/mail_blacklist_views.xml b/addons/mail/views/mail_blacklist_views.xml
index f05b6c2318a..05c59ede18b 100644
--- a/addons/mail/views/mail_blacklist_views.xml
+++ b/addons/mail/views/mail_blacklist_views.xml
@@ -58,6 +58,10 @@
     </record>
 
     <!-- Technical Menu -->
-    <menuitem id="mail_blacklist_menu" name="Mass Mail Blacklist" action="mail_blacklist_action" parent="base.menu_email"/>
+    <menuitem id="mail_blacklist_menu"
+        name="Email Blacklist"
+        action="mail_blacklist_action"
+        parent="mail.mail_menu_technical"
+        sequence="20"/>
 
 </odoo>
diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml
index 7667d2b47fe..2cff1172e63 100644
--- a/addons/mail/views/mail_channel_views.xml
+++ b/addons/mail/views/mail_channel_views.xml
@@ -38,8 +38,12 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Channels/Partner" id="mail_channel_partner_menu" parent="base.menu_email"
-            action="mail_channel_partner_action" sequence="92" groups="base.group_no_one"/>
+        <menuitem name="Channels/Partner"
+            id="mail_channel_partner_menu"
+            parent="base.menu_email"
+            action="mail_channel_partner_action"
+            sequence="21"
+            groups="base.group_no_one"/>
 
         <!-- mail.channel -->
         <record id="mail_channel_view_kanban" model="ir.ui.view">
@@ -187,7 +191,7 @@
         </record>
 
         <!-- settings !-->
-        <menuitem id="mail_channel_menu_settings" parent="base.menu_email" sequence="90"
+        <menuitem id="mail_channel_menu_settings" parent="base.menu_email" sequence="20"
             name="Channels" action="mail_channel_action_view"
             groups="base.group_no_one"/>
 
diff --git a/addons/mail/views/mail_followers_views.xml b/addons/mail/views/mail_followers_views.xml
index 3dbd0ba7b1a..d3d743482c7 100644
--- a/addons/mail/views/mail_followers_views.xml
+++ b/addons/mail/views/mail_followers_views.xml
@@ -12,6 +12,7 @@
                     <field name="res_model"/>
                     <field name="res_id" widget="integer"/>
                     <field name="partner_id"/>
+                    <field name="channel_id"/>
                 </tree>
             </field>
         </record>
@@ -26,6 +27,7 @@
                             <group>
                                 <field name="res_model"/>
                                 <field name="partner_id"/>
+                                <field name="channel_id"/>
                             </group>
                             <group>
                                 <field name="res_id" widget="integer"/>
@@ -44,8 +46,12 @@
         </record>
 
         <!-- Add followers related menu entries in Settings/Email -->
-        <menuitem name="Followers" id="menu_email_followers" parent="base.menu_email"
-                    action="action_view_followers" sequence="30" groups="base.group_no_one"/>
+        <menuitem name="Followers"
+            id="menu_email_followers"
+            parent="mail.mail_menu_technical"
+            action="action_view_followers"
+            sequence="20"
+            groups="base.group_no_one"/>
 
     </data>
 </odoo>
diff --git a/addons/mail/views/mail_mail_views.xml b/addons/mail/views/mail_mail_views.xml
index 3c3acb86008..7d4a99f8883 100644
--- a/addons/mail/views/mail_mail_views.xml
+++ b/addons/mail/views/mail_mail_views.xml
@@ -124,6 +124,10 @@
         </record>
 
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Emails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
+        <menuitem name="Emails"
+            id="menu_mail_mail"
+            parent="base.menu_email"
+            action="action_view_mail_mail"
+            sequence="1"/>
     </data>
 </odoo>
diff --git a/addons/mail/views/mail_menus.xml b/addons/mail/views/mail_menus.xml
new file mode 100644
index 00000000000..44df3e561ed
--- /dev/null
+++ b/addons/mail/views/mail_menus.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<odoo><data>
+	<record id="base.menu_email" model="ir.ui.menu">
+        <field name="sequence">3</field>
+	</record>
+
+    <menuitem name="Discuss"
+        id="mail_menu_technical"
+        parent="base.menu_custom"
+        sequence="1"/>
+</data></odoo>
diff --git a/addons/mail/views/mail_message_subtype_views.xml b/addons/mail/views/mail_message_subtype_views.xml
index 1f8eafeea94..a9c9171e72f 100644
--- a/addons/mail/views/mail_message_subtype_views.xml
+++ b/addons/mail/views/mail_message_subtype_views.xml
@@ -47,7 +47,11 @@
             <field name="res_model">mail.message.subtype</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Subtypes" id="menu_message_subtype" parent="base.menu_email" action="action_view_message_subtype"/>
+        <menuitem name="Subtypes"
+            id="menu_message_subtype"
+            parent="mail.mail_menu_technical"
+            action="action_view_message_subtype"
+            sequence="4"/>
 
     </data>
 </odoo>
diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml
index 611790c3310..bf548dc712a 100644
--- a/addons/mail/views/mail_message_views.xml
+++ b/addons/mail/views/mail_message_views.xml
@@ -125,7 +125,11 @@
         </record>
 
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/>
+        <menuitem name="Messages"
+            id="menu_mail_message"
+            parent="mail.mail_menu_technical"
+            action="action_view_mail_message"
+            sequence="1"/>
 
         <record model="ir.ui.view" id="view_document_file_kanban">
             <field name="name">ir.attachment kanban</field>
diff --git a/addons/mail/views/mail_moderation_views.xml b/addons/mail/views/mail_moderation_views.xml
index 09ac3fbf0e0..4bcc602bbcb 100644
--- a/addons/mail/views/mail_moderation_views.xml
+++ b/addons/mail/views/mail_moderation_views.xml
@@ -46,6 +46,7 @@
         <menuitem name="Channel Moderation"
             id="mail_moderation_menu"
             parent="base.menu_email"
+            sequence="22"
             action="mail_moderation_action"/>
     </data>
 </odoo>
diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml
index 5bac18dbbd5..111a633d092 100644
--- a/addons/mail/views/mail_template_views.xml
+++ b/addons/mail/views/mail_template_views.xml
@@ -134,7 +134,7 @@
         </record>
 
         <menuitem id="menu_email_templates" parent="base.menu_email" action="action_email_template_tree_all"
-                  sequence="20"/>
+                  sequence="10"/>
 
     </data>
 </odoo>
diff --git a/addons/mail/views/mail_tracking_views.xml b/addons/mail/views/mail_tracking_views.xml
index 170829427c3..ea43c5fa418 100644
--- a/addons/mail/views/mail_tracking_views.xml
+++ b/addons/mail/views/mail_tracking_views.xml
@@ -65,7 +65,11 @@
             <field name="res_model">mail.tracking.value</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Tracking Values" id="menu_mail_tracking_value" parent="base.menu_email" action="action_view_mail_tracking_value"/>
+        <menuitem name="Tracking Values"
+            id="menu_mail_tracking_value"
+            parent="mail.mail_menu_technical"
+            action="action_view_mail_tracking_value"
+            sequence="5"/>
 
     </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/mass_mailing/views/mailing_mailing_views_menus.xml b/addons/mass_mailing/views/mailing_mailing_views_menus.xml
index ee4c335c3ef..239f8271f5c 100644
--- a/addons/mass_mailing/views/mailing_mailing_views_menus.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views_menus.xml
@@ -19,6 +19,6 @@
     <!-- Technical / Mass Mailing -->
     <menuitem id="mailing_mailing_menu_technical"
         name="Mass Mailing"
-        sequence="3"
+        sequence="4"
         parent="base.menu_custom"/>
 </odoo>
\ No newline at end of file
diff --git a/addons/phone_validation/views/phone_blacklist_views.xml b/addons/phone_validation/views/phone_blacklist_views.xml
index e7ec2a44cea..4e0299f1600 100644
--- a/addons/phone_validation/views/phone_blacklist_views.xml
+++ b/addons/phone_validation/views/phone_blacklist_views.xml
@@ -61,7 +61,7 @@
     <menuitem id="phone_menu_main"
         name="Phone / SMS"
         parent="base.menu_custom"
-        sequence="2"/>
+        sequence="3"/>
 
     <menuitem id="phone_blacklist_menu"
         name="Phone Blacklist"
diff --git a/addons/snailmail/views/snailmail_views.xml b/addons/snailmail/views/snailmail_views.xml
index 81212ef8560..1502856abbc 100644
--- a/addons/snailmail/views/snailmail_views.xml
+++ b/addons/snailmail/views/snailmail_views.xml
@@ -57,5 +57,5 @@
     </record>
 
     <menuitem id="menu_snailmail_letters" parent="base.menu_email" action="action_mail_letters"
-              sequence="20"/>
+              sequence="50"/>
 </odoo>
diff --git a/odoo/addons/base/views/ir_mail_server_views.xml b/odoo/addons/base/views/ir_mail_server_views.xml
index f8772a9a5b8..2d795a82f90 100644
--- a/odoo/addons/base/views/ir_mail_server_views.xml
+++ b/odoo/addons/base/views/ir_mail_server_views.xml
@@ -61,5 +61,5 @@
             <field name="search_view_id" ref="view_ir_mail_server_search"/>
         </record>
 
-        <menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="15" groups="base.group_no_one"/>
+        <menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="5" groups="base.group_no_one"/>
 </odoo>