diff --git a/odex25_hr/exp_official_mission/__init__.py b/odex25_hr/exp_official_mission/__init__.py index cde864bae..35e7c9600 100644 --- a/odex25_hr/exp_official_mission/__init__.py +++ b/odex25_hr/exp_official_mission/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import models +from . import wizard diff --git a/odex25_hr/exp_official_mission/__manifest__.py b/odex25_hr/exp_official_mission/__manifest__.py index 434d6b7af..d2ce1da36 100644 --- a/odex25_hr/exp_official_mission/__manifest__.py +++ b/odex25_hr/exp_official_mission/__manifest__.py @@ -26,6 +26,7 @@ 'views/course_view.xml', 'views/appraisal_view.xml', 'views/training_menus.xml', + 'wizard/employee_selection_wizard.xml', ], 'installable': True, diff --git a/odex25_hr/exp_official_mission/i18n/ar_001.po b/odex25_hr/exp_official_mission/i18n/ar_001.po index b86f72647..a3e294d12 100644 --- a/odex25_hr/exp_official_mission/i18n/ar_001.po +++ b/odex25_hr/exp_official_mission/i18n/ar_001.po @@ -2551,7 +2551,7 @@ msgstr "تم التصديق" #: model:ir.model.fields.selection,name:exp_official_mission.selection__hr_official_mission_employee__status__draft #, python-format msgid "Draft" -msgstr "مسوده" +msgstr "مسودة" #. module: exp_official_mission #: code:addons/exp_official_mission/models/hr_official_mission.py:0 @@ -2579,5 +2579,31 @@ msgstr "مرفوض" msgid "Set to Draft" msgstr "ارجاع الى مسودة" +#. module: exp_official_mission +#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view +msgid "Add Employees" +msgstr "إضافة موظفين" + +#. module: exp_official_mission +#: model:ir.model.fields,field_description:exp_official_mission.field_employee_mission_selection_wizard__employee_ids +msgid "Employees" +msgstr "الموظفين" + +#. module: exp_official_mission +#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_selection_wizard_form +msgid "Add" +msgstr "إضافه" + +#. module: exp_official_mission +#: model_terms:ir.ui.view,arch_db:exp_official_mission.view_employee_mission_selection_wizard_form +msgid "Cancel" +msgstr "إلغاء" + +#. module: exp_official_mission +#: code:addons/exp_official_mission/models/hr_official_mission.py:0 +#, python-format +msgid "Add Employees to Mission" +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 43c1ef484..5bfc88c95 100644 --- a/odex25_hr/exp_official_mission/models/hr_official_mission.py +++ b/odex25_hr/exp_official_mission/models/hr_official_mission.py @@ -136,6 +136,31 @@ class HrOfficialMission(models.Model): } return res + def action_add_employees(self): + self.ensure_one() + ctx = dict(self.env.context) + if not self.id: + ctx.update({ + 'default_mission_vals': { + 'name': self.name, + } + }) + else: + ctx['default_official_mission_id'] = self.id + + # if self.percentage: + # ctx['default_percentage'] = self.percentage + + ctx['default_employee_id'] = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) + + return { + 'name': _('Add Employees to Mission'), + 'view_mode': 'form', + 'res_model': 'employee.mission.selection.wizard', + 'type': 'ir.actions.act_window', + 'target': 'new', + 'context': ctx, + } def get_user_id(self): employee_id = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) @@ -987,8 +1012,10 @@ class HrOfficialMissionEmployee(models.Model): date_from += delta def get_permission_domain(self, date_from, date_to): + hour_from = (datetime.min + timedelta(hours=self.hour_from) - timedelta(hours=3)).time() hour_to = (datetime.min + timedelta(hours=self.hour_to) - timedelta(hours=3)).time() + date_from = str( datetime.combine(datetime.strptime(str(date_from), DEFAULT_SERVER_DATETIME_FORMAT).date(), hour_from)) date_to = str(datetime.combine(datetime.strptime(str(date_to), DEFAULT_SERVER_DATETIME_FORMAT).date(), hour_to)) diff --git a/odex25_hr/exp_official_mission/security/ir.model.access.csv b/odex25_hr/exp_official_mission/security/ir.model.access.csv index e81070dd9..901a52b9b 100644 --- a/odex25_hr/exp_official_mission/security/ir.model.access.csv +++ b/odex25_hr/exp_official_mission/security/ir.model.access.csv @@ -9,4 +9,5 @@ access_mission_destination_line,access_mission_destination_line_emp,model_missio access_mission_destination_line_hr,access_mission_destination_line_hr,model_mission_destination_line,hr.group_hr_user,1,1,1,1 access_employee_course_name_emp,access_employee_course_name_emp,model_employee_course_name,base.group_user,1,0,0,0 access_employee_course_name_hr,access_employee_course_name_hr,model_employee_course_name,hr.group_hr_user,1,1,1,1 -access_ticket_class_user,access_ticket_class_user,model_ticket_class,hr.group_hr_user,1,1,1,0 \ No newline at end of file +access_ticket_class_user,access_ticket_class_user,model_ticket_class,hr.group_hr_user,1,1,1,0 +access_employee_mission_selection_wizard,employee.mission.selection.wizard,model_employee_mission_selection_wizard,base.group_user,1,1,1,1 diff --git a/odex25_hr/exp_official_mission/views/training.xml b/odex25_hr/exp_official_mission/views/training.xml index 518641ebd..1d44cc147 100644 --- a/odex25_hr/exp_official_mission/views/training.xml +++ b/odex25_hr/exp_official_mission/views/training.xml @@ -134,6 +134,8 @@ +