From 562a7c1e0c009e85b12d6b67b7adb08d8d3ae8e7 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 15 Apr 2025 10:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_salary/models/inherit_hr_payslip.py    |  2 +-
 .../views/inherit_hr_payslip_views.xml        | 29 +++++--------------
 yuthon_salary/wizard/put_return_wizard.py     |  4 +--
 3 files changed, 11 insertions(+), 24 deletions(-)

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 @@
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
             <tree string="薪资计算" default_order="employee_id" js_class="custom_salary_button" editable="bottom">
+                <header>
+                    <button name="action_put_wizard" string="推送" type="object" class="oe_highlight"/>
+                </header>
                 <field name="employee_id" string="姓名" widget="ztree_select"/>
                 <field name="total_before_tax" decoration-danger="1" decoration-bf="1"/>
                 <field name="company_id" optional="hide" required="1"/>
@@ -217,6 +220,10 @@
         <field name="model">hr.payslip</field>
         <field name="arch" type="xml">
             <tree string="个税计算" default_order="employee_id" js_class="custom_salary_payslip_button">
+                <header>
+                    <button name="action_put_salary_wizard" string="推送" type="object" class="oe_highlight"/>
+                    <button name="action_return_wizard" string="退回" type="object" class="oe_highlight"/>
+                </header>
                 <field name="employee_id" string="姓名" widget="ztree_select"/>
                 <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
                 <field name="struct_id" string="职级"/>
@@ -244,6 +251,7 @@
                 <field name="tax_reduction"/>
                 <field name="deduction_standard"/>
                 <field name="paid_tax"/>
+                <field name="company_id" optional="hide"/>
                 <field name="is_push" column_invisible="1"/>
                 <field name="is_salary_push" column_invisible="1"/>
                 <button name="return_button" string="退回" type="object" class="oe_highlight"/>
@@ -329,27 +337,6 @@
             records.action_refresh_from_work_entries()
         </field>
     </record>
-    <record id="all_data_put" model="ir.actions.server">
-        <field name="name">批量推送个税计算</field>
-        <field name="model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field name="binding_model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field name="state">code</field>
-        <field name="code">action = model.action_put_wizard()</field>
-    </record>
-    <record id="all_data_return" model="ir.actions.server">
-        <field name="name">批量退回薪资计算</field>
-        <field name="model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field name="binding_model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field name="state">code</field>
-        <field name="code">action = model.action_return_wizard()</field>
-    </record>
-    <record id="all_data_put_salary" model="ir.actions.server">
-        <field name="name">批量推送工资确认</field>
-        <field name="model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field name="binding_model_id" ref="hr_payroll.model_hr_payslip"/>
-        <field name="state">code</field>
-        <field name="code">action = model.action_put_salary_wizard()</field>
-    </record>
     <record id="all_data_return_salary" model="ir.actions.server">
         <field name="name">批量退回个税计算</field>
         <field name="model_id" ref="hr_payroll.model_hr_payslip"/>
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