diff --git a/yuthon_hr_employee_approval/data/process_code_data.xml b/yuthon_hr_employee_approval/data/process_code_data.xml
index 54112c0a2..e0bf096bd 100644
--- a/yuthon_hr_employee_approval/data/process_code_data.xml
+++ b/yuthon_hr_employee_approval/data/process_code_data.xml
@@ -101,9 +101,9 @@
-
+
员工奖罚-编号
- yuthon_salary_approval_code
+ employee_rewards_approval_code
YG%(y)s%(month)s%(day)s
3
diff --git a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py
index 33d370ff3..fdb51221f 100644
--- a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py
@@ -10,12 +10,12 @@ class YuthonRewardApproval(models.Model):
name = fields.Char(string='标题')
text = fields.Text(string='正文')
code = fields.Char(string="编号",
- default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_salary_approval_code'))
+ default=lambda self: self.env['ir.sequence'].next_by_code('employee_rewards_approval_code'))
users_id = fields.Many2one('res.users', string="录入人", default=lambda self: self.env.user.id)
department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
entrant_date = fields.Date(string="录入日期")
entrant_illustrate = fields.Text(string="录入说明")
- documents_ids = fields.Many2one('ir.attachment', string="附件")
+ documents_ids = fields.Many2many('ir.attachment', string="附件")
is_issues = fields.Boolean(string='是否上会')
issues_result = fields.Html(string="会议结果")
related_issues_id = fields.Many2one('issue.library', string="关联议题")
diff --git a/yuthon_trade/views/yuthon_personal_condolences.xml b/yuthon_trade/views/yuthon_personal_condolences.xml
index 864f38b10..aae74a76d 100644
--- a/yuthon_trade/views/yuthon_personal_condolences.xml
+++ b/yuthon_trade/views/yuthon_personal_condolences.xml
@@ -19,6 +19,7 @@
+