添加功能
This commit is contained in:
@@ -35,7 +35,7 @@ export class CustomOvertimeExportController 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']],
|
||||
|
||||
@@ -134,7 +134,9 @@ class ExportDateWizard(models.TransientModel):
|
||||
"""导出加班明细"""
|
||||
active_ids = json.loads(self.active_ids) if self.active_ids else []
|
||||
|
||||
domain = [('carry_forward_date', '>=', start_date), ('carry_forward_date', '<', end_date)]
|
||||
domain = [('start_time', '>=', start_date), ('start_time', '<', end_date),
|
||||
'|', ('workflow_record_id', '!=', False), ('is_initial_number', '=', True),
|
||||
('update_type', '=', 'add'), ('is_filing', '=', False), ('is_visible', '=', False)]
|
||||
if active_ids:
|
||||
domain = [('id', 'in', active_ids)] + domain
|
||||
|
||||
|
||||
Reference in New Issue
Block a user