Merge pull request #5307 from expsa/notes_8

Notes 8
This commit is contained in:
NossibaElhadi 2025-11-10 11:47:57 +03:00 committed by GitHub
commit 2649c2947c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 4 deletions

View File

@ -2337,7 +2337,7 @@ msgstr "الاسر المستفيدة"
#: model:ir.model.fields,field_description:odex_takaful.field_replacement_process__family_ids
#: model:ir.model.fields,field_description:odex_takaful.field_takaful_sponsorship__family_id
msgid "Family"
msgstr "ملف الاسرة"
msgstr "ملف الأسرة"
#. module: odex_takaful
#: model:ir.model.fields,field_description:odex_takaful.field_replacement_wiz__family_category_ids

View File

@ -52,8 +52,9 @@ class DonationsDetailsLines(models.Model):
education_level = fields.Many2one("education.level", string='Education Levels')
members_domain_ids = fields.Many2many('family.member', compute='_compute_members_domain_ids')
family_domain_ids = fields.Many2many('grant.benefit', compute='_compute_family_domain_ids')
benefit_id = fields.Many2one('family.member', string='Beneficiary Name', ondelete='restrict', domain="[('id', 'in', members_domain_ids)]", tracking=True)
family_id = fields.Many2one('grant.benefit', string='Family', ondelete='restrict')
family_id = fields.Many2one('grant.benefit', string='Family', ondelete='restrict', domain="[('id', 'in', family_domain_ids)]", tracking=True)
benefit_ids = fields.Many2many('family.member', string='Beneficiaries Names', tracking=True, domain="[('id', 'in', members_domain_ids)]")
sponsorship_duration = fields.Selection([('temporary', 'Temporary'), ('permanent', 'Permanent')],
string='Sponsorship Type', default="temporary")
@ -507,6 +508,21 @@ class DonationsDetailsLines(models.Model):
else:
rec.total_donation_amount = rec.total_months_amount * (rec.benefits_count or 1)
@api.depends('family_id','record_type')
def _compute_family_domain_ids(self):
for rec in self:
domain = []
if rec.record_type == 'donation':
domain = [
'|',
('state', '=', 'second_approve'),
'&',
('state', 'in', ('waiting_approve', 'first_approve')),
('action_type', '=', 'suspended')]
family = self.env['grant.benefit'].sudo().search(domain)
rec.family_domain_ids = [(6, 0, family.ids)] if family else False
@api.depends('gender',
'record_type',
'education_status',
@ -822,8 +838,8 @@ class DonationsDetailsLines(models.Model):
# })
wizard = self.env['replacement.wiz'].create({
'old_family_id': self.family_id.id,
'old_members_id': self.benefit_ids[0].id,
'old_family_id': self.family_id.id if self.family_id else False,
'old_members_id': self.benefit_ids[0].id if self.benefit_ids else False,
'record_type': self.record_type,
'sponsorship_id': self.id,
})

View File

@ -237,6 +237,7 @@
attrs="{'invisible': [('donation_mechanism','!=','with_conditions')]}">
<group>
<field name="members_domain_ids" invisible="1" />
<field name="family_domain_ids" invisible="1" />
<field name="sponsorship_type"
attrs="{'invisible': [('donation_mechanism','!=','with_conditions')], 'required': [('donation_mechanism','=','with_conditions')], 'readonly': [('parent_state', '!=', 'draft')]}" />
<field name="benefit_type"

View File

@ -205,6 +205,7 @@
<field name="sponsorships_computed" invisible="1"/>
<field name="direct_debit" invisible="1"/>
<field name="members_domain_ids" invisible="1"/>
<field name="family_domain_ids" invisible="1"/>
<field name="fixed_value" invisible="1"/>
<field name="sequence" widget="handle"/>
<field name="sequence_no" readonly="1"/>
@ -324,6 +325,7 @@
invisible="1"/>
<!-- attrs="{'column_invisible': [('parent.donation_mechanism','!=','with_conditions'),('parent.record_type','!=','sponsorship')]}"/>-->
<field name="members_domain_ids" invisible="1"/>
<field name="family_domain_ids" invisible="1"/>
<field name="benefit_id"
attrs="{'column_invisible': [('parent.donation_mechanism','!=','with_conditions'),('parent.record_type','!=','sponsorship')]}"/>
<field name="sponsorship_duration" invisible="1"/>
@ -458,6 +460,7 @@
invisible="1"/>
<!-- attrs="{'invisible': [('donation_mechanism','!=','with_conditions')], 'required': [('hide_beneficiary_group','=', False), ('donation_mechanism','=','with_conditions')]}"/>-->
<field name="members_domain_ids" invisible="1"/>
<field name="family_domain_ids" invisible="1"/>
<field name="benefit_id"
invisible="1"
options="{'no_create': True, 'no_create_edit':True}"/>