Merge branch 'refs/heads/dev' into dev_zhou

# Conflicts:
#	yuthon_notice/views/yuthon_notice_views.xml

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

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="经办人意见")

yuthon_notice/views/yuthon_confirm_users_views.xml

@@ -35,6 +35,5 @@
         <field name="res_model">yuthon.confirm.users</field>
         <field name="view_mode">tree</field>
         <field name="search_view_id" ref="yuthon_confirm_users_filter"/>
-        <field name="context">{'search_default_group_notice': True,'search_default_group_state': True}</field>
     </record>
 </odoo>

yuthon_notice/views/yuthon_notice_views.xml

@@ -148,21 +148,11 @@
         </field>
     </record>
 
-    <record id="view_yuthon_notice_filter2" model="ir.ui.view">
-        <field name="name">yuthon.notice.search</field>
-        <field name="model">yuthon.notice</field>
-        <field name="arch" type="xml">
-            <search string="公告查询">
-                <field name="name"/>
-            </search>
-        </field>
-    </record>
 
     <record id="approval_notice_action2" model="ir.actions.act_window">
         <field name="name">我的通知公告</field>
         <field name="res_model">yuthon.notice</field>
         <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_yuthon_notice_filter2"/>
         <field name="domain">[('notice_state','=','yes')]</field>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_notice.view_yuthon_notice_tree2')}),