添加功能
This commit is contained in:
@@ -43,12 +43,6 @@ class RoomBooking(models.Model):
|
||||
room_users_ids = fields.Many2many('res.users', string="会议参加人员", compute="compute_room_users_ids", store=True)
|
||||
other_company_id = fields.Many2one('res.partner', string="外部公司")
|
||||
other_company_user_ids = fields.One2many(related="other_company_id.child_ids", string="其他人员")
|
||||
meeting_party_note = fields.Text(string="党之委会议纪要")
|
||||
meeting_party_document_ids = fields.One2many('party.document', 'room_booking_id', string="党之委会议文档")
|
||||
meeting_class_note = fields.Text(string="班子会议纪要")
|
||||
meeting_class_document_ids = fields.One2many('class.document', 'room_booking_id', string="班子会议文档")
|
||||
meeting_boss_note = fields.Text(string="董事会议纪要")
|
||||
meeting_boss_document_ids = fields.One2many('boss.document', 'room_booking_id', string="董事会议文档")
|
||||
|
||||
fleet_id = fields.Many2one('fleet.vehicle', string="车辆")
|
||||
meeting_place = fields.Char(string="会议地点")
|
||||
@@ -334,27 +328,3 @@ class RoomBooking(models.Model):
|
||||
room_ids = rooms._search([], order="office_id," + order)
|
||||
return rooms.browse(room_ids)
|
||||
return rooms
|
||||
|
||||
|
||||
class PartyDocument(models.Model):
|
||||
_name = 'party.document'
|
||||
_description = '党之委文档'
|
||||
|
||||
room_booking_id = fields.Many2one('room.booking')
|
||||
document_id = fields.Many2one('documents.document', string="文件")
|
||||
|
||||
|
||||
class ClassDocument(models.Model):
|
||||
_name = 'class.document'
|
||||
_description = '班子会文档'
|
||||
|
||||
room_booking_id = fields.Many2one('room.booking')
|
||||
document_id = fields.Many2one('documents.document', string="文件")
|
||||
|
||||
|
||||
class BossDocument(models.Model):
|
||||
_name = 'boss.document'
|
||||
_description = '董事会文档'
|
||||
|
||||
room_booking_id = fields.Many2one('room.booking')
|
||||
document_id = fields.Many2one('documents.document', string="文件")
|
||||
|
||||
@@ -6,9 +6,6 @@ access_room_room_manager,access.room.room.manager,room.model_room_room,room.grou
|
||||
access_room_booking_user,access.room.booking.user,room.model_room_booking,base.group_user,1,1,1,1
|
||||
|
||||
access_room_meeting_sign,access.room.meeting.sign,model_room_meeting_sign,base.group_user,1,1,1,1
|
||||
access_party_document,party_document,model_party_document,base.group_user,1,1,1,1
|
||||
access_class_document,class_document,model_class_document,base.group_user,1,1,1,1
|
||||
access_boss_document,boss_document,model_boss_document,base.group_user,1,1,1,1
|
||||
|
||||
access_room_booking_sign_wizard,room.booking.sign.wizard,model_room_booking_sign_wizard,,1,1,1,1
|
||||
access_room_booking_partner_create_wizard,room.booking.partner.create.wizard,model_room_booking_partner_create_wizard,,1,1,1,1
|
||||
|
||||
|
@@ -185,31 +185,6 @@
|
||||
</field>
|
||||
</group>
|
||||
</page>
|
||||
<page name="note" string="会议纪要">
|
||||
<group>
|
||||
<field name="meeting_party_note"/>
|
||||
<field name="meeting_party_document_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="room_booking_id" column_invisible="1"/>
|
||||
<field name="document_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="meeting_class_note"/>
|
||||
<field name="meeting_class_document_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="room_booking_id" column_invisible="1"/>
|
||||
<field name="document_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="meeting_boss_note"/>
|
||||
<field name="meeting_boss_document_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="room_booking_id" column_invisible="1"/>
|
||||
<field name="document_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
</page>
|
||||
<page name="meeting_html" string="会议说明">
|
||||
<button name="button_meeting_data" string="座位排列" type="object" class="oe_highlight"/>
|
||||
<field name="meeting_data" widget="tinymce"/>
|
||||
|
||||
Reference in New Issue
Block a user