fix

2024-08-08 13:32:12 +03:00 · 2024-08-08 13:32:12 +03:00 · a090d4de36
parent e3b1887f99
commit a090d4de36
3 changed files with 21 additions and 27 deletions
--- a/odex25_hr/employee_requests/i18n/ar_001.po
+++ b/odex25_hr/employee_requests/i18n/ar_001.po
@ -999,7 +999,6 @@ msgstr "المدير المباشر"
 #: code:addons/employee_requests/models/hr_personal_permission.py:0
 #: code:addons/employee_requests/models/other_request.py:0
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
 #, python-format
 msgid "Direct Manager"
 msgstr "انتظار الموارد البشرية"
@ -1013,6 +1012,7 @@ msgstr "انتظار الموارد البشرية :"
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
 msgid "Direct Manager Approve"
 msgstr "تصديق المدير المباشر"

@ -1540,6 +1540,7 @@ msgstr "الكفالة"
 #. module: employee_requests
 #: code:addons/employee_requests/models/employee_overtime_request.py:0
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
 #, python-format
 msgid "HR Approval"
 msgstr "تصديق الموارد البشرية"
@ -1560,7 +1561,6 @@ msgstr "تصديق الموارد البشرية"
 #: code:addons/employee_requests/models/other_request.py:0
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
 #, python-format
 msgid "HR Manager"
 msgstr "مدير الموارد البشرية"
@ -2494,12 +2494,12 @@ msgstr "مواصفات المؤهل"
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view
+#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
 msgid "RE-Draft"
 msgstr "إرجاع للمسودة"

 #. module: employee_requests
 #: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view
-#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
 msgid "Re-draft"
 msgstr "إرجاع للمسودة"

@ -3472,15 +3472,9 @@ msgstr ""
 msgid "المدير التنفيذي"
 msgstr ""

-#. module: employee_requests
-#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__approved
-msgid "المدير العام"
-msgstr ""
-
 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_department_jobs__state__confirm
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_effective_form__state__direct_manager
-#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__confirm
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_clearance_form__state__submit
 msgid "المدير المباشر"
 msgstr ""
@ -3497,7 +3491,6 @@ msgstr ""

 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_effective_form__state__done
-#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__submit
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_clearance_form__state__direct_manager
 msgid "الموارد البشرية"
 msgstr ""
@ -3505,29 +3498,34 @@ msgstr ""
 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_personal_permission__state__draft
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_overtime_request__state__draft
+#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__draft
 msgid "Draft"
 msgstr "مسودة"

 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_personal_permission__state__send
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_overtime_request__state__submit
+#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__submit
 msgid "Waiting Direct Manager"
 msgstr "إنتظار المدير المباشر"

 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_personal_permission__state__direct_manager
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_overtime_request__state__financial_manager
+#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__confirm
 msgid "Wait HR Department"
 msgstr "إنتظار الموارد البشرية"

 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_personal_permission__state__approve
+#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__approved
 msgid "Approved"
 msgstr "تم التصديق"

 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_overtime_request__state__refused
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_personal_permission__state__refused
+#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__refuse
 msgid "Refused"
 msgstr "مرفوض"

@ -3640,7 +3638,6 @@ msgid "دخول متأخر"
 msgstr ""

 #. module: employee_requests
-#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__refuse
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_clearance_form__direct_mg__refuse
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_clearance_form__hr_mg__refuse
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_clearance_form__it_mg__refuse
@ -3709,7 +3706,6 @@ msgstr ""
 #. module: employee_requests
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_department_jobs__state__draft
 #: model:ir.model.fields.selection,name:employee_requests.selection__employee_effective_form__state__draft
-#: model:ir.model.fields.selection,name:employee_requests.selection__employee_other_request__state__draft
 #: model:ir.model.fields.selection,name:employee_requests.selection__house_allowance_advance__state__draft
 #: model:ir.model.fields.selection,name:employee_requests.selection__hr_clearance_form__state__draft
 msgid "مسودة"
--- a/odex25_hr/employee_requests/models/other_request.py
+++ b/odex25_hr/employee_requests/models/other_request.py
@ -13,10 +13,11 @@ class EmployeeOtherRequest(models.Model):
    from_hr = fields.Boolean()
    date = fields.Date(default=lambda self: fields.Date.today())
    comment = fields.Text()
-    state = fields.Selection(selection=[('draft', _('Draft')), ('submit', _('Submit')),
-                                        ('confirm', _('Direct Manager')),
-                                        ('approved', _('HR Manager')),
-                                        ('refuse', _('Refuse'))],
+    state = fields.Selection(selection=[('draft', _('Draft')), 
+                                        ('submit', _('Waiting Direct Manager')),
+                                        ('confirm', _('Wait HR Department')),
+                                        ('approved', _('Approval')),
+                                        ('refuse', _('Refused'))],
                             default='draft', tracking=True)
    request_type = fields.Selection(selection=[('dependent', _('Dependent')),
                                               ('insurance', _('Insurance')), ('card', _('Business Card')),
--- a/odex25_hr/employee_requests/views/other_request.xml
+++ b/odex25_hr/employee_requests/views/other_request.xml
@ -32,21 +32,18 @@
                    <header>
                        <button name="submit" string="Submit" class="oe_highlight" states="draft" type="object"/>

-                        <button name="confirm" string="Direct Manager" class="oe_highlight" states="submit"
-                                type="object"
-                                groups="hr_base.group_division_manager"/>
+                        <button name="confirm" string="Direct Manager Approve" class="oe_highlight" states="submit"
+                                type="object" groups="hr_base.group_division_manager"/>
                        <button name="refuse" string="Refuse" class="oe_highlight" states="submit" type="object"
                                groups="hr_base.group_division_manager"/>

-                        <button name="approved" string="HR Manager" class="oe_highlight" states="confirm" type="object"
-                                groups="hr_base.group_executive_manager,hr.group_hr_user"/>
-                        <button name="refuse" string="Refuse" class="oe_highlight" states="confirm,approved"
-                                type="object"
-                                groups="hr_base.group_executive_manager,hr.group_hr_user"/>
+                        <button name="approved" string="HR Approval" class="oe_highlight" states="confirm" type="object"
+                                groups="hr.group_hr_user"/>
+                        <button name="refuse" string="Refuse" class="oe_highlight" states="confirm"
+                                type="object" groups="hr.group_hr_user"/>

-                        <button name="draft" string="Re-draft" class="oe_highlight" states="refuse" type="object"
-                                groups="hr.group_hr_user,hr_base.group_division_manager"
-                                confirm="Are you sure to Reset To Draft This Record?"/>
+                        <button name="draft" string="RE-Draft" class="oe_highlight" states="approved,refuse" type="object"
+                                groups="hr.group_hr_user" confirm="Are you sure to Reset To Draft This Record?"/>