diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py index 794995efe..8c8c54dac 100644 --- a/odex25_benefit/odex_benefit/models/benefit.py +++ b/odex25_benefit/odex_benefit/models/benefit.py @@ -390,7 +390,7 @@ class GrantBenefitProfile(models.Model): total_expenses = fields.Float('Total Expenses', compute="get_total_expenses",store=True,tracking=True) total_income = fields.Float('Total Income', compute="get_total_income", store=True,tracking=True) benefit_member_count = fields.Integer(string="Members count", compute="get_members_count",store=True) - non_member_count = fields.Integer(string="Non Benefit Members count", compute="get_non_members_count") + non_member_count = fields.Integer(string="Non Benefit Members count", compute="get_members_count") member_income = fields.Float(string="Member Income Average", compute="get_member_income",store=True,tracking=True) request_activity_id = fields.Many2one('mail.activity') state = fields.Selection([ @@ -696,10 +696,11 @@ class GrantBenefitProfile(models.Model): @api.depends('member_ids', 'member_ids.member_status', 'add_replacement_mother', 'replacement_mother_family_member_id', 'replacement_mother_status', 'mother_family_member_id', - 'mother_status') + 'mother_status','mother_marital_conf','mother_location_conf','mother_income') def get_members_count(self): for ben in self: if ben.id: + ben.non_member_count = len(ben.member_ids.filtered(lambda x: x.member_status == 'non_benefit')) ben.benefit_member_count = len(ben.member_ids.filtered(lambda x: x.member_status == 'benefit')) if ben.add_replacement_mother and not ben.replacement_mother_family_member_id and ben.replacement_mother_status == 'benefit': ben.benefit_member_count += 1 @@ -708,6 +709,8 @@ class GrantBenefitProfile(models.Model): ben.benefit_member_count += 1 else: ben.benefit_member_count = 0.0 + ben.non_member_count = 0.0 + @api.depends('current_rent_contract_id') def _compute_rent_from_contract(self): @@ -2317,13 +2320,6 @@ class GrantBenefitProfile(models.Model): rec.replacement_mother_disabilities_attachment_ids.write({'member_id': replacement_member.id}) - def get_non_members_count(self): - for ben in self: - if ben.id: - ben.non_member_count = len(ben.member_ids.filtered(lambda x: x.member_status == 'non_benefit')) - else: - ben.non_member_count = 0.0 - @api.depends('benefit_member_count','total_income','total_expenses') def get_member_income(self): for ben in self: diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml index 686d95abe..2733beaa1 100644 --- a/odex25_benefit/odex_benefit/views/benefit_view.xml +++ b/odex25_benefit/odex_benefit/views/benefit_view.xml @@ -528,7 +528,7 @@