!8402 !8401 添加功能

Merge pull request !8402 from 李鹏宇/dev

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -721,7 +721,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == "分发":
             record_id.is_send = True
-            menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')])
+            menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')], limit=1)
             workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
             action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
             target_url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&menu_id={menu_id.id}&active_id={action_id.id}&model={record_id._name}&view_type=form'
@@ -847,7 +847,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             self.node_btn_id.with_context(cx).run()
 
         if self.node_btn_name == '归档':
-            menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')])
+            menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')], limit=1)
             action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
             target_url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&menu_id={menu_id.id}&active_id={action_id.id}&model={record_id._name}&view_type=form'
             description = "标题: {}\n".format(record_id.name) + self.env.user.name + '  ' + str(fields.Datetime.now() + timedelta(hours=8))

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -868,7 +868,7 @@ class YuthonVacationReports(models.Model):
                 if line.is_void:
                     continue
 
-                line_total = (line.workday or 0) + (line.public_holidays or 0)
+                line_total = line.remaining_quantity
                 legal_total += (line.legal_day or 0)
                 if line.update_type == 'add':
                     total_add += line_total