diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml index 18c09b46f..bbe0c412b 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml @@ -15,25 +15,25 @@
-
-
-
diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py index 9ca71ab95..2d30cb546 100644 --- a/yuthon_issue/models/issue_approval.py +++ b/yuthon_issue/models/issue_approval.py @@ -14,6 +14,7 @@ class IssueApproval(models.Model): create_time = fields.Date(string='创建日期', default=lambda self: fields.Date.today()) employee_id = fields.Many2one('hr.employee', string="经办人", default=lambda self: self.env.user.employee_id) department_id = fields.Many2one(related='employee_id.department_id', string="部门") + company_id = fields.Many2one(related='employee_id.company_id', string="公司") user_id = fields.Many2one('res.users', string="经办人", default=lambda self: self.env.user) meeting_details = fields.Char(string="会议详情") job_id = fields.Many2one(related='employee_id.job_id', string="岗位") diff --git a/yuthon_issue/security/issue_security_group.xml b/yuthon_issue/security/issue_security_group.xml index 5d2daa167..c88078948 100644 --- a/yuthon_issue/security/issue_security_group.xml +++ b/yuthon_issue/security/issue_security_group.xml @@ -23,4 +23,9 @@ [('company_id', 'in', company_ids)] + + 议题审批多公司 + + [('company_id', 'in', company_ids)] + \ No newline at end of file diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml index 6051ccad5..54a66c9be 100644 --- a/yuthon_issue/views/issue_approval_views.xml +++ b/yuthon_issue/views/issue_approval_views.xml @@ -41,6 +41,7 @@ +