!7183 !7182 添加功能

Merge pull request !7183 from 李鹏宇/dev

yuthon_hr_attendance/models/overtime_approval.py

@@ -16,10 +16,11 @@ class OvertimeApprovals(models.Model):
     name = fields.Char(string="标题", compute='_compute_name')
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('overtime_approval'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
+    company_id = fields.Many2one(related='users_id.employee_ids.company_id', string="公司")
     is_thwg = fields.Boolean(string="是否天河物管", compute='_compute_is_thwg', store=True)
     # overtime_approval_ids = fields.One2many('overtime.user.line', 'overtime_approval_id', string="加班审批行")
     reason_application = fields.Text(string="事由")
-    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
+    department_id = fields.Many2one(related='users_id.employee_ids.department_id', string="部门")
     is_issues = fields.Boolean(string='是否上会')
     issues_result = fields.Html(string="会议结果")
     details = fields.Text(string="加班说明")

yuthon_hr_attendance/views/overtime_approval.xml

@@ -54,6 +54,7 @@
                         <group>
                             <field name="is_back" invisible="1"/>
                             <field name="users_id"/>
+                            <field name="company_id" invisible="1"/>
                             <field name="overtime_methods"/>
                             <field name="work_end" invisible="1"/>
                             <field name="reason_application"/>