Merge branch '16.0' into 16.0-revised-install-modules

membership_accessibility/__manifest__.py

@@ -22,7 +22,7 @@
         "project",
         "hr_timesheet",
         "membership_hr_recruitment",
-        "membership_committee",
+        "membership_group",
     ],
     "data": ["security/membership_accessibility_security.xml", "views/views.xml"],
     "post_init_hook": "post_init_hook",

membership_accessibility/models/res_users.py

@@ -18,7 +18,6 @@ def SELF_READABLE_FIELDS(self):
             "membership_stop",
             "membership_cancel",
             "member_lines",
-            "section_membership_ids",
-            "committee_membership_ids",
+            "membership_group_member_ids",
             "subscription_ids",
         ]

membership_accessibility/views/views.xml

@@ -53,17 +53,15 @@
                             <field name="date_cancel" optional="hide"/>
                         </tree>
                     </field>
-                    <field name="section_membership_ids" nolabel="1" colspan="4" readonly="1">
-                        <tree>
-                            <field name="section_id"/>
-                            <field name="start_date"/>
-                        </tree>
-                    </field>
-                    <field name="committee_membership_ids" nolabel="1" colspan="4" readonly="1">
-                        <tree editable="top">
-                            <field name="committee_id"/>
-                        </tree>
-                    </field>
+                    <group>
+                        <field name="membership_group_member_ids" string="Groups" colspan="4" readonly="1">
+                            <tree editable="bottom">
+                                <field name="group_id"/>
+                                <field name="type"/>
+                                <field name="wants_to_collaborate"/>
+                            </tree>
+                        </field>
+                    </group>
                 </page>
                 <page name="subscriptions" string="Subscriptions" attrs="{'invisible': [('subscription_ids', '=', False)]}">
                     <field name="subscription_ids" widget="one2many">

membership_accessibility_mass_mailing_membership_group/__manifest__.py

@@ -0,0 +1,17 @@
+# Copyright 2023 Anjeel Haria
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Membership Accessibility Mass Mailing Membership Group",
+    "summary": "Adds options for members to see whether they are on the mailing list of membership groups",
+    "version": "16.0.1.0.0",
+    "category": "Membership",
+    "author": "Onestein",
+    "website": "https://www.onestein.eu",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "auto_install": True,
+    "depends": ["membership_accessibility", "mass_mailing_membership_group"],
+    "data": ["views/views.xml"],
+}

membership_accessibility_mass_mailing_membership_group/views/views.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_users_view_form_simple_modif" model="ir.ui.view">
+        <field name="name">res.users.preferences.form.simplified.inherit</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="membership_accessibility.res_users_view_form_simple_modif"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='membership_group_member_ids']//tree/field[@name='group_id']" position="before">
+                <field name="on_mailing_list" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

package.txt

@@ -24,6 +24,7 @@ l10n_nl_hr_recruitment
 l10n_nl_rgs_usability
 mass_mailing_force_dedicated_server
 membership_accessibility
+membership_accessibility_mass_mailing_membership_group
 membership_accessibility_website_project_role_members
 multi_company_disable
 spreadsheet_oca_ux