diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml index 67b64022b..69769e438 100644 --- a/yuthon_contract/views/inherit_hr_contract_views.xml +++ b/yuthon_contract/views/inherit_hr_contract_views.xml @@ -48,6 +48,14 @@ + + ['|', ('country_id', '=', False), ('country_id', '=', company_country_id), ('company_id', '=', company_id)] + + + + ['|', ('country_id', '=', False), ('country_id', '=', company_country_id), ('company_id', '=', company_id)] + + 1 diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index fd8bcf3ed..e7dfd8cd7 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -180,8 +180,6 @@ class HrAttendance(models.Model): return True - - # @api.model # def web_read_group(self, domain, fields, groupby, limit=None, offset=0, orderby=False, lazy=True): # result = super().web_read_group(domain, fields, groupby, limit, offset, orderby, lazy) diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index 14181b8b9..240b8f44c 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -41,7 +41,6 @@ class OvertimeApprovals(models.Model): default='normal') active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") - test_field = fields.Char(string="测试字段") def _get_default_name_title(self): @@ -83,7 +82,6 @@ class OvertimeApprovals(models.Model): if rec.users_id: rec.is_thwg = rec.users_id.company_id.name == '天河物管' - @api.depends('start_time', 'end_time', 'attendance_id') def _compute_duration(self): for rec in self: @@ -260,7 +258,11 @@ class OvertimeApprovals(models.Model): workflow_id = self.env['soong.workflow.record'].search([('code', '=', self.code)], limit=1) if attendance_record: attendance_record.write({'is_workflow': True, - 'workflow_id': workflow_id.id, + 'is_abnormal': False, + 'is_no_card': False, + 'is_late_card': False, + 'is_early_card': False, + 'workflow_id': workflow_id.id, }) @api.depends('users_id', 'duration') diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml index 384e245b5..1adbbd00c 100644 --- a/yuthon_hr_attendance/views/overtime_approval.xml +++ b/yuthon_hr_attendance/views/overtime_approval.xml @@ -89,7 +89,7 @@ - + diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml index 263aa36c7..5ab0ea881 100644 --- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml @@ -72,6 +72,7 @@ + @@ -94,7 +95,6 @@ -