diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po index df9ee30cf..af665f4e0 100644 --- a/odex25_benefit/odex_benefit/i18n/ar_001.po +++ b/odex25_benefit/odex_benefit/i18n/ar_001.po @@ -18525,11 +18525,6 @@ msgstr "مكان سكن الأم البديلة غير مؤهل للاستفاد msgid "Can Request Temporary Exception" msgstr "يمكن طلب استثناء مؤقت" -#. module: odex_benefit -#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form -msgid "Exception Family Services Manager Approve" -msgstr "اعتماد مديرة خدمات المستفيدين للاستثناء" - #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allowed_country_ids msgid "Allowed Countries" diff --git a/odex25_benefit/odex_benefit/models/family_expense.py b/odex25_benefit/odex_benefit/models/family_expense.py index e2431ade1..60aa7655c 100644 --- a/odex25_benefit/odex_benefit/models/family_expense.py +++ b/odex25_benefit/odex_benefit/models/family_expense.py @@ -278,8 +278,12 @@ class ConfirmBenefitExpense(models.Model): base_domain.append(('branch_custom_id', 'in', rec.branch_custom_ids.ids)) min_income = validation_setting.benefit_category_ids.mapped('mini_income_amount') max_income = validation_setting.benefit_category_ids.mapped('max_income_amount') + benefit_category_ids = validation_setting.benefit_category_ids base_domain.extend([('member_income', '>=', min(min_income)), ('member_income', '<=', max(max_income))]) - base_domain.extend([('benefit_category_id', '!=', False)]) + if benefit_category_ids: + base_domain.extend([('benefit_category_id', 'in', benefit_category_ids.ids)]) + else: + base_domain.extend([('benefit_category_id', '!=', False)]) if rec.start_date and rec.end_date: conflicting_records = self.search([ ('id', '!=', rec._origin.id), diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py index 894fd613c..43f0f3e19 100644 --- a/odex25_benefit/odex_benefit/models/family_members.py +++ b/odex25_benefit/odex_benefit/models/family_members.py @@ -1048,15 +1048,10 @@ class FamilyMemberProfile(models.Model): rec.state_a = 'first_approve' def action_exception_second_accept(self): - for rec in self: - rec.is_excluded_suspension = True - rec.state_a = 'family_services_manager' - # rec.is_member_workflow = False - - def action_exception_third_accept(self): for rec in self: rec.is_excluded_suspension = True rec.state_a = 'exception_second_approve' + # rec.is_member_workflow = False def action_exception_final_accept(self): for rec in self: diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml index d5b21a778..a69ffee3b 100644 --- a/odex25_benefit/odex_benefit/views/family_members.xml +++ b/odex25_benefit/odex_benefit/views/family_members.xml @@ -57,12 +57,12 @@ string="Temporarily Exception" class="oe_highlight" confirm="Are you sure you want to move to Temporarily Exception ?" groups="!odex_benefit.group_benefit_supervisor" - attrs="{'invisible': ['|','|',('action_type','=','exception'),('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/> + attrs="{'invisible': ['|',('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/>