Merge pull request !7897 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-12 04:14:12 +00:00
committed by Gitee
2 changed files with 3 additions and 2 deletions
@@ -34,7 +34,7 @@ class YuthonLeavingApproval(models.Model):
work_end = fields.Boolean(string="结束")
is_execution = fields.Boolean(string="定时任务是否已执行", default=False)
resignation = fields.Text(string="离职体检情况", default=False)
salary_line_ids = fields.One2many('leaving.salary.line', 'leaving_id', string="工资条")
salary_line_ids = fields.One2many('leaving.salary.line', 'leaving_id', string="薪资计算")
def _get_default_name_title(self):
return self._description if self._description else self._name
@@ -57,4 +57,5 @@ access_awards_line, awards_line,model_awards_line,base.group_user,1,1,1,1
access_yuthon_employee_add,yuthon_employee_add,model_yuthon_employee_add,base.group_user,1,1,1,1
access_yuthon_pre_examination,yuthon_pre_examination,model_yuthon_pre_examination,base.group_user,1,1,1,1
access_yuthon_service_type,yuthon_service_type,model_yuthon_service_type,base.group_user,1,1,1,1
access_yuthon_contract_type,yuthon_contract_type,model_yuthon_contract_type,base.group_user,1,1,1,1
access_yuthon_contract_type,yuthon_contract_type,model_yuthon_contract_type,base.group_user,1,1,1,1
access_leaving_salary_line,leaving_salary_line,model_leaving_salary_line,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
57 access_yuthon_employee_add yuthon_employee_add model_yuthon_employee_add base.group_user 1 1 1 1
58 access_yuthon_pre_examination yuthon_pre_examination model_yuthon_pre_examination base.group_user 1 1 1 1
59 access_yuthon_service_type yuthon_service_type model_yuthon_service_type base.group_user 1 1 1 1
60 access_yuthon_contract_type yuthon_contract_type model_yuthon_contract_type base.group_user 1 1 1 1
61 access_leaving_salary_line leaving_salary_line model_leaving_salary_line base.group_user 1 1 1 1