IMP benefit

odex25_ensan/odex_benefit/i18n/ar_001.po

@@ -2375,6 +2375,7 @@ msgstr "التدريب"
 #: model:ir.model.fields,field_description:odex_benefit.field_benefit_followers__follower_type
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__benefit_type
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__benefit_type
+#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__benefit_type
 msgid "Benefit Type"
 msgstr "نوع المستفيدين"
 
@@ -4905,6 +4906,7 @@ msgstr "استثنائية"
 #. module: odex_benefit
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__action_type__exception
 #: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__action_type__exception
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__exception
 msgid "Exception"
 msgstr "استثناء"
 
@@ -4912,6 +4914,7 @@ msgstr "استثناء"
 #: model:ir.model.fields,field_description:odex_benefit.field_exception_wizard__exception_attachment
 #: model:ir.model.fields,field_description:odex_benefit.field_family_member__exception_attachment
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__exception_attachment
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__exception_attach
 msgid "Exception Attachment"
 msgstr "مرفق الاستثناء"
 
@@ -5137,6 +5140,7 @@ msgstr "الاسر المستفيدة"
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__family_id
 #: model:ir.model.fields,field_description:odex_benefit.field_visit_location__family_id
 #: model:ir.model.fields,field_description:odex_benefit.field_zkat_line__family_id
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__benefit_type__family
 #: model:ir.model.fields.selection,name:odex_benefit.selection__generate_reports__service_to__family
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__benefit_type__family
 #: model:ir.model.fields.selection,name:odex_benefit.selection__visit_location__benefit_type__family
@@ -7951,6 +7955,7 @@ msgstr "الاجتماعات"
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__member_id
 #: model:ir.model.fields,field_description:odex_benefit.field_suspend_reason_wizard__member_id
 #: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__benefit_type__member
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__benefit_type__member
 msgid "Member"
 msgstr "الفرد"
 
@@ -15716,9 +15721,10 @@ msgid "Maximum Age"
 msgstr "الأقصى للعمر"
 
 #. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__service_conditions
 #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__service_conditions
 msgid "Service Conditions"
-msgstr "شروط الاستحقاق"
+msgstr "شروط الخدمة"
 
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.services_settings_form
@@ -15926,3 +15932,9 @@ msgid ""
 "Application rejected due to missing documents, missing official proofs, or "
 "the family's ineligibility for the association's services."
 msgstr "عدم استكمال المستندات المطاوبة او الاثباتات الرسمية  او عدم استحقاق الاسرة لخدمات الجمعية وتم رفض الطلب"
+
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
+#: model_terms:ir.ui.view,arch_db:odex_benefit.services_settings_form
+msgid "Eligibility Criteria"
+msgstr "شروط الاستحقاق"

odex25_ensan/odex_benefit/models/service_request.py

@@ -1,5 +1,3 @@
-from email.policy import default
-
 from odoo import fields, models, api, _
 from odoo.exceptions import UserError, ValidationError
 from datetime import timedelta

odex25_ensan/odex_benefit/views/service_request.xml

@@ -22,11 +22,11 @@
                         <button name="action_accounting_approve" type="object"
                                 string="Accounting Approve" class="oe_highlight"
                                 confirm="Are you sure you want to approve  ?"
-                                states="approval_of_beneficiary_services" groups="odex_benefit.group_benefit_accounting_accept"/>
+                                states="accounting_approve" groups="odex_benefit.group_benefit_accounting_accept"/>
                         <button name="action_accounting_first_refuse" type="object"
                                 string="Return the request to the specialist" class="oe_highlight"
-                                attrs="{'invisible': ['|',('return_reason','!=', False), ('state', 'not in', ['second_approve' ,'send_request' ,'first_approve'])]}"
+                                attrs="{'invisible': ['|',('return_reason','!=', False), ('state', 'not in', ['accounting_approve', 'second_approve' ,'send_request' ,'first_approve'])]}"
-                                states="second_approve,send_request,first_approve" groups="odex_benefit.group_benefit_accounting_accept,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"/>
+                                groups="odex_benefit.group_benefit_accounting_accept,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"/>
                         <button name="action_send_request_to_supplier" type="object"
                                 string="Send Request To Supplier" class="oe_highlight"
                                 confirm="Are you sure you want to send request to supplier ?"