Updated membership modules

Added partner_cde module updates Changed from AbstractModel to Model Changes to add applications menu in Members,move wants_to_collaborate and type field to membership_group, made allow_membership_registration True by default pre-commit fix
onesteinbv · Nov 15, 2024 · 4be4230 · 4be4230
1 parent 2c9c271
commit 4be4230
Show file tree

Hide file tree

Showing 106 changed files with 2,294 additions and 470 deletions.
diff --git a/membership_contribution/__init__.py b/membership_contribution/__init__.py
@@ -1 +0,0 @@
-from . import models

diff --git a/membership_contribution/models/__init__.py b/membership_contribution/models/__init__.py
@@ -1 +0,0 @@
-from . import res_partner

diff --git a/membership_group/models/membership_group_member.py b/membership_group/models/membership_group_member.py
@@ -7,6 +7,17 @@ class MembershipGroupMember(models.Model):
 
     partner_id = fields.Many2one("res.partner", required=True, ondelete="cascade")
     group_id = fields.Many2one("membership.group", required=True, ondelete="cascade")
+    wants_to_collaborate = fields.Boolean()
+    type = fields.Selection(
+        [
+            ("follower", "Follower"),
+            ("applicant", "Applicant"),
+            ("applicant_follower", "Applicant / Follower"),
+            ("collaborator_follower", "Collaborator / Follower"),
+            ("collaborator", "Collaborator"),
+            ("committee", "Committee"),
+        ],
+    )
 
     _sql_constraints = [
         (

diff --git a/membership_group/views/membership_group_member_view.xml b/membership_group/views/membership_group_member_view.xml
@@ -4,22 +4,37 @@
     <record id="membership_group_member_view_tree" model="ir.ui.view">
         <field name="model">membership.group.member</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree editable="bottom">
                 <field name="partner_id" />
                 <field name="group_id" />
+                <field name="type" />
+                <field name="wants_to_collaborate" />
             </tree>
         </field>
     </record>
 
+    <record id="membership_group_membership_view_pivot" model="ir.ui.view">
+        <field name="model">membership.group.member</field>
+        <field name="arch" type="xml">
+            <pivot string="Membership Group Members" disable_linking="True">
+                <field name="partner_id" type="row"/>
+                <field name="group_id" type="row"/>
+                <field name="type" type="col"/>
+            </pivot>
+        </field>
+    </record>
+
      <record id="membership_group_member_view_search" model="ir.ui.view">
         <field name="model">membership.group.member</field>
         <field name="arch" type="xml">
             <search>
                 <field name="partner_id" />
                 <field name="group_id" />
+                <field name="type" />
                 <group expand="0" name="claims" string="Group By">
                     <filter string="Partner" name="partner_id" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
                     <filter string="Group" name="group_id" domain="[]" help="Group" context="{'group_by':'group_id'}" />
+                    <filter string="Type" name="type" domain="[]" help="Group" context="{'group_by':'type'}" />
                 </group>
             </search>
         </field>
@@ -28,6 +43,6 @@
     <record id="action_membership_group_member" model="ir.actions.act_window">
         <field name="name">Membership Group Members</field>
         <field name="res_model">membership.group.member</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">tree,pivot</field>
     </record>
 </odoo>
diff --git a/membership_group/views/res_partner_view.xml b/membership_group/views/res_partner_view.xml
@@ -23,8 +23,10 @@
             <xpath expr="//field[@name='member_lines']" position="after">
                 <group>
                     <field name="membership_group_member_ids" string="Groups" colspan="4">
-                        <tree editable="top">
+                        <tree editable="bottom">
                             <field name="group_id"/>
+                            <field name="type" />
+                            <field name="wants_to_collaborate" />
                         </tree>
                     </field>
                 </group>

diff --git a/membership_hr/__manifest__.py b/membership_hr/__manifest__.py
@@ -10,13 +10,13 @@
     "website": "https://www.onestein.nl",
     "depends": [
         "membership",
-        "membership_section",
+        "membership_group",
         "hr",
     ],
     "data": [
         "views/hr_employee_view.xml",
         "views/hr_department.xml",
-        "views/membership_section.xml",
+        "views/membership_group.xml",
     ],
     "demo": [
         "data/hr_department_demo.xml",

diff --git a/membership_hr/data/hr_department_demo.xml b/membership_hr/data/hr_department_demo.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
-        <record id="demo_hr_department_section_1" model="hr.department">
+        <record id="demo_hr_department_group_1" model="hr.department">
             <field name="name">Executive Board</field>
         </record>
 
-        <record id="demo_hr_department_section_2" model="hr.department">
+        <record id="demo_hr_department_group_2" model="hr.department">
             <field name="name">Marketing Team</field>
         </record>
 
-        <record id="demo_hr_department_section_3" model="hr.department">
+        <record id="demo_hr_department_group_3" model="hr.department">
             <field name="name">Finance Committee</field>
         </record>
 
-        <record id="demo_hr_department_section_4" model="hr.department">
+        <record id="demo_hr_department_group_4" model="hr.department">
             <field name="name">Youth Club</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/membership_hr/data/hr_employee_demo.xml b/membership_hr/data/hr_employee_demo.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="employee_demo_member_1" model="hr.employee">
             <field name="name">John Doe</field>
             <field name="user_id" ref="user_demo_member_1"/>
-            <field name="department_id" ref="demo_hr_department_section_1"/>
+            <field name="department_id" ref="demo_hr_department_group_1"/>
             <field name="job_id" ref="job_member"/>
             <field name="employee_type">member</field>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/membership_hr/data/hr_job_demo.xml b/membership_hr/data/hr_job_demo.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="job_member" model="hr.job">
             <field name="name">Member</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/membership_hr/data/res_users_demo.xml b/membership_hr/data/res_users_demo.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="user_demo_member_1" model="res.users">
-            <field name="partner_id" ref="membership_section.demo_member_1"/>
+            <field name="partner_id" ref="membership_group.demo_member_1"/>
             <field name="login">demo_member</field>
             <field name="password">demo_member</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="groups_id" eval="[Command.set([ref('base.group_user'), ref('base.group_partner_manager'), ref('base.group_allow_export')])]"/>
         </record>
 
-    </data>
 </odoo>
diff --git a/membership_hr/models/__init__.py b/membership_hr/models/__init__.py
@@ -1,4 +1,4 @@
 from . import hr_department
 from . import hr_employee_base
 from . import hr_employee
-from . import membership_section
+from . import membership_group
diff --git a/membership_hr/models/hr_department.py b/membership_hr/models/hr_department.py
@@ -1,7 +1,7 @@
 from odoo import fields, models
 
 
-class HRDepartment(models.AbstractModel):
+class HRDepartment(models.Model):
     _inherit = "hr.department"
 
-    section_id = fields.Many2one("membership.section")
+    membership_group_id = fields.Many2one("membership.group")
diff --git a/membership_hr/models/hr_employee.py b/membership_hr/models/hr_employee.py
@@ -1,9 +1,9 @@
 from odoo import fields, models
 
 
-class HREmployee(models.AbstractModel):
+class HREmployee(models.Model):
     _inherit = "hr.employee"
 
-    section_membership_ids = fields.One2many(
-        related="user_partner_id.section_membership_ids"
+    membership_group_member_ids = fields.One2many(
+        related="user_partner_id.membership_group_member_ids"
     )
diff --git a/membership_hr/models/membership_group.py b/membership_hr/models/membership_group.py
@@ -0,0 +1,36 @@
+from odoo import api, fields, models
+
+
+class MembershipGroup(models.AbstractModel):
+    _inherit = "membership.group"
+
+    department_id = fields.Many2one(
+        "hr.department",
+        compute="_compute_department",
+        inverse="_inverse_department",
+        store=True,
+        readonly=False,
+    )
+
+    department_ids = fields.One2many(
+        "hr.department", "membership_group_id", string="Departments"
+    )
+
+    @api.depends("department_ids")
+    def _compute_department(self):
+        for membership_group in self:
+            membership_group.department_id = (
+                membership_group.department_ids
+                and membership_group.department_ids[0]
+                or False
+            )
+
+    def _inverse_department(self):
+        hr_department_obj = self.env["hr.department"]
+        for membership_group in self:
+            if membership_group.department_ids:
+                department = hr_department_obj.browse(
+                    membership_group.department_ids[0].id
+                )
+                department.membership_group_id = False
+            membership_group.department_id.membership_group_id = membership_group
diff --git a/membership_hr/models/membership_section.py b/membership_hr/models/membership_section.py
diff --git a/membership_hr/tests/__init__.py b/membership_hr/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_membership_hr
diff --git a/membership_hr/tests/test_membership_hr.py b/membership_hr/tests/test_membership_hr.py
@@ -0,0 +1,24 @@
+from odoo.tests import common
+
+
+class TestMembershipHr(common.TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        membership_group_obj = cls.env["membership.group"]
+        hr_department_obj = cls.env["hr.department"]
+
+        cls.group_1 = membership_group_obj.create({"name": "Test Group 1"})
+        cls.group_2 = membership_group_obj.create({"name": "Test Group 2"})
+        cls.hr_department_1 = hr_department_obj.create({"name": "Test Department 1"})
+        cls.hr_department_2 = hr_department_obj.create({"name": "Test Department 2"})
+
+    def test_01_membership_hr(self):
+        self.group_1.department_ids = [
+            (6, 0, [self.hr_department_1.id, self.hr_department_2.id])
+        ]
+        self.assertEqual(self.group_1.department_id, self.hr_department_1)
+        self.group_1.department_id = self.hr_department_2.id
+        self.assertEqual(self.hr_department_2.membership_group_id, self.group_1)
+        self.group_2.department_id = self.hr_department_1.id
+        self.assertEqual(self.hr_department_1.membership_group_id, self.group_2)
diff --git a/membership_hr/views/hr_department.xml b/membership_hr/views/hr_department.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="hr.view_department_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='parent_id']" position="after">
-                <field name="section_id" />
+                <field name="membership_group_id" />
             </xpath>
         </field>
     </record>

diff --git a/membership_hr/views/hr_employee_view.xml b/membership_hr/views/hr_employee_view.xml
@@ -8,10 +8,9 @@
             <xpath expr="//page[last()]" position="after">
                 <field name="employee_type" invisible="1" />
                 <page string="Membership" attrs="{'invisible': [('employee_type','!=','member')]}">
-                    <field name="section_membership_ids" string="Sections" nolabel="1" colspan="4">
+                    <field name="membership_group_member_ids" string="Membership Groups" nolabel="1" colspan="4">
                         <tree editable="top">
-                            <field name="section_id"/>
-                            <field name="start_date"/>
+                            <field name="group_id"/>
                         </tree>
                     </field>
                 </page>

diff --git a/membership_hr/views/membership_section.xml → membership_hr/views/membership_group.xml b/membership_hr/views/membership_section.xml → membership_hr/views/membership_group.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="membership_section_view_tree" model="ir.ui.view">
-        <field name="model">membership.section</field>
-        <field name="inherit_id" ref="membership_section.membership_section_view_tree" />
+    <record id="membership_group_view_tree" model="ir.ui.view">
+        <field name="model">membership.group</field>
+        <field name="inherit_id" ref="membership_group.membership_group_view_tree" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='name']" position="after">
+            <xpath expr="//field[@name='complete_name']" position="after">
                 <field name="department_id"/>
             </xpath>
         </field>
     </record>
 
-    <record id="membership_section_view_form" model="ir.ui.view">
-        <field name="model">membership.section</field>
-        <field name="inherit_id" ref="membership_section.membership_section_view_form" />
+    <record id="membership_group_view_form" model="ir.ui.view">
+        <field name="model">membership.group</field>
+        <field name="inherit_id" ref="membership_group.membership_group_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//group[@name='form_body']" position="inside">
                 <group name="hr_informations" string="Human Resources">

diff --git a/membership_hr_recruitment/__manifest__.py b/membership_hr_recruitment/__manifest__.py
@@ -10,11 +10,12 @@
     "website": "https://www.onestein.nl",
     "depends": [
         "membership_hr",
-        "membership_section",
+        "membership_group",
         "hr_recruitment",
     ],
     "data": [
         "views/hr_applicant_view.xml",
+        "menuitems.xml",
     ],
     "demo": [
         "data/hr_applicant_demo.xml",

diff --git a/membership_hr_recruitment/data/hr_applicant_demo.xml b/membership_hr_recruitment/data/hr_applicant_demo.xml
@@ -5,10 +5,10 @@
         <record id="hr_applicant_demo_member_2" model="hr.applicant">
             <field name="name">Aspiring Member</field>
             <field name="job_id" ref="membership_hr.job_member"/>
-            <field name="department_id" ref="membership_hr.demo_hr_department_section_4"/>
+            <field name="department_id" ref="membership_hr.demo_hr_department_group_4"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="priority">1</field>
-            <field name="partner_id" ref="membership_section.demo_member_2" />
+            <field name="partner_id" ref="membership_group.demo_member_2" />
             <field name="partner_name">Jane Smith</field>
             <field name="stage_id" ref="hr_recruitment.stage_job1"/>
             <field name="membership_applicant" eval="True" />

diff --git a/membership_hr_recruitment/menuitems.xml b/membership_hr_recruitment/menuitems.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <menuitem
+        name="Applications"
+        parent="membership.menu_marketing_config_association"
+        id="menu_applications" action="hr_recruitment.crm_case_categ0_act_job" />
+
+</odoo>
diff --git a/membership_hr_recruitment/models/hr_applicant.py b/membership_hr_recruitment/models/hr_applicant.py
@@ -5,8 +5,8 @@ class HRApplicant(models.Model):
     _inherit = "hr.applicant"
 
     membership_applicant = fields.Boolean()
-    section_membership_ids = fields.One2many(
-        related="partner_id.section_membership_ids"
+    membership_group_member_ids = fields.One2many(
+        related="partner_id.membership_group_member_ids"
     )
 
     def create_employee_from_applicant(self):

diff --git a/membership_hr_recruitment/tests/__init__.py b/membership_hr_recruitment/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_membership_hr_recruitment