Merge pull request #2785 from expsa/Esraa-Ensan-hr-tasks

Esraa ensan hr tasks

odex25_hr/exp_official_mission/i18n/ar_001.po

@@ -2639,6 +2639,11 @@ msgstr "تقييم الموظفين"
 msgid "Waiting Direct Manager"
 msgstr "في انتظار المدير المباشر"
 
+#. module: exp_official_mission
+#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__hr_nomination
+msgid "HR Nomination"
+msgstr "الترشيح بواسطة الموارد البشرية"
+
 
 
 

odex25_hr/exp_official_mission/security/ir.model.access.csv

@@ -1,8 +1,8 @@
 id,name,model_id:id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 access_hr_official_mission_type,access_hr_official_mission_type,model_hr_official_mission_type,base.group_user,1,0,0,0
 access_hr_official_mission_type_hr,access_hr_official_mission_type_hr,model_hr_official_mission_type,hr.group_hr_user,1,1,1,1
-access_hr_official_mission,access_hr_official_mission,model_hr_official_mission,base.group_user,1,1,1,1
-access_hr_official_mission_employee,access_hr_official_mission_employee,model_hr_official_mission_employee,base.group_user,1,1,1,1
+access_hr_official_mission,access_hr_official_mission,model_hr_official_mission,,1,1,1,1
+access_hr_official_mission_employee,access_hr_official_mission_employee,model_hr_official_mission_employee,,1,1,1,1
 access_mission_destination,access_mission_destination,model_mission_destination,base.group_user,1,0,0,0
 access_mission_destination_hr,access_mission_destination_hr,model_mission_destination,hr.group_hr_user,1,1,1,1
 access_mission_destination_line,access_mission_destination_line_emp,model_mission_destination_line,base.group_user,1,0,0,0

odex25_hr/exp_official_mission/security/official_mission_security.xml

@@ -6,11 +6,14 @@
         <record id="hr_official_mission_emp_rule" model="ir.rule">
             <field name="name">Employee: views its missions records</field>
             <field name="model_id" ref="model_hr_official_mission"/>
-            <field name="domain_force">['|',('employee_id.user_id','=', user.id),('process_type','=', 'training')]
+            <field name="domain_force">['|', ('employee_id.user_id', '=', user.id),
+                ('employee_ids.employee_id.department_id.manager_id.user_id', '=', user.id)]
             </field>
             <field name="groups" eval="[(4, ref('base.group_user'))]"/>
         </record>
 
+
+
         <record id="hr_official_mission_division_mgr_rule" model="ir.rule">
             <field name="name">Division manager: views missions of its subordinates</field>
             <field name="model_id" ref="model_hr_official_mission"/>
@@ -26,10 +29,9 @@
             <field name="model_id" ref="model_hr_official_mission"/>
             <field name="domain_force">[(1 ,'=', 1)]</field>
             <field name="groups" eval="[(4, ref('hr_base.group_executive_manager')),
-                                        (4, ref('hr_base.group_general_manager')),
-                                        (4, ref('hr_base.group_account_manager')),
-                                        (4, ref('hr.group_hr_manager')),
-                                        (4, ref('hr.group_hr_user'))]"/>
+                                    (4, ref('hr_base.group_general_manager')),
+                                    (4, ref('exp_hr_appraisal.group_appraisal_manager')),
+                                    (4, ref('hr.group_hr_user'))]"/>
         </record>
 
         <record id="official_mission_comp_rule" model="ir.rule">

odex25_hr/exp_official_mission/views/training.xml

@@ -69,7 +69,7 @@
                         </div>
                         <group>
                             <group>
-                                <field name="hr_nomination"/>
+                                <field name="hr_nomination" invisible="1"/>
                                 <field name="process_type" invisible="1"/>
                                 <field name="mission_type" string="Mission Type" required="1"
                                        domain="[('work_state', '=', 'training'),('special_hours', '!=', True)]"

odex25_hr/exp_official_mission/views/training_menus.xml

@@ -7,14 +7,12 @@
 
         <menuitem name="Training Courses" id="exp_official_mission.employee_training_menu_item"
                   parent="hr_employee_training_main_menu" action="exp_official_mission.employee_training_action"
-                  sequence="1"
-                  groups="group_hr_training_user"/>
+                  sequence="1"/>
 
         <menuitem name="Employees Training Courses" id="hr_employee_official_mission_menu"
                   parent="hr_employee_training_main_menu"
                   action="exp_official_mission.hr_employees_training_lines_action"
-                  sequence="2"
-                  groups="hr_base.group_division_manager,hr.group_hr_user"/>
+                  sequence="2"/>
 
         <menuitem name="Configurations" id="hr_official_mission_config_menu"
                   parent="hr_employee_training_main_menu" sequence="3"