[UPD] odex_benefit

odex25_ensan/odex_benefit/i18n/ar_001.po

@@ -9771,6 +9771,7 @@ msgstr "سبب الرفض"
 #: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__family_member__state_a__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__grant_benefit__state__refused
+#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__state__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__receive_appliances_furniture__state__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__receive_benefit_loans__state__refused
 #: model:ir.model.fields.selection,name:odex_benefit.selection__receive_benefit_zkat__state__refused
@@ -9783,6 +9784,7 @@ msgstr "سبب الرفض"
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_entity_final_refused_reason_wizard_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_entity_refused_reason_wizard_form
+#: model_terms:ir.ui.view,arch_db:odex_benefit.view_payment_ordres_search
 msgid "Refused"
 msgstr "مرفوض"
 
@@ -10051,11 +10053,15 @@ msgid "Request Date"
 msgstr "تاريخ الطلب"
 
 #. module: odex_benefit
-#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__first_approve
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 msgid "Request First Approve"
 msgstr "اعتماد رئيس العمليات للطلب"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__first_approve
+msgid "Request First Approve"
+msgstr "بانتظار مدير الفرع"
+
 #. module: odex_benefit
 #: code:addons/odex_benefit/controllers/benefit_services.py:0
 #, python-format
@@ -10069,11 +10075,15 @@ msgid "Request Producer"
 msgstr "مقدم الطلب"
 
 #. module: odex_benefit
-#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__second_approve
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 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
@@ -10116,14 +10126,19 @@ msgstr "إعادة جدولة"
 
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_changes_requests__researcher_ids
+#: model:ir.model.fields,field_description:odex_benefit.field_family_complaints__researcher_id
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__researcher_id
 #: 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 "اخصائي اجتماعي"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__researcher
+msgid "Researcher"
+msgstr "بانتظار الأخصائي"
+
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_changes_requests__gender_researcher_id
 #: model:ir.model.fields,field_description:odex_benefit.field_changes_requests__researcher_id
@@ -10488,12 +10503,16 @@ msgid "Self"
 msgstr "نفس"
 
 #. module: odex_benefit
-#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__send_request
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
 msgid "Send Request"
 msgstr "إرسال الطلب"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__send_request
+msgid "Send Request"
+msgstr "بانتظار رئيسة العمليات"
+
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
 msgid "Send Reset Password"
@@ -14255,11 +14274,6 @@ msgstr "سبب إعادة الطلب"
 msgid "Approval Of Beneficiary Services"
 msgstr "اعتماد خدمات المستفيدين"
 
-#. module: odex_benefit
-#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__approval_of_beneficiary_services
-msgid "Approval of beneficiary services"
-msgstr "اعتماد خدمات المستفيدين"
-
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__exception_or_steal_attach
 msgid "Exception or steal Attachment"
@@ -14361,11 +14375,36 @@ msgid "Res City"
 msgstr "المدينة"
 
 #. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__payment_orders__state__accounting_approve
 #: model:ir.model.fields.selection,name:odex_benefit.selection__seasonal_service__state__accounting_approve
+#: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
+#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
+#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_search
+#: model_terms:ir.ui.view,arch_db:odex_benefit.view_payment_ordres_search
 msgid "Accounting Approve"
 msgstr "إعتماد إدارة المالية"
 
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__accounting_approve
+msgid "Accounting Approve"
+msgstr "بانتظار المالية"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__approval_of_beneficiary_services
+msgid "Approval of beneficiary services"
+msgstr "بانتظار المورد"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__send_request_to_supplier
+msgid "Send Request To Supplier"
+msgstr "بانتظار استلام"
+
+#. module: odex_benefit
+#: model:ir.model.fields.selection,name:odex_benefit.selection__service_request__state__family_received_device
+msgid "Family Received Device"
+msgstr "تم"
+
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
 msgid "Approve Beneficiary Services"

odex25_ensan/odex_benefit/models/service_request.py

@@ -165,8 +165,8 @@ class ServiceRequest(models.Model):
             ('first_approve', 'Request First Approve'),
             ('second_approve', 'Request Second Approve'),
             ('accounting_approve', 'Accounting Approve'),
-        ('approval_of_beneficiary_services', 'Approval of beneficiary services'),
+            ('approval_of_beneficiary_services', 'Approval of beneficiary services'),
-        ('send_request_to_supplier', 'Send Request To Supplier'),
+            ('send_request_to_supplier', 'Send Request To Supplier'),
             ('family_received_device', 'Family Received Device'),
             ('refused', 'Refused')
         ], string='state',default='draft', tracking=True)
@@ -446,7 +446,10 @@ class ServiceRequest(models.Model):
 
     def action_second_approve(self):
         for rec in self:
-            rec.state = 'second_approve'
+            if rec.service_cat.needs_beneficiary_manager_approval:
+                rec.state = 'second_approve'
+            else:
+                rec.state = 'accounting_approve'
 
     def action_approval_of_beneficiary_services(self):
         for rec in self:
@@ -460,7 +463,10 @@ class ServiceRequest(models.Model):
 
     def action_send_request_to_supplier(self):
         for rec in self:
-            rec.state = 'send_request_to_supplier'
+            if rec.service_cat.service_type == 'electrical_devices':
+                rec.state = 'approval_of_beneficiary_services'
+            else:
+                rec.state = 'send_request_to_supplier'
 
     def action_family_received_device(self):
         for rec in self:

odex25_ensan/odex_benefit/models/services_settings.py

@@ -113,6 +113,7 @@ class ServicesSettings(models.Model):
         ('region', 'Amount by Region'),
     ], string="Max Limit Type"
     )
+    needs_beneficiary_manager_approval = fields.Boolean()
 
 
 

odex25_ensan/odex_benefit/views/service_request.xml

@@ -30,16 +30,17 @@
                         <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 ?"
-                                groups="odex_benefit.group_benefit_accounting_accept" attrs="{'invisible': ['|',('service_type','!=','electrical_devices'),('state_b','!=','accounting_approve')]}" />
+                                groups="odex_benefit.group_benefit_accounting_accept" attrs="{'invisible': ['|',('service_type','!=','electrical_devices'),('state','!=','accounting_approve')]}" />
                         <button name="action_family_received_device" type="object"
                                 string="Family Received Device" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_accounting_accept" attrs="{'invisible': ['|',('service_type','!=','electrical_devices'),('state_b','!=','send_request_to_supplier')]}" />
+                                groups="odex_benefit.group_benefit_accounting_accept" attrs="{'invisible': ['|',('service_type','!=','electrical_devices'),('state','!=','send_request_to_supplier')]}" />
                         <button name="action_refuse" type="object"
                                 string="Refuse" class="oe_highlight"
                                 states="first_approve,second_approve,draft,send_request"/>
-                       <field name="state" widget="statusbar" invisible="1"/>
+                        <!-- <field name="state" widget="statusbar" invisible="1"/> -->
-                        <field name="state_a" widget="statusbar" statusbar_visible="draft,researcher,send_request,first_approve,second_approve,accounting_approve,refused" attrs="{'invisible': [('service_type','=','electrical_devices')]}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,researcher,send_request,first_approve,accounting_approve,send_request_to_supplier,family_received_device,refused"/>
-                        <field name="state_b" widget="statusbar" statusbar_visible="draft,researcher,send_request,first_approve,second_approve,accounting_approve,send_request_to_supplier,family_received_device,refused" attrs="{'invisible': [('service_type','!=','electrical_devices')]}" groups="odex_benefit.group_benefit_accounting_accept"/>
+                        <!-- <field name="state_a" widget="statusbar" statusbar_visible="draft,researcher,send_request,first_approve,second_approve,accounting_approve,refused" attrs="{'invisible': [('service_type','=','electrical_devices')]}"/>
+                        <field name="state_b" widget="statusbar" statusbar_visible="draft,researcher,send_request,first_approve,second_approve,accounting_approve,send_request_to_supplier,family_received_device,refused" attrs="{'invisible': [('service_type','!=','electrical_devices')]}" groups="odex_benefit.group_benefit_accounting_accept"/> -->
                         </header>
                         <sheet>
                             <field name="is_payment_order_done" invisible="1"/>

odex25_ensan/odex_benefit/views/services_settings.xml

@@ -43,6 +43,8 @@
                                                attrs="{'invisible':[('is_main_service','=',True)]}"/>
                                         <field name="is_this_service_for_student" widget="boolean_toggle"
                                                attrs="{'invisible':[('is_main_service','=',True)]}"/>
+                                        <field name="needs_beneficiary_manager_approval" widget="boolean_toggle"
+                                               attrs="{'invisible':[('is_main_service','=',True)]}"/>
                                     </group>
                                     <group>
                                         <field name="required_attach" widget="boolean_toggle"