diff --git a/odex25_ensan/odex_benefit/i18n/ar_001.po b/odex25_ensan/odex_benefit/i18n/ar_001.po
index 86b61a5bf..46277f06a 100644
--- a/odex25_ensan/odex_benefit/i18n/ar_001.po
+++ b/odex25_ensan/odex_benefit/i18n/ar_001.po
@@ -10046,11 +10046,6 @@ msgstr "مقدم الطلب"
msgid "Request Second Approve"
msgstr "اعتماد مدير الفرع للطلب"
-#. module: odex_benefit
-#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__second_approve
-msgid "Request Second Approve"
-msgstr "بانتظار مدير المستفيدين"
-
#. module: odex_benefit
#: code:addons/odex_benefit/controllers/benefit_services.py:0
#, python-format
diff --git a/odex25_ensan/odex_benefit/models/service_request.py b/odex25_ensan/odex_benefit/models/service_request.py
index 347fcc3ae..869ed908e 100644
--- a/odex25_ensan/odex_benefit/models/service_request.py
+++ b/odex25_ensan/odex_benefit/models/service_request.py
@@ -10,7 +10,7 @@ class ServiceRequest(models.Model):
name = fields.Char(string='Reference', required=True, copy=False, readonly=True, index=True,default=lambda self: _('New'))
benefit_type = fields.Selection(string='Benefit Type',selection=[('family', 'Family'),('member', 'Member')])
date = fields.Datetime(string='Request Date',default=fields.Datetime.now)
- family_id = fields.Many2one('grant.benefit',string='Family',domain="['|',('state','=','second_approve'),'&',('state','in',['waiting_approve','first_approve']),('action_type','=','suspended')]")
+ family_id = fields.Many2one('grant.benefit',string='Family',domain="['|',('state','=','gm_assistant'),'&',('state','in',['waiting_approve','first_approve']),('action_type','=','suspended')]")
researcher_id = fields.Many2one("committees.line", string="Researcher", related="family_id.researcher_id",store=True)
family_category = fields.Many2one('benefit.category',string='Family Category',related='family_id.benefit_category_id')
benefit_member_count = fields.Integer(string="Benefit Member count", related='family_id.benefit_member_count')
@@ -146,7 +146,7 @@ class ServiceRequest(models.Model):
('researcher', 'Researcher'),
('waiting_approve', 'Waiting for Operation Manager'),
('first_approve', 'Waiting for Branch Manager'),
- ('second_approve', 'Request Second Approve'),
+ ('gm_assistant', 'Waiting Assistant General Manager'),
('accounting_approve', 'Accounting Approve'),
('approval_of_beneficiary_services', 'Approval of beneficiary services'),
('send_request_to_supplier', 'Send Request To Supplier'),
@@ -441,7 +441,7 @@ class ServiceRequest(models.Model):
def action_branch_manager_approve(self):
for rec in self:
if rec.service_cat.needs_beneficiary_manager_approval:
- rec.state = 'second_approve'
+ rec.state = 'gm_assistant'
else:
rec.state = 'accounting_approve'
diff --git a/odex25_ensan/odex_benefit/views/service_request.xml b/odex25_ensan/odex_benefit/views/service_request.xml
index b67d55972..f6286b7f4 100644
--- a/odex25_ensan/odex_benefit/views/service_request.xml
+++ b/odex25_ensan/odex_benefit/views/service_request.xml
@@ -91,7 +91,7 @@
@@ -130,7 +130,7 @@
+ attrs="{'invisible':[('state','in',['draft','researcher','waiting_approve','first_approve','gm_assistant'])]}"/>
@@ -397,7 +397,7 @@
-
-
+