!7691 添加功能

Merge pull request !7691 from 李鹏宇/dev_zhou

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -650,7 +650,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                                                                  title=record_id._description,
                                                                                  description=f"编号为{record_id.code}的{record_id._description}已结束，请归档",
                                                                                  url=url, btntxt="查看详情")
-                        self.node_btn_id.with_context(cx).run()
+            self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == "分发":
             record_id.is_send = True
             workflow_record_id = self.env['soong.workflow.record'].search([('code', '=', record_id.code)])

yuthon_holiday/models/inherit_hr_leave_allocation.py

@@ -192,10 +192,12 @@ class HrLeaveAllocation(models.Model):
                         'valid_date': leave.date_to,
                     }
                     existing_leave_line.write(update_leave_vals)
+
                 leave_list.append([0, 0, {
                     'vacation_id': reports_id.id,
                     'update_type': 'add',
                     'update_date': fields.Datetime.now(),
+                    'valid_date': leave.date_from,
                     'update_lines': current_leave_hours,
                     'text': '年假分配'
                 }])
@@ -205,6 +207,7 @@ class HrLeaveAllocation(models.Model):
                     'vacation_id': reports_id.id,
                     'employee_id': reports_id.employee_id.id,
                     'update_type': 'add',
+                    'valid_date': leave.date_from,
                     'update_date': fields.Date.today(),
                     'workday': leave.number_of_hours_display,
                     'legal_day': 0,

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -30,9 +30,9 @@ class YuthonVacationReports(models.Model):
     valid_date1 = fields.Date(string="有效期至")
     year_holiday = fields.Float(string="本年公休日", digits=(16, 3))
     year_workday = fields.Float(string="本年工作日", digits=(16, 3))
-    year_sum = fields.Float(string="本年应休合计", digits=(16, 3), compute="_compute_year_sum")
+    year_sum = fields.Float(string="本年调休合计", digits=(16, 3), compute="_compute_year_sum")
     used_this_year1 = fields.Float(string="本年已休", digits=(16, 3))
-    remainder_year1 = fields.Float(string="本年剩余(补休)", digits=(16, 3), compute="_compute_year_sum")
+    remainder_year1 = fields.Float(string="剩余(补休)", digits=(16, 3), compute="_compute_year_sum")
 
     company_id = fields.Many2one(related="employee_id.company_id", string="公司", store=True)
     late_allowed = fields.Float(related="employee_id.late_allowed", string="允许迟到次数")