From 128b177c9dd6d9b4620bba1f8ab5c9d7279a7551 Mon Sep 17 00:00:00 2001
From: Rivo Lalaina <rivo2302@gmail.com>
Date: Tue, 10 Dec 2024 08:40:33 +0300
Subject: [PATCH 1/2] [16.0][MIG] admin_light_email :  mail_activity _types
 views

---
 admin_light_mail/README.rst                         |  3 +++
 admin_light_mail/__manifest__.py                    | 13 +++++++------
 admin_light_mail/i18n/fr.po                         |  9 +++++++--
 admin_light_mail/views/mail_activity_type_views.xml | 12 ++++++++++++
 ...e_subtype.xml => mail_message_subtype_views.xml} |  0
 .../views/{mail_mail.xml => mail_message_views.xml} |  0
 .../{mail_server.xml => mail_server_views.xml}      |  0
 .../{mail_template.xml => mail_template_views.xml}  |  0
 .../views/{common.xml => menu_item.xml}             |  0
 9 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 admin_light_mail/views/mail_activity_type_views.xml
 rename admin_light_mail/views/{mail_message_subtype.xml => mail_message_subtype_views.xml} (100%)
 rename admin_light_mail/views/{mail_mail.xml => mail_message_views.xml} (100%)
 rename admin_light_mail/views/{mail_server.xml => mail_server_views.xml} (100%)
 rename admin_light_mail/views/{mail_template.xml => mail_template_views.xml} (100%)
 rename admin_light_mail/views/{common.xml => menu_item.xml} (100%)

diff --git a/admin_light_mail/README.rst b/admin_light_mail/README.rst
index 65e1ef01..287b4f22 100644
--- a/admin_light_mail/README.rst
+++ b/admin_light_mail/README.rst
@@ -31,6 +31,9 @@ A new group `Safe Administration / Mail Subtypes` is added.
 
 * View and edit the list of subtypes.
 
+Mail Activity Type 
+------------------
+* View and edit the list of all activity type
 
 Contributors
 ------------
diff --git a/admin_light_mail/__manifest__.py b/admin_light_mail/__manifest__.py
index 30dc70f5..cb4dab21 100644
--- a/admin_light_mail/__manifest__.py
+++ b/admin_light_mail/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Admin Light Email",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.1.0",
     "author": "Numigi",
     "maintainer": "Numigi",
     "license": "LGPL-3",
@@ -14,13 +14,14 @@
         "mail",
     ],
     "data": [
-        "views/common.xml",
-        "views/mail_mail.xml",
-        "views/mail_message_subtype.xml",
-        "views/mail_server.xml",
         "security/security.xml",
         "security/ir.model.access.csv",
-        "views/mail_template.xml",
+        "views/menu_item.xml",
+        "views/mail_message_views.xml",
+        "views/mail_message_subtype_views.xml",
+        "views/mail_server_views.xml",
+        "views/mail_template_views.xml",
+        "views/mail_activity_type_views.xml",
     ],
     "installable": True,
 }
diff --git a/admin_light_mail/i18n/fr.po b/admin_light_mail/i18n/fr.po
index cfebd7c3..bc47c9b0 100644
--- a/admin_light_mail/i18n/fr.po
+++ b/admin_light_mail/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-16 20:00+0000\n"
-"PO-Revision-Date: 2024-09-16 20:00+0000\n"
+"POT-Creation-Date: 2024-12-10 05:38+0000\n"
+"PO-Revision-Date: 2024-12-10 05:38+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -42,6 +42,11 @@ msgstr "Courriels"
 msgid "Incoming Mail Servers"
 msgstr "Serveurs entrants"
 
+#. module: admin_light_mail
+#: model:ir.ui.menu,name:admin_light_mail.menu_mail_activity_type
+msgid "Mail Activity Types"
+msgstr "Types d'activités"
+
 #. module: admin_light_mail
 #: model:ir.model,name:admin_light_mail.model_ir_mail_server
 msgid "Mail Server"
diff --git a/admin_light_mail/views/mail_activity_type_views.xml b/admin_light_mail/views/mail_activity_type_views.xml
new file mode 100644
index 00000000..e8eb0f5c
--- /dev/null
+++ b/admin_light_mail/views/mail_activity_type_views.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <menuitem
+        id="menu_mail_activity_type"
+        action="mail.mail_activity_type_action"
+        name="Mail Activity Types"
+        parent="menu_email"
+        sequence="20"
+    />
+
+</odoo>
\ No newline at end of file
diff --git a/admin_light_mail/views/mail_message_subtype.xml b/admin_light_mail/views/mail_message_subtype_views.xml
similarity index 100%
rename from admin_light_mail/views/mail_message_subtype.xml
rename to admin_light_mail/views/mail_message_subtype_views.xml
diff --git a/admin_light_mail/views/mail_mail.xml b/admin_light_mail/views/mail_message_views.xml
similarity index 100%
rename from admin_light_mail/views/mail_mail.xml
rename to admin_light_mail/views/mail_message_views.xml
diff --git a/admin_light_mail/views/mail_server.xml b/admin_light_mail/views/mail_server_views.xml
similarity index 100%
rename from admin_light_mail/views/mail_server.xml
rename to admin_light_mail/views/mail_server_views.xml
diff --git a/admin_light_mail/views/mail_template.xml b/admin_light_mail/views/mail_template_views.xml
similarity index 100%
rename from admin_light_mail/views/mail_template.xml
rename to admin_light_mail/views/mail_template_views.xml
diff --git a/admin_light_mail/views/common.xml b/admin_light_mail/views/menu_item.xml
similarity index 100%
rename from admin_light_mail/views/common.xml
rename to admin_light_mail/views/menu_item.xml

From 77465b2a6ec07ff5376322d3a0c2b9e5bfe83c19 Mon Sep 17 00:00:00 2001
From: Rivo Lalaina <rivo2302@gmail.com>
Date: Tue, 10 Dec 2024 08:51:45 +0300
Subject: [PATCH 2/2] [16.0][MIG] admin_light_email : mail_activity _types
 views

---
 admin_light_mail/security/security.xml        | 28 +++++++++++++++----
 .../views/mail_message_subtype_views.xml      |  6 ----
 admin_light_mail/views/mail_message_views.xml |  6 ----
 admin_light_mail/views/mail_server_views.xml  |  6 ----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin_light_mail/security/security.xml b/admin_light_mail/security/security.xml
index cec0f4d0..2f9f9940 100644
--- a/admin_light_mail/security/security.xml
+++ b/admin_light_mail/security/security.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="mail.access_mail_template_editor" model="ir.model.access">
-        <field name="active" eval="False"/>
+    <record id="group_email_server" model="res.groups">
+        <field name="name">Email Servers</field>
+        <field name="category_id" ref="admin_light_base.module_category_admin" />
+        <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
+    </record>
+
+    <record id="group_email_messages" model="res.groups">
+        <field name="name">Emails</field>
+        <field name="category_id" ref="admin_light_base.module_category_admin" />
+        <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
     </record>
     
     <record id="group_email_template" model="res.groups">
@@ -11,6 +19,16 @@
         <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
     </record>
 
+    <record id="group_mail_subtype" model="res.groups">
+        <field name="name">Mail Subtypes</field>
+        <field name="category_id" ref="admin_light_base.module_category_admin" />
+        <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
+    </record>
+
+    <record id="mail.mail_template_editor_rule" model="ir.rule">
+        <field name="groups" eval="[(3, ref('mail.group_mail_template_editor'))]"/>
+    </record>
+
     <record id="rule_mail_template_edit_own" model="ir.rule">
         <field name="name">Users can only change their own templates</field>
         <field name="model_id" ref="mail.model_mail_template"/>
@@ -22,14 +40,14 @@
         <field name="perm_unlink" eval="True"/>
     </record>
 
+    <record id="mail.access_mail_template_editor" model="ir.model.access">
+        <field name="active" eval="False"/>
+    </record>
     <function name="write" model="ir.model.data">
         <value model="ir.model.data" search="[('module', '=', 'mail'), ('name', '=', 'mail_template_editor_rule')]"/>
         <value eval="{'noupdate': False}"/>
     </function>
 
-    <record id="mail.mail_template_editor_rule" model="ir.rule">
-        <field name="groups" eval="[(3, ref('mail.group_mail_template_editor'))]"/>
-    </record>
 
     <function name="write" model="ir.model.data">
         <value model="ir.model.data" search="[('module', '=', 'mail'), ('name', '=', 'mail_template_editor_rule')]"/>
diff --git a/admin_light_mail/views/mail_message_subtype_views.xml b/admin_light_mail/views/mail_message_subtype_views.xml
index 6baddc46..1495d073 100644
--- a/admin_light_mail/views/mail_message_subtype_views.xml
+++ b/admin_light_mail/views/mail_message_subtype_views.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="group_mail_subtype" model="res.groups">
-        <field name="name">Mail Subtypes</field>
-        <field name="category_id" ref="admin_light_base.module_category_admin" />
-        <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
-    </record>
-
     <menuitem
         id="menu_mail_subtype"
         name="Subtypes"
diff --git a/admin_light_mail/views/mail_message_views.xml b/admin_light_mail/views/mail_message_views.xml
index fc4268ef..087b3b35 100644
--- a/admin_light_mail/views/mail_message_views.xml
+++ b/admin_light_mail/views/mail_message_views.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="group_email_messages" model="res.groups">
-        <field name="name">Emails</field>
-        <field name="category_id" ref="admin_light_base.module_category_admin" />
-        <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
-    </record>
-
     <menuitem
         id="menu_email_list"
         name="Emails"
diff --git a/admin_light_mail/views/mail_server_views.xml b/admin_light_mail/views/mail_server_views.xml
index 41e09442..23780882 100644
--- a/admin_light_mail/views/mail_server_views.xml
+++ b/admin_light_mail/views/mail_server_views.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="group_email_server" model="res.groups">
-        <field name="name">Email Servers</field>
-        <field name="category_id" ref="admin_light_base.module_category_admin" />
-        <field name="implied_ids" eval="[(4, ref('admin_light_base.group_admin'))]" />
-    </record>
-
     <menuitem
         id="menu_outgoing_mail_server"
         name="Outgoing Mail Servers"