diff --git a/yuthon_hr_attendance/static/src/js/button_overtime_active_export.js b/yuthon_hr_attendance/static/src/js/button_overtime_active_export.js index 75a18cb25..0cf9044ec 100644 --- a/yuthon_hr_attendance/static/src/js/button_overtime_active_export.js +++ b/yuthon_hr_attendance/static/src/js/button_overtime_active_export.js @@ -16,7 +16,7 @@ export class CustomOvertimeActiveExportController extends ListController { return this.actionService.doAction({ type: 'ir.actions.act_window', res_model: 'export.date.wizard', - name: '打印薪资', + name: '打印明细', view_mode: 'form', view_type: 'form', views: [[false, 'form']], diff --git a/yuthon_hr_attendance/wizard/export_date_wizard.py b/yuthon_hr_attendance/wizard/export_date_wizard.py index 3c4b91e26..a35994aab 100644 --- a/yuthon_hr_attendance/wizard/export_date_wizard.py +++ b/yuthon_hr_attendance/wizard/export_date_wizard.py @@ -289,7 +289,7 @@ class ExportDateWizard(models.TransientModel): """导出误餐归档明细""" active_ids = json.loads(self.active_ids) if self.active_ids else [] - domain = [('start_time', '>=', start_date), ('start_time', '<', end_date)] + domain = [('carry_forward_date', '>=', start_date), ('carry_forward_date', '<', end_date)] if active_ids: domain = [('id', 'in', active_ids)] + domain