!312 zhou

Merge pull request !312 from 李鹏宇/dev_zhou

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,

yuthon_hr_attendance/views/all_attendance_menu.xml

@@ -14,8 +14,8 @@
               sequence="5" action="approval_request_duty"/>
     <menuitem id="menu_hr_attendance_leave" name="调休申请"
               parent="menu_hr_attendance_approval_request" sequence="6" action="approval_request_leave"/>
-    <menuitem id="menu_hr_attendance_holiday" name="请假申请"
-              parent="menu_hr_attendance_approval_request" sequence="8" action="approval_request_holiday"/>
+<!--    <menuitem id="menu_hr_attendance_holiday" name="请假申请"-->
+<!--              parent="menu_hr_attendance_approval_request" sequence="8" action="approval_request_holiday"/>-->
     <menuitem id="menu_hr_attendance_remove_holiday" name="销假申请"
               parent="menu_hr_attendance_approval_request" sequence="10" action="approval_request_remove_holiday"/>
     <menuitem id="menu_hr_attendance_remove_card" name="补卡申请"

yuthon_hr_attendance/wizard/holiday_details_wizard.py

@@ -9,7 +9,7 @@ class HolidayDetailsWizard(models.Model):
     holiday_days = fields.Float(string='假期天数')
     vacation_days_description = fields.Text(string='假期天数说明')
     vacation_type_id = fields.Many2one('holiday.type.setting', string='假期类别')
-    leave_type_id = fields.Many2one('hr.leave.type', string='假期类型', domain="[('vacation_type_id', '=', vacation_type_id)]")
+    leave_type_id = fields.Many2one('hr.leave.type', string='假期类型',domain="[('vacation_type_id', '=', vacation_category)]")
     annual = fields.Char(string='年次')
     travel_leave = fields.Char(string='路程假')
     treated = fields.Text(string='待遇')

yuthon_hr_employee/views/hr_job_type_views.xml

@@ -23,4 +23,11 @@
             parent="hr.menu_config_recruitment"
             action="hr_job_type_action"
             sequence="3"/>
+
+    <menuitem
+                id="menu_permissions_employee"
+                action="base.action_res_groups"
+                parent="hr.menu_config_employee"
+                name="角色权限"
+                sequence="8"/>
 </odoo>

yuthon_hr_employee/views/yuthon_hr_employee_views.xml

@@ -209,6 +209,9 @@
             <xpath expr="//field[@name='name']" position="after">
                  <field name="company_old"/>
             </xpath>
+            <xpath expr="//field[@name='parent_id']" position="attributes">
+                <attribute name="string">上级单位</attribute>
+            </xpath>
             <xpath expr="//field[@name='job_id']" position="after">
                 <field name="number" optional="hide"/>
                 <field name="yuthon_company" optional="hide"/>

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': {

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

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

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)

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="概述")

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

yuthon_issue/views/inherit_room_booking.xml

@@ -11,12 +11,11 @@
                         <tree>
                             <field name="room_booking_id" column_invisible="1"/>
                             <field name="name"/>
-                            <field name="is_party"/>
-                            <field name="is_class"/>
-                            <field name="is_boss"/>
-                            <field name="is_note"/>
+                            <field name="decision_results"/>
+                            <field name="decision_details"/>
                         </tree>
                     </field>
+                    <button name="bottom_meeting_approval" string="提交会议审批单" type="object" class="oe_highlight"/>
                 </page>
             </xpath>
         </field>

yuthon_issue/views/issue_library_views.xml

@@ -437,16 +437,6 @@
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form3')})]"/>
     </record>
 
-    <record id="issue_library_action_approval3" model="ir.actions.act_window">
-        <field name="name">审批中</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','approval')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree3')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form3')})]"/>
-    </record>
-
     <record id="issue_library_action_will3" model="ir.actions.act_window">
         <field name="name">待上会</field>
         <field name="res_model">issue.library</field>
@@ -588,16 +578,6 @@
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form4')})]"/>
     </record>
 
-    <record id="issue_library_action_approval4" model="ir.actions.act_window">
-        <field name="name">审批中</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','approval')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree4')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form4')})]"/>
-    </record>
-
     <record id="issue_library_action_will4" model="ir.actions.act_window">
         <field name="name">待上会</field>
         <field name="res_model">issue.library</field>
@@ -739,16 +719,6 @@
     </record>
 
 
-    <record id="issue_library_action_approval5" model="ir.actions.act_window">
-        <field name="name">审批中</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','approval')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree5')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form5')})]"/>
-    </record>
-
     <record id="issue_library_action_will5" model="ir.actions.act_window">
         <field name="name">待上会</field>
         <field name="res_model">issue.library</field>

yuthon_issue/views/issue_meeting_minutes_views.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_issue_meeting_minutes_tree" model="ir.ui.view">
+        <field name="name">issue.meeting.minutes.tree</field>
+        <field name="model">issue.meeting.minutes</field>
+        <field name="arch" type="xml">
+            <tree string="会议纪要">
+                <field name="name"/>
+                <field name="meeting_type_id"/>
+                <field name="meeting_date"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_issue_meeting_minutes_form" model="ir.ui.view">
+        <field name="name">issue.meeting.minutes.form</field>
+        <field name="model">issue.meeting.minutes</field>
+        <field name="arch" type="xml">
+            <form string="会议纪要">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name" string="名称"/>
+                        <h1>
+                            <field name="name" required="1"/>
+                        </h1>
+                    </div>
+                    <group col="2">
+                        <group>
+                             <field name="meeting_name"/>
+                             <field name="meeting_date"/>
+                        </group>
+                        <group>
+                            <field name="meeting_type_id"/>
+                        </group>
+                    </group>
+                    <field name="meeting_minutes_ids">
+                        <tree editable="bottom">
+                            <field name="meeting_minutes_id" column_invisible="1"/>
+                            <field name="name"/>
+                            <field name="deliberations"/>
+                            <field name="overview"/>
+                        </tree>
+                    </field>
+                    <field name="notice_documents_ids" widget="many2many_tags"/>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="action_issue_meeting_minutes" model="ir.actions.act_window">
+        <field name="name">会议纪要</field>
+        <field name="res_model">issue.meeting.minutes</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+</odoo>

yuthon_issue/views/menus.xml

@@ -3,7 +3,6 @@
     <menuitem id="tianhe_issue_library_menu_root"
               name="议题管理"
               web_icon="yuthon_issue,static/description/icon.png"
-              groups="group_party_topic,group_team_topic,group_board_topic,group_topic_admin"
               sequence="1"/>
 
     <!--  天河投资议题库管理  -->
@@ -85,6 +84,12 @@
               action="issue_library_approval_action"
               sequence="9"/>
 
+    <menuitem id="issue_meeting_minutes_menu"
+              parent="tianhe_issue_library_menu_root"
+              name="会议纪要"
+              action="action_issue_meeting_minutes"
+              sequence="12"/>
+
     <menuitem id="issue_approval_decision_menu"
               parent="tianhe_issue_library_menu_root"
               name="决策清单"
@@ -115,12 +120,6 @@
               action="issue_library_action3"
               sequence="1"/>
 
-    <menuitem id="tianhe_other_issue_library_approval3"
-              parent="tianhe_issue_library_menu_root3"
-              name="审批中"
-              action="issue_library_action_approval3"
-              sequence="3"/>
-
     <menuitem id="tianhe_other_issue_library_will3"
               parent="tianhe_issue_library_menu_root3"
               name="待上会"
@@ -152,11 +151,6 @@
               action="issue_library_action4"
               sequence="1"/>
 
-    <menuitem id="tianhe_other_issue_library_approval4"
-              parent="tianhe_issue_library_menu_root4"
-              name="审批中"
-              action="issue_library_action_approval4"
-              sequence="3"/>
 
     <menuitem id="tianhe_other_issue_library_will4"
               parent="tianhe_issue_library_menu_root4"
@@ -190,12 +184,6 @@
               action="issue_library_action5"
               sequence="1"/>
 
-    <menuitem id="tianhe_other_issue_library_approval5"
-              parent="tianhe_issue_library_menu_root5"
-              name="审批中"
-              action="issue_library_action_approval5"
-              sequence="3"/>
-
     <menuitem id="tianhe_other_issue_library_will5"
               parent="tianhe_issue_library_menu_root5"
               name="待上会"

yuthon_work_brand/views/hr_menus.xml

@@ -229,6 +229,11 @@
               parent="hr_set_employee_menu_root_board"
               action="soong_workflow.view_soong_user_role_action"
               sequence="9"/>
+    <menuitem id="hu_privileges_employee_menu_root_board"
+              name="角色权限"
+              parent="hr_set_employee_menu_root_board"
+              action="base.action_res_groups"
+              sequence="10"/>
     <menuitem id="hr_reason_turnover_menu_root_board"
               name="离职原因"
               parent="hr_set_employee_menu_root_board"
@@ -355,11 +360,11 @@
               parent="menu_hr_attendance_approval_request_board"
               sequence="7"
               action="yuthon_hr_attendance.approval_request_leave"/>
-    <menuitem id="menu_hr_attendance_holiday_board"
-              name="请假申请"
-              parent="menu_hr_attendance_approval_request_board"
-              sequence="9"
-              action="yuthon_hr_attendance.approval_request_holiday"/>
+<!--    <menuitem id="menu_hr_attendance_holiday_board"-->
+<!--              name="请假申请"-->
+<!--              parent="menu_hr_attendance_approval_request_board"-->
+<!--              sequence="9"-->
+<!--              action="yuthon_hr_attendance.approval_request_holiday"/>-->
     <menuitem id="menu_hr_attendance_remove_holiday_board"
               name="销假申请"
               parent="menu_hr_attendance_approval_request_board"