!8829 添加功能

Merge pull request !8829 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-02-09 10:04:04 +00:00
committed by Gitee
2 changed files with 11 additions and 10 deletions
@@ -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):
@@ -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