diff --git a/yuthon_hr_attendance/models/yuthon_overtime_line.py b/yuthon_hr_attendance/models/yuthon_overtime_line.py index 4031a26bf..e10972795 100644 --- a/yuthon_hr_attendance/models/yuthon_overtime_line.py +++ b/yuthon_hr_attendance/models/yuthon_overtime_line.py @@ -174,15 +174,15 @@ class YuthonOvertimeLine(models.Model): }]) report_id.update_line() - return { - 'type': 'ir.actions.client', - 'tag': 'display_notification', - 'params': { - 'type': 'success', - 'message': '归档成功', - 'sticky': False, - } + return { + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'type': 'success', + 'message': '归档成功', + 'sticky': False, } + } @api.model def carryover_details(self): diff --git a/yuthon_hr_attendance/wizard/export_date_wizard.py b/yuthon_hr_attendance/wizard/export_date_wizard.py index d7097b78d..015506d62 100644 --- a/yuthon_hr_attendance/wizard/export_date_wizard.py +++ b/yuthon_hr_attendance/wizard/export_date_wizard.py @@ -88,12 +88,13 @@ class ExportDateWizard(models.TransientModel): } def _export_leave_filing(self, start_date, end_date): - """导出归档请假情况(is_filiing=True)""" + """导出归档请假情况(is_filing=True)""" active_ids = json.loads(self.active_ids) if self.active_ids else [] domain = [ ('date_from', '>=', start_date), - ('date_from', '<', end_date) + ('date_from', '<', end_date), + ('is_filing', '=', True) ] if active_ids: domain = [('id', 'in', active_ids)] + domain