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

!3183 添加功能

Browse Source 
Merge pull request !3183 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-06-09 07:24:46 +00:00
committed by Gitee
parent 1e64f5a91d b6146b77b5
commit 5ff2cb7d75
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/models/inherit_hr_payslip.py
+4
View File
@@ -117,6 +117,10 @@ class InheritHrPayslip(models.Model):
# 粮储常用项
quality_allowance = fields.Float(string='质检员津贴')
environmental_allowance = fields.Float(string='环境作业津贴')
last_duty = fields.Float(string='上月值班费')
high_subsidy = fields.Float(string='高温补贴')
performance_deduction = fields.Float(string='扣发绩效奖金', compute='_compute_deduction', store=True)
commuting_deduction = fields.Float(string='扣发通信补贴', compute='_compute_deduction', store=True)
base_salary_deduction = fields.Float(string='扣发基本工资', compute='_compute_deduction', store=True)
yuthon_salary/models/yuthon_payroll_project.py
+3 -1
View File
@@ -76,9 +76,11 @@ class YuthonPayrollCommon(models.Model):
formula_salary = "result = 0"
if ins.name == '岗位绩效':
formula_salary = "result = 0"
if ins.name == '高温补贴':
formula_salary = "result = 0"
if ins.name == '优秀部门经理/员工':
formula_salary = "result = 0"
if ins.name == '值班费':
if ins.name == '上月值班费':
formula_salary = "result = 0"
if ins.name == '年金（系数）':
formula_salary = "result = 0"
yuthon_salary/views/inherit_hr_payslip_views.xml
+3 -1
View File
@@ -58,6 +58,8 @@
<field name="position_salary" groups="yuthon_salary.group_lc_user" optional="show"/>
<field name="position_subsidy" decoration-success="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_lc_user" optional="show"/>
<field name="environmental_allowance" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
<field name="last_duty" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
<field name="high_subsidy" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
<field name="quality_allowance" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
<field name="post_salary" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
<field name="seniority_salary" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
@@ -235,7 +237,7 @@
<field name="b_year" decoration-danger="1" decoration-bf="1" optional="show"/>
<field name="three_one" optional="show"/>
<field name="tax_payable" decoration-danger="1" decoration-bf="1" readonly="1" optional="show"/>
<field name="union_dues" decoration-danger="1" decoration-bf="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="union_dues" decoration-danger="1" decoration-bf="1" optional="show" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_lc_user"/>
<field name="base_salary" required="1" optional="show"/>
<field name="rank_salary" required="1" optional="show"/>
<field name="performance_bonuses" required="1" optional="show"/>