!5098 添加功能

Merge pull request !5098 from dev_zhou

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)

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})

yuthon_property_approval/views/payment_process_viwes.xml

@@ -45,7 +45,7 @@
                         <field name="payment_instructions"/>
                         <field name="payment_nodes"/>
                         <field name="amount"/>
-                        <field name="documents_id" widget="many2many_tags"/>
+                        <field name="documents_id"  widget="preview_many2one"/>
                         <field name="department_id" invisible="1"/>
                         <field name="company_id" invisible="1"/>
                     </group>