Fix issue with members tab in the group UI and other fixes

Author: gonzalesedwin1123

spp_event_data/wizard/create_event_wizard.py

@@ -32,11 +32,7 @@ def next_page(self):
                 wizard_list = model_name.split(".")
                 wizard_model = "%s.create." % wizard_list[0]
                 wizard_list.pop(0)
-                view_name = self.env["ir.model"].search(
-                    [
-                        ("model", "=", model_name)
-                    ]
-                ).name
+                view_name = self.env["ir.model"].search([("model", "=", model_name)]).name
                 for split_wizard in wizard_list:
                     wizard_model += "%s." % split_wizard
                 wizard_model += "wizard"

spp_farmer_registry_base/models/farmer.py

@@ -29,6 +29,7 @@ class Farmer(models.Model):
         string="Highest Educational Level",
     )
 
+
 class TempFarmer(models.Model):
     _name = "spp.farmer"
     _description = "Temporary Model for Farmer"

spp_farmer_registry_laos/__manifest__.py

@@ -16,11 +16,13 @@
         "base",
         "g2p_registry_base",
         "spp_farmer_registry_base",
+        "spp_registry_group_hierarchy",
         "spp_event_data",
         "queue_job",
     ],
     "data": [
         "security/ir.model.access.csv",
+        "data/group_kind_data.xml",
         "views/group_view.xml",
         "views/event_data_view.xml",
         "views/generate_farmer_data_view.xml",

spp_farmer_registry_laos/data/group_kind_data.xml

@@ -0,0 +1,8 @@
+<odoo noupdate="1">
+
+    <record id="kind_farmer_group" model="g2p.group.kind">
+        <field name="name">Farmer Group</field>
+        <field name="allow_all_member_type">True</field>
+    </record>
+
+</odoo>

spp_farmer_registry_laos/models/generate_farmer_data.py

@@ -423,25 +423,25 @@ def _generate_event_data_cycle2b(self, group_id):
         event_id = self._create_event_data("spp.event.cycle2b", group_id)
 
         cycle2b_vals = {
-                "no_implemented": random.randint(0, 100),
-                "no_on_going": random.randint(0, 100),
-                "no_not_implemented": random.randint(0, 100),
-                "production_area": random.randint(0, 100),
-                "agricultural_yield": random.randint(0, 100),
-                "agricultural_productivity": random.randint(0, 100),
-            }
+            "no_implemented": random.randint(0, 100),
+            "no_on_going": random.randint(0, 100),
+            "no_not_implemented": random.randint(0, 100),
+            "production_area": random.randint(0, 100),
+            "agricultural_yield": random.randint(0, 100),
+            "agricultural_productivity": random.randint(0, 100),
+        }
         event = self.env["spp.event.cycle2b"].create(cycle2b_vals)
         event_id.res_id = event.id
 
     def _generate_event_data_cycle2c(self, group_id):
         event_id = self._create_event_data("spp.event.cycle2c", group_id)
 
         cycle2c_vals = {
-                "no_livestock_project": random.randint(0, 100),
-                "no_livestock_present": random.randint(0, 100),
-                "no_livestock_consumption": random.randint(0, 100),
-                "no_livestock_sold": random.randint(0, 100),
-                "no_livestock_increase": random.randint(0, 100),
-            }
+            "no_livestock_project": random.randint(0, 100),
+            "no_livestock_present": random.randint(0, 100),
+            "no_livestock_consumption": random.randint(0, 100),
+            "no_livestock_sold": random.randint(0, 100),
+            "no_livestock_increase": random.randint(0, 100),
+        }
         event = self.env["spp.event.cycle2c"].create(cycle2c_vals)
         event_id.res_id = event.id

spp_farmer_registry_laos/views/group_view.xml

@@ -5,11 +5,12 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="g2p_registry_membership.view_groups_form_membership" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='members']" position="attributes">
-                <attribute name="invisible">1</attribute>
+            <xpath expr="//page[@name='other']" position="before">
+               <xpath expr="//page[@name='members']" position="move" />
             </xpath>
         </field>
     </record>
+
     <record id="view_farm_groups_form" model="ir.ui.view">
         <field name="name">view_farm_groups_form</field>
         <field name="model">res.partner</field>
@@ -21,41 +22,6 @@
             <xpath expr="//page[@name='basic_info']" position="attributes">
                 <attribute name="invisible">1</attribute>
             </xpath>
-            <xpath expr="//page[@name='other']" position="before">
-                <page string="Members" name="members_page">
-                    <group col="4" colspan="4">
-                        <field name="group_membership_ids" readonly="disabled" nolabel="1" colspan="4">
-                            <tree default_order='status asc,ended_date asc'>
-                                <button
-                                    name="open_individual_form"
-                                    type="object"
-                                    icon="fa-external-link"
-                                    class="btn-success"
-                                    string="Open Individual Form"
-                                />
-                                <field
-                                    name="individual"
-                                    domain="[('is_registrant','=',True),('is_group','=',False)]"
-                                    options="{'no_create':True}"
-                                    string="Member Name"
-                                    context="{'form_view_ref':'g2p_registry_individual.view_individuals_form'}"
-                                />
-                                <field name="individual_birthdate" width="20%" string="Date of Birth" />
-                                <field name="individual_gender" string="Sex" />
-                                <field
-                                    name="kind"
-                                    string="Role"
-                                    widget="many2many_tags"
-                                    options="{'no_open':True, 'no_create_edit':True, 'no_create':True, 'no_quick_create':True}"
-                                />
-                                <field name="start_date" />
-                                <field name="ended_date" string="End date" />
-                                <field name="status" />
-                            </tree>
-                        </field>
-                    </group>
-                </page>
-            </xpath>
 
             <xpath expr="//page[@name='ids']" position="before">
                 <page name="section_farm_act" string="Farm Activity">