diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 6fb8263e6..edc95d06d 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -11094,7 +11094,6 @@ msgstr "استثناء مؤقت"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__suspend_type__temporarily_suspend
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__suspend_type__temporarily_suspend
-#: model:ir.model.fields.selection,name:odex_benefit.selection__suspend_reason__suspend_type__temporarily_suspend
#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_search
@@ -17313,6 +17312,11 @@ msgstr "جهة تعليمية"
msgid "Temporary Suspended"
msgstr "إيقاف مؤقت"
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__suspend_reason__suspend_type__temporarily_suspend
+msgid "Temporarily Suspended"
+msgstr "إيقاف مؤقت"
+
#. module: odex_benefit
#: model:ir.model.fields,field_description:odex_benefit.field_family_member__final_suspend_date
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__final_suspend_date
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index b8396ffe1..6727c66ba 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -832,7 +832,19 @@ class FamilyMemberProfile(models.Model):
def action_suspend_second_accept(self):
for rec in self:
- rec.state_a = 'suspended_second_approve'
+ if rec.suspend_reason.need_service_manager_approval:
+ rec.state_a = 'family_services_manager'
+ elif rec.suspend_reason.suspend_type == 'temporarily_suspend':
+ rec.state_a = 'temporary_suspended'
+ else:
+ rec.state_a = 'suspended_second_approve'
+
+ def action_suspend_third_accept(self):
+ for rec in self:
+ if rec.suspend_reason.suspend_type == 'temporarily_suspend':
+ rec.state = 'temporary_suspended'
+ else:
+ rec.state = 'suspended_second_approve'
def action_suspend_refuse(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 ebd418bc1..ad4cfdb66 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -19,9 +19,13 @@
string="Second Approve" class="oe_highlight"
attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['first_approve'])]}"
/>
+