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

!1556 添加功能

Browse Source 
Merge pull request !1556 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-02-24 12:52:18 +00:00
committed by Gitee
parent d4a4044411 4ea09c7a85
commit 52783ca24a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+2 -2
View File
@@ -28,8 +28,8 @@
<field name="base_salary"/>
<field name="position_subsidy" groups="yuthon_hr_employee.group_hr_employee_lc_user"/>
<field name="performance_bonus" groups="yuthon_hr_employee.group_hr_employee_tt_user,yuthon_hr_employee.group_hr_employee_lc_user"/>
<field name="integrated_subsidy" groups="yuthon_hr_employee.group_hr_employee_wg_user,yuthon_hr_employee.group_hr_employee_tt_user"/>
<field name="communication_subsidy" groups="yuthon_hr_employee.group_hr_employee_wg_user"/>
<field name="integrated_subsidy" groups="yuthon_hr_employee.group_hr_employee_wg_user"/>
<field name="communication_subsidy" groups="yuthon_hr_employee.group_hr_employee_wg_user,yuthon_hr_employee.group_hr_employee_tt_user"/>
<field name="position_salary" groups="yuthon_hr_employee.group_hr_employee_wg_user,yuthon_hr_employee.group_hr_employee_lc_user"/>
<field name="full_attendance_bonus" groups="yuthon_hr_employee.group_hr_employee_wg_user,yuthon_hr_employee.group_hr_employee_tt_user"/>
<field name="yuthon_company"/>
yuthon_salary/wizard/yuthon_payroll_wizard.py
+3 -3
View File
@@ -42,7 +42,7 @@ class YuthonPayrollWizard(models.Model):
performance_bonus = row[3].value
communication_subsidy = row[4].value
full_attendance_bonus = row[5].value
payroll_id = self.env['hr.payroll.structure'].search([('type_id', '=', type_id.id), ('yuthon_company', '=','thtz')])
payroll_id = self.env['hr.payroll.structure'].search([('type_id', '=', type_id.id), ('yuthon_company', '=','thtz')], limit=1)
if payroll_id:
payroll_id.write({
'base_salary': base_salary,
@@ -59,7 +59,7 @@ class YuthonPayrollWizard(models.Model):
integrated_subsidy = row[3].value
communication_subsidy = row[4].value
full_attendance_bonus = row[5].value
payroll_id = self.env['hr.payroll.structure'].search([('type_id', '=', type_id.id), ('yuthon_company', '=','thwg')])
payroll_id = self.env['hr.payroll.structure'].search([('type_id', '=', type_id.id), ('yuthon_company', '=','thwg')], limit=1)
if payroll_id:
payroll_id.write({
'base_salary': base_salary,
@@ -70,7 +70,7 @@ class YuthonPayrollWizard(models.Model):
})
def yuthon_payroll_lc_data(self, row):
type_id = self.env['hr.payroll.structure.type'].search([('name', '=', row[0].value)])
type_id = self.env['hr.payroll.structure.type'].search([('name', '=', row[0].value)], limit=1)
base_salary = row[1].value
position_subsidy = row[2].value
position_salary = row[3].value