pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2475 添加功能

Browse Source 
Merge pull request !2475 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-04-15 02:48:37 +00:00
committed by Gitee
parent 85c50c8ac2 562a7c1e0c
commit e2df0e9334
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/models/inherit_hr_payslip.py
+1 -1
View File
@@ -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",
yuthon_salary/views/inherit_hr_payslip_views.xml
+8 -21
View File
@@ -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"/>
yuthon_salary/wizard/put_return_wizard.py
+2 -2
View File
@@ -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})
record.write({'is_salary_push': False, 'is_salary_release': False})