diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index af03839aa..c4e9980bf 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -32,7 +32,7 @@ class YuthonRenewalApproval(models.Model): signing_status = fields.Text(string="劳动合同签订情况") condition_review = fields.Text(string="续期条件审核") job_id = fields.Many2one('hr.job', string="续签劳动合同岗位") - payroll_structure_id = fields.Many2one('hr.payroll.structure', string="续签劳动合同级档") + payroll_structure_id = fields.Many2one('hr.payroll.structure', string="续签劳动合同职级") def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml index 2cb8c2351..08043cfd9 100644 --- a/yuthon_salary/views/inherit_hr_payslip_views.xml +++ b/yuthon_salary/views/inherit_hr_payslip_views.xml @@ -440,4 +440,22 @@ + + cs_hr_payslip_line.tree + hr.payslip.line + + + + + + + + + + + Payslip Lines + hr.payslip.line + tree + + diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index e1e93c724..107b4d5fc 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -11,6 +11,11 @@ parent="human_resources_menu_root_board" action="hr.open_view_employee_list_my" sequence="1"/> +