diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 91694b0b9..615361480 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -509,7 +509,6 @@ class SoongWorkflowCommentWizard(models.TransientModel): 'approval_state': "3", 'lase_click_date': current_datetime }) - record_id.work_end = True last_log = log_records[-1] if log_records else None if last_log: same_name_logs = log_records.filtered( @@ -531,6 +530,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): 'employee_ids': False, 'node_id': False, }) + record_id.work_end = True else: self.env['soong.workflow.record'].search([ ('code', '=', record_id.code) @@ -539,6 +539,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): 'employee_ids': False, 'node_id': False, }) + record_id.work_end = True # 给申请人发消息 biz_record = self.env[self.res_model].browse(self.res_id) diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py index 78a32d5d0..62d6bae34 100644 --- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py +++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py @@ -21,6 +21,20 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel): workflow_record = self.env["soong.workflow.record"].sudo().search([("id", "=", record.id)], limit=1) if not workflow_record: continue + # 删除假期额度里面的对应的流程记录 + related_detail_models = [ + 'vacation.leave.line', + 'vacation.over.line', + 'vacation.meal.line', + 'vacation.medical.line' + ] + for model_name in related_detail_models: + detail_model = self.env[model_name].sudo() + related_detail_records = detail_model.search([ + ('workflow_record_id', '=', workflow_record.id) + ]) + if related_detail_records: + related_detail_records.unlink() if not record.reclaim_state: workflow_record.write({"reclaim_state": True}) diff --git a/yuthon_property_approval/views/payment_process_viwes.xml b/yuthon_property_approval/views/payment_process_viwes.xml index fcfa12921..56cf535e4 100644 --- a/yuthon_property_approval/views/payment_process_viwes.xml +++ b/yuthon_property_approval/views/payment_process_viwes.xml @@ -45,7 +45,7 @@ - +