devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4210 from expsa/younes_dev_odex25_ensan 

[IMP] update grant.benefit
This commit is contained in:
kchyounes19 2025-08-17 16:50:32 +01:00 committed by GitHub
parent 529e87f2c3 9b4f950c18
commit 589c9c5e1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
odex25_ensan/odex_benefit/i18n/ar_001.po
View File

@ -3121,7 +3121,6 @@ msgstr "عنوان الشركة"
#: model:ir.model.fields.selection,name:odex_benefit.selection__benefit_sms_configuration__state__complete_info
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state__complete_info
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state_a__complete_info
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__complete_info
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
msgid "Complete Information"
msgstr "إكمال البيانات"
@ -5356,7 +5355,6 @@ msgstr "اعتماد رئيس العمليات الإيقاف"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state__first_approve
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state_a__first_approve
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__first_approve
msgid "First Approved"
msgstr "الاعتماد المبدئي"
@ -9966,6 +9964,7 @@ msgstr " توجيه الملف للاخصائي"
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__researcher_id
#: model:ir.model.fields,field_description:odex_benefit.field_family_complaints__researcher_id
#: model:ir.model.fields,field_description:odex_benefit.field_visit_location__researcher_ids
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_search
msgid "Researcher"
msgstr "اخصائي اجتماعي"
@ -10630,6 +10629,7 @@ msgstr "نوع الرياضة"
#: model:ir.model.fields,field_description:odex_benefit.field_res_country_city__state_id
#: model:ir.model.fields,field_description:odex_benefit.field_visit_location__state
#: model:ir.model.fields,field_description:odex_benefit.field_seasonal_service__state
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_search
msgid "State"
msgstr "الحالة"
@ -11875,7 +11875,6 @@ msgstr "نوع الزيارة"
#: model:ir.model.fields.selection,name:odex_benefit.selection__benefit_sms_configuration__state__waiting_approve
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state__waiting_approve
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state_a__waiting_approve
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__waiting_approve
#: model:ir.model.fields.selection,name:odex_benefit.selection__receive_food_surplus__state__waiting_approve
msgid "Waiting Approved"
msgstr "بانتظار الموافقة"
@ -12122,7 +12121,6 @@ msgid "Woman Manager"
msgstr "مدير اللجنة النسائية"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__new
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state__new
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_search
msgid "New"
@ -14658,3 +14656,24 @@ msgstr "هل أنت متأكد أنك تريد إرجاع الحالة إلى ا
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__applicant_name
msgid "Applicant Name"
msgstr "اسم مقدم الطلب"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__new
msgid "Researcher Assignment"
msgstr "اسناد الاخصائي"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__complete_info
msgid "Waiting for Researcher"
msgstr "بانتظار الاخصائي"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__waiting_approve
msgid "Waiting for Operation Manager"
msgstr "بانتظار رئيسة العمليات"
#. module: odex_benefit
#: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__first_approve
msgid "Waiting for Branch Manager"
msgstr "بانتظار مدير الفرع"

8
odex25_ensan/odex_benefit/models/benefit.py
View File

@ -384,14 +384,14 @@ class GrantBenefitProfile(models.Model):
request_activity_id = fields.Many2one('mail.activity')
state = fields.Selection([
('draft', 'Draft'),
('new', 'New'),
('complete_info', 'Complete Information'),
('waiting_approve', 'Waiting Approved'),
('new', 'Researcher Assignment'),
('complete_info', 'Waiting for Researcher'),
('waiting_approve', 'Waiting for Operation Manager'),
('woman_manager', 'Woman Manager'),
('researcher_team', 'Researcher Team'),
('edit_info', 'Edit Information'),
('first_refusal', 'First Refusal'),
('first_approve', 'First Approved'),
('first_approve', 'Waiting for Branch Manager'),
('second_approve', 'Second Approved'),
('refused', 'Refused'),
('temporarily_suspended', 'Temporarily suspended'),

12
odex25_ensan/odex_benefit/views/benefit_view.xml
View File

@ -1258,26 +1258,26 @@
<field name="arch" type="xml">
<xpath expr="//field[@name='account_relation']" position="replace">
<field name="account_relation"
attrs="{'readonly':[('state','not in',['draft','new','complete_info','edit_info'])],'required':[('state','not in',['draft','new'])]}"/>
attrs="{'readonly':[('state','not in',['complete_info','waiting_approve','first_approve'])],'required':[('state','in',['first_approve'])]}"/>
</xpath>
<xpath expr="//field[@name='acc_number']" position="replace">
<field name="acc_number"
attrs="{'readonly':[('state','not in',['draft','new','complete_info','edit_info'])],'required':[('state','not in',['draft','new'])]}"/>
attrs="{'readonly':[('state','not in',['complete_info','waiting_approve','first_approve'])],'required':[('state','in',['first_approve'])]}"/>
</xpath>
<xpath expr="//field[@name='acc_holder_name']" position="replace">
<field name="acc_holder_name"
attrs="{'invisible':[('is_family_member','=',True)],'readonly':[('state','not in',['draft','new','complete_info','edit_info'])],'required':[('state','not in',['draft','new']),('is_family_member','=',False)]}"/>
attrs="{'invisible':[('is_family_member','=',True)],'readonly':[('state','not in',['complete_info','waiting_approve','first_approve'])],'required':[('state','in',['first_approve']),('is_family_member','=',False)]}"/>
</xpath>
<xpath expr="//field[@name='family_member_id']" position="replace">
<field name="family_member_id"
attrs="{'invisible':[('is_family_member','=',False)],'readonly':[('state','not in',['draft','new','complete_info','edit_info'])],'required':[('state','not in',['draft','new']),('is_family_member','=',True)]}"/>
attrs="{'invisible':[('is_family_member','=',False)],'readonly':[('state','not in',['complete_info','waiting_approve','first_approve'])],'required':[('state','in',['first_approve']),('is_family_member','=',True)]}"/>
</xpath>
<xpath expr="//field[@name='bank_id']" position="replace">
<field name="bank_id"
attrs="{'readonly':[('state','not in',['draft','new','complete_info','edit_info'])],'required':[('state','not in',['draft','new'])]}"/>
attrs="{'readonly':[('state','not in',['complete_info','waiting_approve','first_approve'])],'required':[('state','in',['first_approve'])]}"/>
</xpath>
@ -1412,6 +1412,8 @@
<filter string="Suspend Method" name="suspend_method" context="{'group_by': 'suspend_method'}"/>
<filter string="Family Category" name="benefit_category_id"
context="{'group_by': 'benefit_category_id'}"/>
<filter string="State" name="state" context="{'group_by': 'state'}"/>
<filter string="Researcher" name="researcher_id" context="{'group_by': 'researcher_id'}"/>
</group>
<separator/>
<filter string="Temporarily Suspended" name="temporarily_suspended"