diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py index 08ab7a3e1..767039f7c 100644 --- a/yuthon_hr_attendance/__manifest__.py +++ b/yuthon_hr_attendance/__manifest__.py @@ -29,7 +29,7 @@ 'views/go_approval.xml', 'views/duty_approval.xml', 'views/leave_approval.xml', - 'views/holidays_approval.xml', + # 'views/holidays_approval.xml', 'views/remove_holiday_approval.xml', 'views/card_approval.xml', 'views/holiday_manage.xml', @@ -38,7 +38,7 @@ 'views/attendance_iot_datas.xml', 'views/all_attendance_menu.xml', 'wizard/attendance_iot_manager_wizard_views.xml', - 'wizard/holiday_details_wizard_views.xml', + # 'wizard/holiday_details_wizard_views.xml', ], 'installable': True, 'application': True, diff --git a/yuthon_hr_attendance/views/all_attendance_menu.xml b/yuthon_hr_attendance/views/all_attendance_menu.xml index 00c7d12e3..62216cb65 100644 --- a/yuthon_hr_attendance/views/all_attendance_menu.xml +++ b/yuthon_hr_attendance/views/all_attendance_menu.xml @@ -14,8 +14,8 @@ sequence="5" action="approval_request_duty"/> - + + + + \ No newline at end of file diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index c23ea7622..34acf0979 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -209,6 +209,9 @@ + + 上级单位 + diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py index 6b893112c..cad30076b 100644 --- a/yuthon_issue/__manifest__.py +++ b/yuthon_issue/__manifest__.py @@ -24,6 +24,7 @@ 'views/issue_approval_decision_views.xml', 'views/issue_approval_decision_type_views.xml', 'views/inherit_hr_employee_views.xml', + 'views/issue_meeting_minutes_views.xml', 'views/menus.xml', ], 'assets': { diff --git a/yuthon_issue/models/__init__.py b/yuthon_issue/models/__init__.py index 39cdfd801..493c668cf 100644 --- a/yuthon_issue/models/__init__.py +++ b/yuthon_issue/models/__init__.py @@ -7,3 +7,4 @@ from . import issue_approval_decision_type from . import inherit_room_booking from . import issue_approval from . import inherit_hr_employee +from . import issue_meeting_minutes diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index ff93a3042..5a71b59eb 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -6,4 +6,7 @@ class RoomBooking(models.Model): _inherit = 'room.booking' room_booking_library_ids = fields.One2many('issue.library', 'room_booking_id') - decision_results = fields.Selection([('agree', '通过'), ('disagree', '未通过')], string="决策结果") + + + def bottom_meeting_approval(self): + pass \ No newline at end of file diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 4d7aaaff6..293cd21b2 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -27,6 +27,8 @@ class IssueLibrary(models.Model): issue_library_approval_line_ids = fields.One2many('issue.library.approval.line', 'issue_approval_id', string='流程记录') room_booking_id = fields.Many2one('room.booking', string="会议室") approval_decision_sequence = fields.Char(string="决策清单事项") + decision_results = fields.Selection([('agree', '通过'), ('disagree', '未通过')], string="决策结果") + decision_details = fields.Text(string="决策详情") # 权限相关隐藏字段 employee_id = fields.Many2one('hr.employee', string='创建人', default=lambda self: self.env.user.employee_id) diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py new file mode 100644 index 000000000..5543990d2 --- /dev/null +++ b/yuthon_issue/models/issue_meeting_minutes.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import UserError, ValidationError + + +class IssueMeetingMinutes(models.Model): + _name = 'issue.meeting.minutes' + _description = '会议纪要' + + name = fields.Char(string='名称', required=True) + meeting_name = fields.Char(string='会议名称', required=True) + meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型") + meeting_date = fields.Datetime(string="会议时间") + meeting_minutes_ids = fields.One2many('issue.meeting.minutes.line', 'meeting_minutes_id', string="会议纪要明细") + notice_documents_ids = fields.Many2many('documents.document', string="纪要签名附件") + + +class IssueMeetingMinutesLine(models.Model): + _name = 'issue.meeting.minutes.line' + _description = '会议纪要明细行' + + meeting_minutes_id = fields.Many2one('issue.meeting.minutes', string="关联会议纪要") + name = fields.Char(string='事项名称', required=True) + deliberations = fields.Text(string="审议情况") + overview = fields.Text(string="概述") \ No newline at end of file diff --git a/yuthon_issue/security/ir.model.access.csv b/yuthon_issue/security/ir.model.access.csv index a006181ec..e445b2d09 100644 --- a/yuthon_issue/security/ir.model.access.csv +++ b/yuthon_issue/security/ir.model.access.csv @@ -5,6 +5,9 @@ access_issue_approval_decision_type,issue_approval_decision_type,model_issue_app access_issue_library_approval_line,issue_library_approval_line,model_issue_library_approval_line,base.group_user,1,1,1,1 access_issue_approval,issue_approval,model_issue_approval,base.group_user,1,1,1,1 access_issue_approval_line,issue_approval_line,model_issue_approval_line,base.group_user,1,1,1,1 +access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1 +access_issue_meeting_minutes_line,issue_meeting_minutes_line,model_issue_meeting_minutes_line,base.group_user,1,1,1,1 +access_issue_meeting_minutes,issue_meeting_minutes,model_issue_meeting_minutes,base.group_user,1,1,1,1 access_issue_library,issue_library,model_issue_library,group_topic_admin,1,1,1,1 access_issue_library,issue_library,model_issue_library,group_party_topic,1,1,1,1 diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml index be17502a0..c0de41e3f 100644 --- a/yuthon_issue/views/inherit_room_booking.xml +++ b/yuthon_issue/views/inherit_room_booking.xml @@ -11,12 +11,11 @@ - - - - + + +