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

!3525 !3524 添加功能

Browse Source 
Merge pull request !3525 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-06-26 02:26:12 +00:00
committed by Gitee
parent 135a433927 9c84428044
commit 1ec3d93456
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/models/inherit_hr_payslip.py
+3 -1
View File
@@ -68,6 +68,7 @@ class InheritHrPayslip(models.Model):
assessment_reserved_amount = fields.Float(string='考核保留量')
last_year_safety = fields.Float(string='上年安全生产工作奖')
last_year_performance_evaluation = fields.Float(string='上年绩效评优')
retention_previous_year = fields.Float(string='上年考核保留量')
social_security = fields.Float(string='上年社保补缴')
performance_up = fields.Float(string='上月多扣绩效补回')
individual_tax_refund = fields.Float(string='上年个税退回')
@@ -274,10 +275,11 @@ class InheritHrPayslip(models.Model):
'quality_allowance','high_subsidy', 'environmental_allowance', 'last_duty', 'seniority_salary', 'commuting_allowance','base_salary','performance_bonuses', 'comprehensive_subsidy', 'full_attendance_award', 'overtime_pay', 'based_pay',
'january_performance','position_subsidy', 'safety_incentives', 'temporary_performance_bonus', 'performance_deduction','commuting_deduction',
'base_salary_deduction', 'last_year_performance_evaluation', 'safety_subsidy', 'job_performance','leave_allowance',
'duty', 'monthly_overtime', 'annuity', 'excellent_employees', 'leave_absence')
'duty', 'monthly_overtime', 'annuity', 'excellent_employees', 'leave_absence', 'retention_previous_year')
def _compute_total_before_tax(self):
for record in self:
record.total_before_tax = (
record.retention_previous_year +
record.position_salary +
record.high_subsidy +
record.last_duty +
yuthon_salary/views/inherit_hr_payslip_views.xml
+2
View File
@@ -94,6 +94,7 @@
<field name="jing_te" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="year_gong" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="study_on" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="retention_previous_year" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="commuting_deduction" decoration-danger="1" optional="show"/>
<field name="performance_deduction" decoration-danger="1" optional="show"/>
<field name="deduction_standard" decoration-danger="1" optional="show"/>
@@ -292,6 +293,7 @@
<field name="excellent_employees" decoration-danger="1" groups="yuthon_salary.group_wg_user" optional="show"/>
<field name="commuting_deduction" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="performance_deduction" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="retention_previous_year" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="deduction_standard" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="safety_incentives" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user" />
<field name="last_year_safety" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>