Merge pull request !567 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-11-26 01:34:51 +00:00
committed by Gitee
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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')
+1 -1
View File
@@ -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="经办人意见")