diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 74320b2d3..8b6e1206d 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -274,7 +274,7 @@ class InheritHrPayslip(models.Model):
def action_put_salary_wizard(self):
return {
"type": "ir.actions.act_window",
- "name": "推送工资确认",
+ "name": "推送薪资审定",
"res_model": "put.salary.wizard",
"view_mode": "form",
"target": "new",
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 7d401e648..3d34a03c8 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -177,6 +177,9 @@
hr.payslip
+
@@ -217,6 +220,10 @@
hr.payslip
+
@@ -244,6 +251,7 @@
+
@@ -329,27 +337,6 @@
records.action_refresh_from_work_entries()
-
- 批量推送个税计算
-
-
- code
- action = model.action_put_wizard()
-
-
- 批量退回薪资计算
-
-
- code
- action = model.action_return_wizard()
-
-
- 批量推送工资确认
-
-
- code
- action = model.action_put_salary_wizard()
-
批量退回个税计算
diff --git a/yuthon_salary/wizard/put_return_wizard.py b/yuthon_salary/wizard/put_return_wizard.py
index 709ec9c50..23f4a14e4 100644
--- a/yuthon_salary/wizard/put_return_wizard.py
+++ b/yuthon_salary/wizard/put_return_wizard.py
@@ -37,7 +37,7 @@ class PutSalaryWizard(models.TransientModel):
payslip_records = self.env["hr.payslip"].browse(
self._context.get('active_ids', self._context.get('active_id')))
for record in payslip_records:
- record.write({'is_salary_push': True})
+ record.write({'is_salary_push': True, 'is_salary_release': False})
class ReturnSalaryWizard(models.TransientModel):
@@ -50,4 +50,4 @@ class ReturnSalaryWizard(models.TransientModel):
payslip_records = self.env["hr.payslip"].browse(
self._context.get('active_ids', self._context.get('active_id')))
for record in payslip_records:
- record.write({'is_salary_push': False})
\ No newline at end of file
+ record.write({'is_salary_push': False, 'is_salary_release': False})
\ No newline at end of file