diff --git a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml index 438dea4d3..403acd3ab 100644 --- a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml @@ -8,7 +8,7 @@ - + diff --git a/yuthon_salary/models/inherit_hr_payslip_run.py b/yuthon_salary/models/inherit_hr_payslip_run.py index 782291fea..e250f46f4 100644 --- a/yuthon_salary/models/inherit_hr_payslip_run.py +++ b/yuthon_salary/models/inherit_hr_payslip_run.py @@ -15,7 +15,7 @@ class InheritHrPayslipRun(models.Model): string="阶段") def Fileline(self): - domain = [('is_salary_push', '=', True), ('is_salary_release', '=', True)] + domain = [('is_salary_push', '=', True), ('is_salary_release', '=', True), ('payslip_run_id', '=', self.id)] return { "name": "薪资归档明细", 'type': 'ir.actions.act_window', diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml index 9bc286eb8..2fe0c2e3f 100644 --- a/yuthon_salary/views/inherit_hr_payslip_views.xml +++ b/yuthon_salary/views/inherit_hr_payslip_views.xml @@ -11,6 +11,9 @@ employee_id 20 + +