From 52abcd9c0ab7a68d03aae754e341ece0c646a879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytms@tsmail.eu>
Date: Fri, 20 Jan 2023 18:39:16 +0100
Subject: [PATCH] [FIX] delivery_distribution_list: groups interface

---
 delivery_distribution_list/__manifest__.py     |  3 +--
 .../delivery_distribution_list_security.xml    | 18 ++++++++++++++++--
 .../views/delivery_distribution_list_view.xml  |  9 +++++++++
 .../views/partner_view.xml                     |  7 -------
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/delivery_distribution_list/__manifest__.py b/delivery_distribution_list/__manifest__.py
index 2648808f1..a5a0e661e 100644
--- a/delivery_distribution_list/__manifest__.py
+++ b/delivery_distribution_list/__manifest__.py
@@ -9,9 +9,8 @@
     "website": "https://coopiteasy.be",
     "category": "Sales",
     "depends": [
-        "sale",
+        "sale_management",
         "account",
-        "contacts",
     ],
     "data": [
         "security/delivery_distribution_list_security.xml",
diff --git a/delivery_distribution_list/security/delivery_distribution_list_security.xml b/delivery_distribution_list/security/delivery_distribution_list_security.xml
index d51ecdd52..608810052 100644
--- a/delivery_distribution_list/security/delivery_distribution_list_security.xml
+++ b/delivery_distribution_list/security/delivery_distribution_list_security.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+
+    <record model="ir.module.category" id="module_category_distribution_list">
+        <field name="name">Distribution List</field>
+    </record>
+
     <record id="group_distribution_user" model="res.groups">
         <field name="name">Distribution User</field>
+        <field name="category_id" ref="module_category_distribution_list" />
+        <field name="implied_ids" eval="[(4, ref('base.group_no_one'))]" />
     </record>
 
     <record id="group_distribution_manager" model="res.groups">
         <field name="name">Distribution Manager</field>
-        <field name="implied_ids" eval="[(4, ref('group_distribution_user'))]" />
-        <field name="users" eval="[(4, ref('base.user_root'))]" />
+        <field name="category_id" ref="module_category_distribution_list" />
+        <field
+            name="implied_ids"
+            eval="[(4, ref('delivery_distribution_list.group_distribution_user'))]"
+        />
+        <field
+            name="users"
+            eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
+        />
     </record>
 </odoo>
diff --git a/delivery_distribution_list/views/delivery_distribution_list_view.xml b/delivery_distribution_list/views/delivery_distribution_list_view.xml
index 71249eb89..0a5ede372 100644
--- a/delivery_distribution_list/views/delivery_distribution_list_view.xml
+++ b/delivery_distribution_list/views/delivery_distribution_list_view.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+
+    <menuitem
+        name="Delivery Distribution"
+        id="menu_delivery_distribution"
+        parent="sale.sale_menu_root"
+        sequence="4"
+        groups="delivery_distribution_list.group_distribution_user"
+    />
+
     <record id="view_ddl_form" model="ir.ui.view">
         <field name="name">delivery.distribution.list.form</field>
         <field name="model">delivery.distribution.list</field>
diff --git a/delivery_distribution_list/views/partner_view.xml b/delivery_distribution_list/views/partner_view.xml
index e24505898..2c8e5c3b0 100644
--- a/delivery_distribution_list/views/partner_view.xml
+++ b/delivery_distribution_list/views/partner_view.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <menuitem
-        name="Delivery Distribution"
-        id="menu_delivery_distribution"
-        parent="contacts.menu_contacts"
-        sequence="10"
-        groups="delivery_distribution_list.group_distribution_user"
-    />
 
     <record id="view_partner_form_ddl" model="ir.ui.view">
         <field name="name">res.partner.form.ddl</field>