Merge pull request #4545 from expsa/fix_activity

activity modifications

odex25_ensan/odex25_program_activity/models/program.py

@@ -262,6 +262,14 @@ class PaProgramActivityRegistration(models.Model):
     date_to = fields.Datetime(string='Date To')
 
     familye_id = fields.Many2one('grant.benefit', string='Family')
+    beneficiary_ids = fields.Many2many(
+        'family.member',
+        string='Beneficiary Name',
+        domain="[('benefit_id', '=', familye_id)]"
+    )
+    benefit_category_id = fields.Many2one(related='familye_id.benefit_category_id', string='Family Category', readonly=True)
+
+    # beneficiary_ids = fields.Many2many('family.member', string='Beneficiary Name')
     sms_phone = fields.Char(related='familye_id.sms_phone', string='Mobile Number', readonly=True)
 
     member_ids = fields.One2many(
@@ -288,7 +296,7 @@ class PaProgramActivityRegistration(models.Model):
         ('daughter', 'Daughter')
     ], string='Beneficiary Relation')
 
-    beneficiary_ids = fields.Many2many('res.partner', string='Beneficiary Name')
+
 
     sons = fields.Integer(
         string="Number of Sons",

odex25_ensan/odex25_program_activity/views/program.xml

@@ -342,6 +342,7 @@
 <!--            <field name="family_id" />-->
             <field name="familye_id" />
             <field name="branch_custom_id" />
+            <field name="benefit_category_id" />
             <field name="gender" />
             <field name="nationality_id" />
             <field name="graduation_status" />