fix

2024-12-24 13:55:10 +03:00 · 2024-12-24 13:55:10 +03:00 · ffb7379680
parent 5d8109b61e
commit ffb7379680
5 changed files with 100 additions and 38 deletions
--- a/odex25_hr/hr_disciplinary_tracking/i18n/ar_001.po
+++ b/odex25_hr/hr_disciplinary_tracking/i18n/ar_001.po
@ -430,8 +430,6 @@ msgstr "من تاريخ"
 #: code:addons/hr_disciplinary_tracking/models/penalty_register.py:0
 #: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_deduction__next_state__gm
 #: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_deduction__state__gm
-#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__gm
-#: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
 #, python-format
 msgid "GM"
 msgstr "المدير التنفيذي"
@ -440,18 +438,80 @@ msgstr "المدير التنفيذي"
 #: code:addons/hr_disciplinary_tracking/models/penalty_register.py:0
 #: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_deduction__next_state__manager
 #: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_deduction__state__manager
-#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__manager
 #, python-format
 msgid "HR Manager"
 msgstr "تصديق الموارد البشرية"

+
+#. module: hr_disciplinary_tracking
+#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
 #. module: hr_disciplinary_tracking
 #: code:addons/hr_disciplinary_tracking/models/penalty_register.py:0
 #: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__officer
+#, python-format
+msgid "Wait HR Manager"
+msgstr "إنتظار مدير الموارد البشرية"
+
+#. module: hr_disciplinary_tracking
+#: code:addons/hr_disciplinary_tracking/models/penalty_register.py:0
+#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__manager
+#, python-format
+msgid "Wait Services Manager"
+msgstr "إنتظار الخدمات المشتركة"
+
+#. module: hr_disciplinary_tracking
+#: code:addons/hr_disciplinary_tracking/models/penalty_register.py:0
+#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__gm
+#, python-format
+msgid "Wait CEO Manager"
+msgstr "إنتظار الرئيس التنفيذي"
+
+#. module: hr_disciplinary_tracking
+#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__done
+msgid "Approved"
+msgstr "تم التصديق"
+
+#. module: hr_disciplinary_tracking
+#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__refuse
+msgid "Refused"
+msgstr "مرفوض"
+
+#. module: hr_disciplinary_tracking
+#: code:addons/hr_disciplinary_tracking/models/penalty_register.py:0
 #: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
 #, python-format
-msgid "HR Officer"
-msgstr "المدير المباشر"
+msgid "Direct Manager"
+msgstr "موافقة المدير المباشر"
+
+#. module: hr_disciplinary_tracking
+#: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
+msgid "HR Manager Approve"
+msgstr "موافقة الموارد البشرية"
+
+#. module: hr_disciplinary_tracking
+#: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
+#, python-format
+msgid "Services Manager Approve"
+msgstr "موافقة الخدمات المشتركة"
+
+#. module: hr_disciplinary_tracking
+#: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
+#, python-format
+msgid "CEO Approve"
+msgstr "موافقة الرئيس التنفيذي"
+
+#. module: hr_disciplinary_tracking
+#: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
+msgid "Refuse"
+msgstr "رفــض"
+
+#. module: hr_disciplinary_tracking
+#: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
+msgid "RE-Draft"
+msgstr "إرجاع للمسودة"

 #. module: hr_disciplinary_tracking
 #: model:ir.actions.report,name:hr_disciplinary_tracking.action_hr_penalty_report
@ -1232,10 +1292,7 @@ msgstr "ليس لديه مستحقات"
 msgid "الفترة"
 msgstr ""

-#. module: hr_disciplinary_tracking
-#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__done
-msgid "المنتهية"
-msgstr ""
+

 #. module: hr_disciplinary_tracking
 #: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_punishment__punishment_type_amount__percentage
@ -1247,16 +1304,6 @@ msgstr ""
 msgid "تحذير"
 msgstr ""

-#. module: hr_disciplinary_tracking
-#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__refuse
-msgid "مرفوض"
-msgstr ""
-
-#. module: hr_disciplinary_tracking
-#: model:ir.model.fields.selection,name:hr_disciplinary_tracking.selection__hr_penalty_register__state__draft
-msgid "مسودة"
-msgstr ""
-
 #. module: hr_disciplinary_tracking
 #: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.penalty_egister_form_view
 msgid "End Violation"
@ -1284,3 +1331,11 @@ msgstr "طلبـاتي"
 #: model_terms:ir.ui.view,arch_db:hr_disciplinary_tracking.hr_penalty_register_filter
 msgid "Employee Number"
 msgstr "رقم الموظف"
+
+#. module: hr_disciplinary_tracking
+#: model:ir.model.fields,field_description:hr_disciplinary_tracking.field_hr_penalty_register__company_id
+#: model:ir.model.fields,field_description:hr_disciplinary_tracking.field_hr_punishment__company_id
+#: model:ir.model.fields,field_description:hr_disciplinary_tracking.field_hr_penalty_ss__company_id
+msgid "Company"
+msgstr "الشركة"
+
--- a/odex25_hr/hr_disciplinary_tracking/models/penalty_register.py
+++ b/odex25_hr/hr_disciplinary_tracking/models/penalty_register.py
@ -22,10 +22,10 @@ class penalty_register(models.Model):
    note = fields.Text()
    state = fields.Selection(selection=[
        ('draft', _('Draft')),
-        ('officer', _('HR Officer')),
-        ('manager', _('HR Manager')),
-        ('gm', _('GM')),
-        ('done', _('Done')),
+        ('officer', _('Wait HR Manager')),
+        ('manager', _('Wait Services Manager')),
+        ('gm', _('Wait CEO Manager')),
+        ('done', _('Approved')),
        ('refuse', _('Refused')),
    ], default='draft', tracking=True)
    penalty_number = fields.Selection(selection=[('first_time', _('First Time')),
--- a/odex25_hr/hr_disciplinary_tracking/security/security.xml
+++ b/odex25_hr/hr_disciplinary_tracking/security/security.xml
@ -24,7 +24,7 @@
            <field name="name">Allow HR : views Penalty all employees</field>
            <field name="model_id" ref="model_hr_penalty_register"/>
            <field name="domain_force">[(1 ,'=', 1)]</field>
-            <field name="groups" eval="[(4, ref('hr_base.group_executive_manager')),
+            <field name="groups" eval="[(4, ref('hr_base.group_services_manager')),
                                        (4, ref('hr_base.group_general_manager')),
                                        (4, ref('hr.group_hr_manager')),
                                        (4, ref('hr.group_hr_user'))]"/>
--- a/odex25_hr/hr_disciplinary_tracking/views/penalty_register.xml
+++ b/odex25_hr/hr_disciplinary_tracking/views/penalty_register.xml
@ -14,20 +14,27 @@
            <field name="arch" type="xml">
                <form string="Penalty Register">
                    <header>
-                        <button string="HR Officer" name="officer" class="oe_highlight" type="object" states="draft"
+                        <button string="Direct Manager" name="officer" class="oe_highlight" type="object" states="draft"
                                groups="hr_base.group_division_manager"/>
-                        <button string="HR manager" name="manager" class="oe_highlight" type="object" states="officer"
+
+                        <button string="HR Manager Approve" name="manager" class="oe_highlight" type="object"
+                                states="officer" groups="hr.group_hr_manager"/>
+                        <button string="Refuse" name="refuse_state" class="oe_highlight" type="object" states="officer"
                                groups="hr.group_hr_manager"/>
-                        <button string="GM" name="gm" class="oe_highlight" type="object" states="manager"
+
+                        <button string="Services Manager Approve" name="gm" class="oe_highlight" type="object"
+                                states="manager" groups="hr_base.group_services_manager"/>
+                        <button string="Refuse" name="refuse_state" class="oe_highlight" type="object" states="manager"
+                                groups="hr_base.group_services_manager"/>
+
+                        <button string="CEO Approve" name="done" class="oe_highlight" type="object" states="gm"
                                groups="hr_base.group_general_manager,hr_base.group_executive_manager"/>
-                        <button string="Done" name="done" class="oe_highlight" type="object" states="gm"
-                                groups="hr_base.group_general_manager,hr_base.group_executive_manager"/>
-                        <button string="Re-draft" name="draft" class="oe_highlight" type="object" states="done,refuse"
-                                groups="hr.group_hr_manager,hr_base.group_executive_manager,hr_base.group_general_manager"
+                        <button string="Refuse" name="refuse_state" class="oe_highlight" type="object" states="gm"
+                                groups="hr_base.group_general_manager"/>
+
+                        <button string="RE-Draft" name="draft" class="oe_highlight" type="object" states="done,refuse"
+                                groups="hr.group_hr_manager"
                                confirm="Are you sure to Reset To Draft This Record?"/>
-                        <button string="Refuse" name="refuse_state" class="oe_highlight" type="object"
-                                attrs="{'invisible':[('state','in',['refuse','done','draft'])]}"
-                                groups="hr.group_hr_manager,hr_base.group_executive_manager,hr_base.group_general_manager"/>

                        <field name="state" widget="statusbar"/>
                    </header>
--- a/odex25_hr/hr_holidays_public/i18n/ar_001.po
+++ b/odex25_hr/hr_holidays_public/i18n/ar_001.po
@ -1573,13 +1573,13 @@ msgstr "إلغاء الاجازة"
 #: model:ir.ui.menu,name:hr_holidays_public.leave_cancellation
 #: model_terms:ir.ui.view,arch_db:hr_holidays_public.leave_cancellation_tree_view
 msgid "Leave Cancellation"
-msgstr "إلغاء/قطع الاجازات"
+msgstr "قطع الإجــازات"

 #. module: hr_holidays_public
 #: model:ir.model.fields,field_description:hr_holidays_public.field_leave_cancellation__leave_cancellation_date
 #: model_terms:ir.ui.view,arch_db:hr_holidays_public.leave_cancellation_form_view
 msgid "Leave Cancellation Date"
-msgstr "نهاية تاريخ إلغاء/قطع الاجازة"
+msgstr "نهاية تاريخ قطع الاجازة"

 #. module: hr_holidays_public
 #: model:ir.actions.report,name:hr_holidays_public.public_leave_cost_action_report
@ -2631,7 +2631,7 @@ msgid ""
 "If you plan for an early return kindly apply for leave cancellation."
 msgstr ""
 "عفواً هذه الإجازة تنتهي في %s.\n"
-"اذا كنت تخطط للرجوع المبكر من الإجازة قم بتقديم طلب إلغاء او قطع إجازة"
+"اذا كنت تخطط للرجوع المبكر من الإجازة قم بتقديم طلب قطع إجازة"

 #. module: hr_holidays_public
 #: code:addons/hr_holidays_public/models/hr_holidays_status.py:0
@ -3282,7 +3282,7 @@ msgstr ""
 msgid ""
 "You can't set this request to draft as it's already have a cancel request\n"
 "Please contact with your administrator"
-msgstr "لا يمكنك إرجاع للمسودة لوجود طلب الغاء/قطع لهذه الإجازة"
+msgstr "لا يمكنك إرجاع للمسودة لوجود طلب قطع لهذه الإجازة"

 #. module: hr_holidays_public
 #: code:addons/hr_holidays_public/models/hr_holidays.py:0