diff --git a/odex25_hr/exp_payroll_custom/i18n/ar_001.po b/odex25_hr/exp_payroll_custom/i18n/ar_001.po index 433c58760..45424b107 100644 --- a/odex25_hr/exp_payroll_custom/i18n/ar_001.po +++ b/odex25_hr/exp_payroll_custom/i18n/ar_001.po @@ -3016,3 +3016,16 @@ msgstr "مراجعة المالية" msgid "Expense Manager" msgstr "رئيس المصروفات" + +#. module: exp_payroll_custom +#: model:ir.model.fields,field_description:exp_payroll_custom.field_hr_employee__reward_count +#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.hr_employee_salary_scale_inherited_form_view +#: model:ir.actions.act_window,name:exp_payroll_custom.action_open_rewards +msgid "Rewards" +msgstr "المكافآت" + +#. module: exp_payroll_custom +#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.employee_reward_line_tree_view +msgid "Employee Rewards" +msgstr "مكافآت الموظف" + diff --git a/odex25_hr/exp_payroll_custom/models/hr_employee.py b/odex25_hr/exp_payroll_custom/models/hr_employee.py index e206ac3c8..ccb19a188 100644 --- a/odex25_hr/exp_payroll_custom/models/hr_employee.py +++ b/odex25_hr/exp_payroll_custom/models/hr_employee.py @@ -10,3 +10,23 @@ class HrEmployeeSalaryScale(models.Model): salary_level = fields.Many2one(related='contract_id.salary_level', string='Salary Level', store=True) salary_group = fields.Many2one(related='contract_id.salary_group', string='Salary Group', store=True) salary_degree = fields.Many2one(related='contract_id.salary_degree', string='Salary Degree', store=True) + + reward_count = fields.Integer(string="Rewards", compute="_compute_reward_count" ) + + + def _compute_reward_count(self): + Reward = self.env['lines.ids.reward'] + for emp in self: + emp.reward_count = Reward.search_count([('employee_id', '=', emp.id) ]) + + def action_open_rewards(self): + self.ensure_one() + return { + 'type': 'ir.actions.act_window', + 'name': 'Rewards', + 'res_model': 'lines.ids.reward', + 'view_mode': 'tree,form', + 'domain': [('employee_id', '=', self.id)], + 'context': {'default_employee_id': self.id } + } + diff --git a/odex25_hr/exp_payroll_custom/security/ir.model.access.csv b/odex25_hr/exp_payroll_custom/security/ir.model.access.csv index 19ec3f74e..0bd53b8c2 100644 --- a/odex25_hr/exp_payroll_custom/security/ir.model.access.csv +++ b/odex25_hr/exp_payroll_custom/security/ir.model.access.csv @@ -53,4 +53,5 @@ access_hr_payslip_line_finance_review,access_hr_payslip_finance_review,model_hr_ access_hr_payslip_line_expense_manger,access_hr_payslip_expense_manger,model_hr_payslip_line,exp_payroll_custom.group_payroll_expense_manger,1,1,0,0 access_hr_payslip_line_account_manager,access_hr_payslip_account_manager,model_hr_payslip_line,hr_base.group_account_manager,1,1,0,0 access_hr_payslip_line_hr_manager,access_hr_payslip_hr_manager,model_hr_payslip_line,hr.group_hr_manager,1,1,0,0 -access_hr_payslip_line_general_manager,access_hr_payslip_general_manager,model_hr_payslip_line,hr_base.group_general_manager,1,1,0,0 \ No newline at end of file +access_hr_payslip_line_general_manager,access_hr_payslip_general_manager,model_hr_payslip_line,hr_base.group_general_manager,1,1,0,0 +access_lines_ids_reward_emp,hr_lines_ids_reward_emp,model_lines_ids_reward,base.group_user,1,0,0,0 diff --git a/odex25_hr/exp_payroll_custom/views/employee_reward_view.xml b/odex25_hr/exp_payroll_custom/views/employee_reward_view.xml index 01b16d1ab..e4439af09 100644 --- a/odex25_hr/exp_payroll_custom/views/employee_reward_view.xml +++ b/odex25_hr/exp_payroll_custom/views/employee_reward_view.xml @@ -125,6 +125,19 @@ + + Employee Rewards + lines.ids.reward + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/odex25_hr/exp_payroll_promotion/i18n/ar_001.po b/odex25_hr/exp_payroll_promotion/i18n/ar_001.po index 076ac3bb8..e66cdedf0 100644 --- a/odex25_hr/exp_payroll_promotion/i18n/ar_001.po +++ b/odex25_hr/exp_payroll_promotion/i18n/ar_001.po @@ -1256,3 +1256,10 @@ msgstr "الأساسي الجديد" #, python-format msgid "Sorry, The Amount Of Basic Salary It Must be Greater than Zero" msgstr "للأسف, مبلغ الراتب الأساسي يجب ان يكون اكبر من الصفر" + +#. module: exp_payroll_promotion +#: model:ir.model.fields,field_description:exp_payroll_promotion.field_hr_employee__payroll_raise_count +#: model_terms:ir.ui.view,arch_db:exp_payroll_promotion.hr_employee_salary_scale_dates_form_view +#: model:ir.actions.act_window,name:exp_payroll_promotion.action_payroll_raises +msgid "Payroll Raises" +msgstr "علاوة الراتب" diff --git a/odex25_hr/exp_payroll_promotion/models/hr_employee.py b/odex25_hr/exp_payroll_promotion/models/hr_employee.py index 813d4a7ca..e05586865 100644 --- a/odex25_hr/exp_payroll_promotion/models/hr_employee.py +++ b/odex25_hr/exp_payroll_promotion/models/hr_employee.py @@ -11,6 +11,26 @@ class HrEmployee(models.Model): degree_date = fields.Date('Degree Joining Date') group_date = fields.Date('Group Joining Date') + payroll_raise_count = fields.Integer(string="Payroll Raises", compute="_compute_payroll_raise_count" ) + + def _compute_payroll_raise_count(self): + Raise = self.env['hr.payroll.raise'] + for emp in self: + emp.payroll_raise_count = Raise.search_count([ + ('employee_id', '=', emp.id) + ]) + + def action_payroll_raises(self): + self.ensure_one() + return { + 'type': 'ir.actions.act_window', + 'name': 'Payroll Raises', + 'res_model': 'hr.payroll.raise', + 'view_mode': 'tree,form', + 'domain': [('employee_id', '=', self.id)], + 'context': {'default_employee_id': self.id } + } + def calculate_experience(self, emp_job=False, experience='general', promotion_date=None): experience_days = super(HrEmployee, self).calculate_experience(emp_job, experience) or 0 if experience_days and experience_days > 0: diff --git a/odex25_hr/exp_payroll_promotion/security/ir.model.access.csv b/odex25_hr/exp_payroll_promotion/security/ir.model.access.csv index 0e3d46da3..79c7d6f3f 100644 --- a/odex25_hr/exp_payroll_promotion/security/ir.model.access.csv +++ b/odex25_hr/exp_payroll_promotion/security/ir.model.access.csv @@ -5,3 +5,4 @@ access_hr_payroll_promotion_setting_hr_user,hr.payroll.promotion.setting.hr.user access_hr_promotion_current_group_hr_user,hr.promotion.current.group.hr.user,exp_payroll_promotion.model_hr_promotion_current_group,hr.group_hr_user,1,1,1,1 access_hr_promotion_previous_group_hr_user,hr.promotion.previous.group.hr.user,exp_payroll_promotion.model_hr_promotion_previous_group,hr.group_hr_user,1,1,1,1 access_hr_promotion_deterrent_penalty_hr_user,hr.promotion.deterrent.penalty.hr.user,exp_payroll_promotion.model_hr_promotion_deterrent_penalty,hr.group_hr_user,1,1,1,1 +access_hr_payroll_raise_emp,hr_payroll_raise_emp,exp_payroll_promotion.model_hr_payroll_raise,base.group_user,1,0,0,0 diff --git a/odex25_hr/exp_payroll_promotion/views/hr_employee_view.xml b/odex25_hr/exp_payroll_promotion/views/hr_employee_view.xml index 57f320442..0c6decf30 100644 --- a/odex25_hr/exp_payroll_promotion/views/hr_employee_view.xml +++ b/odex25_hr/exp_payroll_promotion/views/hr_employee_view.xml @@ -12,6 +12,15 @@ + + + + + +