diff --git a/odex25_hr/attendances/i18n/ar_001.po b/odex25_hr/attendances/i18n/ar_001.po index e9d5f34a1..6c32470ff 100644 --- a/odex25_hr/attendances/i18n/ar_001.po +++ b/odex25_hr/attendances/i18n/ar_001.po @@ -878,9 +878,10 @@ msgid "Lateness" msgstr "التأخيرات" #. module: attendances +#: model:ir.actions.act_window,name:attendances.hr_lateness_reasons_action #: model:ir.ui.menu,name:attendances.employee_lateness_reasons_menu_item -msgid "Lateness Reasons" -msgstr "أسباب التأخير والخروج" +msgid "Lateness/Exit Reasons" +msgstr "تبرير التأخير والخروج" #. module: attendances #: model:ir.ui.menu,name:attendances.employee_lateness_absence_overtime_menu_item @@ -1792,11 +1793,6 @@ msgstr "التأخيرات" msgid "lateness Date" msgstr "تاريخ التأخير" -#. module: attendances -#: model:ir.actions.act_window,name:attendances.hr_lateness_reasons_action -msgid "lateness Reasons" -msgstr "أسباب التأخير والخروج" - #. module: attendances #: code:addons/attendances/models/hr_attendance.py:0 #, python-format diff --git a/odex25_hr/attendances/views/hr_lateness_reasons.xml b/odex25_hr/attendances/views/hr_lateness_reasons.xml index 0b02c72f9..7aab9a4bc 100644 --- a/odex25_hr/attendances/views/hr_lateness_reasons.xml +++ b/odex25_hr/attendances/views/hr_lateness_reasons.xml @@ -2,7 +2,7 @@ - lateness Reasons + Lateness/Exit Reasons hr.reasons.lateness tree,form @@ -27,7 +27,7 @@ - Lateness Reasons + Lateness/Exit Reasons hr.reasons.lateness
diff --git a/odex25_hr/employee_requests/i18n/ar_001.po b/odex25_hr/employee_requests/i18n/ar_001.po index 90cb6702a..18c8b5f70 100644 --- a/odex25_hr/employee_requests/i18n/ar_001.po +++ b/odex25_hr/employee_requests/i18n/ar_001.po @@ -920,6 +920,10 @@ msgstr "تاريخ تسليم العمل" #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_tree_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_effective_form_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.hr_clearance_form_filter #, python-format msgid "Department" msgstr "الهيكل الإداري" @@ -1131,10 +1135,24 @@ msgid "Emp No." msgstr "رقم الموظف" #. module: attendances +#: model:ir.model.fields,field_description:employee_requests.field_employee_overtime_request__employee_no +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_tree_view +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view +#: model:ir.model.fields,field_description:employee_requests.field_employee_other_request__employee_no +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_tree_view +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view #: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__employee_no #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_tree_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_filter #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view +#: model:ir.model.fields,field_description:employee_requests.field_employee_effective_form__employee_no +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_tree_view +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view +#: model:ir.model.fields,field_description:employee_requests.field_hr_clearance_form__employee_no +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_tree_view msgid "Employee Number" msgstr "رقم الموظف" @@ -1149,6 +1167,11 @@ msgstr "رقم الموظف" #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_tree_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_effective_form_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.hr_clearance_form_filter msgid "Employee" msgstr "الموظف" @@ -2454,13 +2477,11 @@ msgstr "مدير المشروع :" #. module: employee_requests #: model:ir.model.fields,field_description:employee_requests.field_employee_department_jobs__promotion_type -msgid "Promotion Type" -msgstr "نوع الاجراء" - -#. module: employee_requests #: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view -msgid "Promotion type" -msgstr "نوع الاجراء" +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_tree_view +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_filter +msgid "Promotion Type" +msgstr "نوع الإجراء" #. module: employee_requests #: code:addons/employee_requests/models/other_request.py:0 @@ -3832,3 +3853,10 @@ msgstr "بدون راتب" msgid "My Permissions" msgstr "إستئذاناتي" +#. module: employee_requests +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_filter +#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_filter +msgid "My Requests" +msgstr "طلبـاتي" + diff --git a/odex25_hr/employee_requests/models/employee_department_jobs.py b/odex25_hr/employee_requests/models/employee_department_jobs.py index 0b1ea3b85..a57430eb5 100644 --- a/odex25_hr/employee_requests/models/employee_department_jobs.py +++ b/odex25_hr/employee_requests/models/employee_department_jobs.py @@ -24,6 +24,7 @@ class EmployeeDepartmentJobs(models.Model): # relational fields employee_id = fields.Many2one(comodel_name="hr.employee", tracking=True, domain=[('state', '=', 'open')]) + employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True) # old_department_id = fields.Many2one(comodel_name='hr.department', related='employee_id.department_id') old_department_2_id = fields.Many2one(comodel_name='hr.department') # old_job_id = fields.Many2one(comodel_name='hr.job', related='employee_id.job_id') diff --git a/odex25_hr/employee_requests/models/employee_effective_form.py b/odex25_hr/employee_requests/models/employee_effective_form.py index 44161869e..7e23972fb 100644 --- a/odex25_hr/employee_requests/models/employee_effective_form.py +++ b/odex25_hr/employee_requests/models/employee_effective_form.py @@ -11,11 +11,12 @@ class EmployeeEffectiveForm(models.Model): contract_id = fields.Many2one(related='employee_id.contract_id', readonly=True, string='Contract') job_id = fields.Many2one(related='employee_id.job_id', readonly=True) - department_id = fields.Many2one(related='employee_id.department_id', readonly=True) + department_id = fields.Many2one(related='employee_id.department_id', readonly=True, store=True) employee_salary = fields.Float(related='employee_id.contract_id.salary', readonly=True, tracking=True) remarks = fields.Text() employee_id = fields.Many2one('hr.employee', 'Employee Id', default=lambda item: item.get_user_id(), domain=[('state', '=', 'open')]) + employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True) effective_form_type = fields.Selection([('first_tim_job', _('First Time Job')), ('return_from_leave', _('Return From Leave'))], default="first_tim_job") diff --git a/odex25_hr/employee_requests/models/employee_overtime_request.py b/odex25_hr/employee_requests/models/employee_overtime_request.py index 40696e705..948089391 100644 --- a/odex25_hr/employee_requests/models/employee_overtime_request.py +++ b/odex25_hr/employee_requests/models/employee_overtime_request.py @@ -43,6 +43,7 @@ class employee_overtime_request(models.Model): department_id = fields.Many2one('hr.department') employee_id = fields.Many2one('hr.employee', 'Responsible', default=lambda item: item.get_user_id(), domain=[('state', '=', 'open')]) + employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True) exception = fields.Boolean(string="Exception Hours", default=False, help='Exceeding The Limit Of Overtime Hours Per Month') diff --git a/odex25_hr/employee_requests/models/hr_clearance_form.py b/odex25_hr/employee_requests/models/hr_clearance_form.py index b21ed236f..9dc4ba1d6 100644 --- a/odex25_hr/employee_requests/models/hr_clearance_form.py +++ b/odex25_hr/employee_requests/models/hr_clearance_form.py @@ -13,9 +13,10 @@ class HrClearanceForm(models.Model): date = fields.Date(default=lambda self: fields.Date.today()) date_deliver_work = fields.Date() job_id = fields.Many2one(related='employee_id.job_id', readonly=True) - department_id = fields.Many2one(related='employee_id.department_id', readonly=True) + department_id = fields.Many2one(related='employee_id.department_id', readonly=True, store=True) employee_id = fields.Many2one('hr.employee', 'Employee Id', default=lambda item: item.get_user_id(), domain=[('state', '=', 'open')]) + employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True) clearance_type = fields.Selection(selection=[("vacation", _("Vacation Clearance")), ("final", _("Final Clearance"))], default='final') diff --git a/odex25_hr/employee_requests/models/other_request.py b/odex25_hr/employee_requests/models/other_request.py index a7aaa6898..febcf90b5 100644 --- a/odex25_hr/employee_requests/models/other_request.py +++ b/odex25_hr/employee_requests/models/other_request.py @@ -32,7 +32,8 @@ class EmployeeOtherRequest(models.Model): # relational fields employee_id = fields.Many2one('hr.employee', default=lambda item: item.get_user_id(), domain=[('state', '=', 'open')]) - department_id = fields.Many2one(comodel_name='hr.department', related='employee_id.department_id', readonly=True) + employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True) + department_id = fields.Many2one(comodel_name='hr.department', related='employee_id.department_id', readonly=True,store=True) job_id = fields.Many2one(comodel_name='hr.job', related='employee_id.job_id', readonly=True) contract_statuss = fields.Selection(related='employee_id.contract_id.contract_status', readonly=True) diff --git a/odex25_hr/employee_requests/views/employee_department_jobs_view.xml b/odex25_hr/employee_requests/views/employee_department_jobs_view.xml index 93b722a24..22c30f9b2 100644 --- a/odex25_hr/employee_requests/views/employee_department_jobs_view.xml +++ b/odex25_hr/employee_requests/views/employee_department_jobs_view.xml @@ -6,6 +6,7 @@ ir.actions.act_window employee.department.jobs tree,form,calendar + {"search_default_my_request":1}

Employee Departments and jobs @@ -63,11 +64,13 @@ + - + employee.department.jobs + + @@ -127,5 +132,25 @@ + + + employee.department.jobs + employee.department.jobs + search + + + + + + + + + + + + + + + diff --git a/odex25_hr/employee_requests/views/employee_effective_form.xml b/odex25_hr/employee_requests/views/employee_effective_form.xml index 88735ecb7..217ff9d17 100644 --- a/odex25_hr/employee_requests/views/employee_effective_form.xml +++ b/odex25_hr/employee_requests/views/employee_effective_form.xml @@ -57,6 +57,7 @@ + @@ -94,6 +95,7 @@ employee.effective.form + @@ -103,5 +105,24 @@ + + + Employee Request Effective + employee.effective.form + search + + + + + + + + + + + + + + diff --git a/odex25_hr/employee_requests/views/employee_overtime_request.xml b/odex25_hr/employee_requests/views/employee_overtime_request.xml index 2d64cfef4..b04f0cfb2 100644 --- a/odex25_hr/employee_requests/views/employee_overtime_request.xml +++ b/odex25_hr/employee_requests/views/employee_overtime_request.xml @@ -6,6 +6,7 @@ Employee OverTime Request employee.overtime.request tree,form,calendar + {"search_default_my_request":1} @@ -66,6 +67,7 @@ + @@ -127,6 +129,7 @@ employee.overtime.request + @@ -137,5 +140,26 @@ + + + Employee Overtime Request + employee.overtime.request + search + + + + + + + + + + + + + + + + diff --git a/odex25_hr/employee_requests/views/hr_clearance_form.xml b/odex25_hr/employee_requests/views/hr_clearance_form.xml index e70f761f1..848c304b4 100644 --- a/odex25_hr/employee_requests/views/hr_clearance_form.xml +++ b/odex25_hr/employee_requests/views/hr_clearance_form.xml @@ -65,6 +65,7 @@ attrs="{'readonly':[('state','!=','draft')]}"/> + hr.clearance.form + @@ -164,5 +166,22 @@ + + + Employee Clearance Form + hr.clearance.form + search + + + + + + + + + + + + diff --git a/odex25_hr/employee_requests/views/other_request.xml b/odex25_hr/employee_requests/views/other_request.xml index 8877ce794..662f1c85c 100644 --- a/odex25_hr/employee_requests/views/other_request.xml +++ b/odex25_hr/employee_requests/views/other_request.xml @@ -6,6 +6,7 @@ ir.actions.act_window employee.other.request tree,form,calendar + {"search_default_my_request":1}

Employee Other Request @@ -76,6 +77,7 @@ attrs="{'readonly':[('state','!=','draft')]}"/> + @@ -219,6 +221,7 @@ employee.other.request + @@ -229,5 +232,26 @@ + + + Employee Other Request + employee.other.request + search + + + + + + + + + + + + + + + +