diff --git a/odex25_hr/exp_official_mission/i18n/ar_001.po b/odex25_hr/exp_official_mission/i18n/ar_001.po index 6aaec38f4..3b2486f16 100644 --- a/odex25_hr/exp_official_mission/i18n/ar_001.po +++ b/odex25_hr/exp_official_mission/i18n/ar_001.po @@ -2587,5 +2587,20 @@ msgstr "إضافة موظفين للدورة التدريبية" msgid "You must Approve all Employees Line First." msgstr "يجب عمل تصديق لجميع الموظفين اولا" +#. module: exp_official_mission +#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__trainer_id +msgid "Trainer" +msgstr "المدرب" + +#. module: exp_official_mission +#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__training_details +#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission_employee__training_details +#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view +msgid "Training Details" +msgstr "تفاصيل الدورة التدريبية" + + + + diff --git a/odex25_hr/exp_official_mission/models/hr_official_mission.py b/odex25_hr/exp_official_mission/models/hr_official_mission.py index 761d74884..4a02065a1 100644 --- a/odex25_hr/exp_official_mission/models/hr_official_mission.py +++ b/odex25_hr/exp_official_mission/models/hr_official_mission.py @@ -92,6 +92,9 @@ class HrOfficialMission(models.Model): department_id2 = fields.Many2one(related='employee_id.department_id', readonly=True,store=True,string='Department') is_branch = fields.Many2one(related='department_id2.branch_name', store=True, readonly=True) attachment_count = fields.Integer(string="Attachments", compute="_compute_attachment_count") + training_details = fields.Html('Training Details') + trainer_id = fields.Many2one('res.partner', string="Trainer") + '''@api.constrains('employee_ids') @@ -701,7 +704,7 @@ class EmployeeCourseName(models.Model): name = fields.Char(translate=True) code = fields.Char() - job_ids = fields.One2many('hr.job', 'course_ids', string='Jobs', readonly=True) + job_ids = fields.One2many('hr.job', 'course_ids', string='Jobs', readonly=False) company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.user.company_id) def unlink(self): @@ -894,6 +897,8 @@ class HrOfficialMissionEmployee(models.Model): ('done', _('Done')), ('refused', _('Refused')), ], default="draft", tracking=True) + training_details = fields.Html('Training Details', related="official_mission_id.training_details") + def approve(self): diff --git a/odex25_hr/exp_official_mission/views/training.xml b/odex25_hr/exp_official_mission/views/training.xml index 34c9f579b..ecddd7941 100644 --- a/odex25_hr/exp_official_mission/views/training.xml +++ b/odex25_hr/exp_official_mission/views/training.xml @@ -88,7 +88,6 @@ - @@ -105,6 +104,8 @@ domain="[('country_id','=',country_id),('destination_type','in',('training','all'))]" attrs="{'readonly':[('state','not in',('draft','direct_manager','depart_manager','send'))] }"/> + +