diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py index 8ee2f945e..f29512e1f 100644 --- a/yuthon_issue/models/issue_meeting_minutes.py +++ b/yuthon_issue/models/issue_meeting_minutes.py @@ -18,7 +18,7 @@ class IssueMeetingMinutes(models.Model): code = fields.Char(string='编号', required=True, copy=False, default=lambda self: self.env['ir.sequence'].next_by_code('issue_meeting_minutes_code')) meeting_minutes_ids = fields.One2many('issue.meeting.minutes.line', 'meeting_minutes_id', string="会议纪要明细") - notice_documents_ids = fields.Many2many('documents.document', string="纪要签名附件") + notice_documents_ids = fields.Many2many('ir.attachment', string="纪要签名附件") computed_meeting_name = fields.Char(string='会议名称', compute='_compute_meeting_name') @api.depends('meeting_date', 'number_of_meetings', 'meeting_id.name') diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index f0d2a5074..b12213bd8 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -23,7 +23,7 @@ class YuthonNotice(models.Model): employee_ids = fields.Many2many('hr.employee', string="人员范围") notice_state = fields.Selection([('no', '未发布'), ('yes', '已发布'), ('stop', '已终止')], default='no', string="公告状态") - notice_documents_ids = fields.Many2many('documents.document', string="附件") + notice_documents_ids = fields.Many2many('ir.attachment', string="附件") is_notice_roger = fields.Selection([('yes', '已读'), ('no', '未读')], default='no', string="确认状态") is_change_notice = fields.Boolean(string="是否发送通知", default=True) attn_notice = fields.Html(string="经办人意见") diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml index dba8e1a12..5f8aa7438 100644 --- a/yuthon_notice/views/yuthon_confirm_users_views.xml +++ b/yuthon_notice/views/yuthon_confirm_users_views.xml @@ -35,6 +35,5 @@ yuthon.confirm.users tree - {'search_default_group_notice': True,'search_default_group_state': True} \ No newline at end of file diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml index 7f5c2b810..3cb556a21 100644 --- a/yuthon_notice/views/yuthon_notice_views.xml +++ b/yuthon_notice/views/yuthon_notice_views.xml @@ -148,21 +148,11 @@ - - yuthon.notice.search - yuthon.notice - - - - - - 我的通知公告 yuthon.notice tree,form - [('notice_state','=','yes')]