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

!3768 添加功能

Browse Source 
Merge pull request !3768 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-07-11 02:55:25 +00:00
committed by Gitee
parent 76da774363 5d98b97509
commit dffe4b6ca7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/models/yuthon_payroll_project.py
+1 -1
View File
@@ -88,7 +88,7 @@ class YuthonPayrollCommon(models.Model):
if ins.name == '请假扣发':
formula_salary = "result = 0"
if ins.name == '值班费':
formula_salary = "result = 0"
formula_salary = "result = 0"
if ins.name == '上月值班费':
formula_salary = "result = 0"
if ins.name == '六一儿童节福利费':
yuthon_salary/views/inherit_hr_payslip_views.xml
+1
View File
@@ -256,6 +256,7 @@
<field name="environmental_allowance" 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="high_subsidy" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
<field name="spring_festival" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
<field name="seniority_salary" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
<field name="commuting_allowance" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_wg_user" optional="show"/>
<field name="full_attendance_award" decoration-success="1" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_wg_user" optional="show"/>