From 1031cc4a389f5f82cff18112568ecfb875e2d461 Mon Sep 17 00:00:00 2001 From: Samir Ladoui Date: Thu, 14 Aug 2025 01:10:42 +0100 Subject: [PATCH] [UPD] odex_benefit --- .../odex_benefit/controllers/create_portal_account.py | 3 +++ odex25_ensan/odex_benefit/models/benefit.py | 9 ++++++--- odex25_ensan/odex_benefit/models/family_members.py | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/odex25_ensan/odex_benefit/controllers/create_portal_account.py b/odex25_ensan/odex_benefit/controllers/create_portal_account.py index 5e519a5ff..bb7ec3682 100644 --- a/odex25_ensan/odex_benefit/controllers/create_portal_account.py +++ b/odex25_ensan/odex_benefit/controllers/create_portal_account.py @@ -65,6 +65,9 @@ class CreatePortalAccount(http.Controller): 'active': True, }) + # Set partner account_type + user.set_partner_account_type(account_type) + # Update user fields similar to create_user and original flow user.sudo().write({ 'password': password, diff --git a/odex25_ensan/odex_benefit/models/benefit.py b/odex25_ensan/odex_benefit/models/benefit.py index 67c1a69c1..6321b491e 100644 --- a/odex25_ensan/odex_benefit/models/benefit.py +++ b/odex25_ensan/odex_benefit/models/benefit.py @@ -490,7 +490,8 @@ class GrantBenefitProfile(models.Model): exception_start_date = fields.Datetime(string='Exception Start Date') exception_end_date = fields.Datetime(string='Exception End Date') - sponsor_id = fields.Many2one('res.partner', string='Sponsor',domain="[('account_type','=','sponsor')]") + # sponsor_id = fields.Many2one('res.partner', string='Sponsor',domain="[('account_type','=','sponsor')]") + sponsor_id = fields.Many2one('res.partner', string='Sponsor',domain="['|', ('account_type', '=', 'sponsor'), ('is_sponsor', '=', True)]") family_monthly_income = fields.Float(string="Family Monthly Income", compute='_get_family_monthly_values') family_monthly_meals = fields.Float(string="Family Monthly Meals", compute='_get_family_monthly_values') @@ -2196,7 +2197,8 @@ class GrantBenefitProfile(models.Model): 'name': self.name, 'email': self.email, 'phone': self.phone, - 'account_type':'family', + # 'account_type':'family', + 'is_family': True, 'code':self.code, 'bank_ids': [(0,0,bank_val)] }) @@ -2231,7 +2233,8 @@ class GrantBenefitProfile(models.Model): 'name': self.name, 'email': self.email, 'phone': self.phone, - 'account_type': 'family', + # 'account_type': 'family', + 'is_family': True, 'code': self.code, }) if bank_val['acc_number'] and bank_val['acc_holder_name'] and bank_val['bank_id']: diff --git a/odex25_ensan/odex_benefit/models/family_members.py b/odex25_ensan/odex_benefit/models/family_members.py index 1aa88f2f3..9709805e7 100644 --- a/odex25_ensan/odex_benefit/models/family_members.py +++ b/odex25_ensan/odex_benefit/models/family_members.py @@ -228,7 +228,8 @@ class FamilyMemberProfile(models.Model): selection=[('temporarily_suspend', 'Temporarily Suspended'), ('suspend', 'Suspend')], string="Suspend Type") suspend_method = fields.Selection(selection=[('manual', 'Manual'), ('auto', 'Auto')], string="Suspend Method",default='auto') is_member_workflow = fields.Boolean('Is Member Workflow?') - sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner',domain="[('account_type','=','sponsor')]") + # sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner',domain="[('account_type','=','sponsor')]") + sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner',domain="['|', ('account_type', '=', 'sponsor'), ('is_sponsor', '=', True)]") sponsor_related_id = fields.Many2one('takaful.sponsor', string='Sponsor') sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship') required_attach = fields.Selection(selection=[('true', 'True'), ('false', 'False')], compute='get_required_attach',store=True,string='Member Required Attach')