diff --git a/odex25_ensan/odex_benefit/i18n/ar_001.po b/odex25_ensan/odex_benefit/i18n/ar_001.po index d61032091..288e8fec5 100644 --- a/odex25_ensan/odex_benefit/i18n/ar_001.po +++ b/odex25_ensan/odex_benefit/i18n/ar_001.po @@ -1395,7 +1395,7 @@ msgstr "مدة الانتهاء بالايام" #: model:ir.model.fields,field_description:odex_benefit.field_service_request__benefit_category_ids #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__benefit_category_ids msgid "Allowed Categories" -msgstr "" +msgstr "الفئات المستفيدة" #. module: odex_benefit #: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__service_type__alternative_housing @@ -10506,7 +10506,6 @@ msgid "Self" 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.service_request_search msgid "Send Request" msgstr "إرسال الطلب" @@ -14247,11 +14246,6 @@ msgstr "اختر سبب الرفض" msgid "Return the request to the specialist" msgstr "إعادة الطلب إلي الاخصائي" -#. module: odex_benefit -#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form -msgid "RESEARCHER ACCEPT" -msgstr "قبول الباحث " - #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_service_request__return_reason msgid "Reason for Returning the Request" @@ -15947,4 +15941,41 @@ msgstr "شروط الاستحقاق" #. module: odex_benefit #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allow_non_beneficiary msgid "Allow Non Beneficiary" -msgstr "منح الخدمة لغير المستفيد" \ No newline at end of file +msgstr "منح الخدمة لغير المستفيد" + +#. module: odex_benefit +#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form +msgid "Send" +msgstr "إرسال الطلب" + +#. module: odex_benefit +#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form +msgid "Researcher Approval" +msgstr "موافقة الأخصائي" + +#. module: odex_benefit +#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form +msgid "Family Received" +msgstr "تم الاستلام" + +#. module: odex_benefit +#: model:ir.model.fields,field_description:odex_benefit.field_service_refuse_reason_wizard__notes +msgid "Additional Notes" +msgstr "ملاحظات" + +#. module: odex_benefit +#: code:addons/odex_benefit/wizards/service_refuse_reason_wizard.py:0 +#, python-format +msgid "" +"Request was refused.\n" +"Reason: %s\n" +"Notes: %s" +msgstr "" +"تم رفض طلب الخدمة.\n" +"السبب: %s\n" +"الملاحظات: %s" + +#. module: odex_benefit +#: model:ir.model.fields,field_description:odex_benefit.field_service_request__refuse_reason +msgid "Reason for Refusal" +msgstr "سبب الرفض" \ No newline at end of file diff --git a/odex25_ensan/odex_benefit/models/service_request.py b/odex25_ensan/odex_benefit/models/service_request.py index 2207b0fcf..e81985f42 100644 --- a/odex25_ensan/odex_benefit/models/service_request.py +++ b/odex25_ensan/odex_benefit/models/service_request.py @@ -174,6 +174,7 @@ class ServiceRequest(models.Model): state_b = fields.Selection(related='state', tracking=False) refuse_reason_id = fields.Many2one('service.refuse.reason', string="Refuse Reason") return_reason = fields.Text(string="Reason for Returning the Request") + refuse_reason = fields.Text(string="Reason for Refusal") specialist_note = fields.Text(string="Specialist's Note After Return") exception = fields.Boolean(string='Exception',default=False) exception_attach = fields.Many2many('ir.attachment', 'rel_exception_attachment_service_request', 'service_request_id', @@ -497,8 +498,6 @@ class ServiceRequest(models.Model): } def action_refuse(self): - # for rec in self: - # rec.state = 'refused' return { 'name': 'Select Reason', 'type': 'ir.actions.act_window', diff --git a/odex25_ensan/odex_benefit/views/service_request.xml b/odex25_ensan/odex_benefit/views/service_request.xml index 1e3b0e1d2..e6ffd1a61 100644 --- a/odex25_ensan/odex_benefit/views/service_request.xml +++ b/odex25_ensan/odex_benefit/views/service_request.xml @@ -8,140 +8,234 @@