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

!2069 !2068 添加功能

Browse Source 
Merge pull request !2069 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-03-24 09:14:47 +00:00
committed by Gitee
parent d4f7580f84 8c5410cf6a
commit 7dec45aaa4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee/wizard/hr_employee_wizard.py
+8 -8
View File
@@ -45,14 +45,14 @@ class YuthonHrEmployeeWizard(models.Model):
open_start_time = base_date + timedelta(days=row[2].value - 2) if row[2].value > 0 else base_date
else:
open_start_time = None
if row[6].value:
dang_data = base_date + timedelta(days=row[6].value - 2) if row[6].value > 0 else base_date
else:
dang_data = None
political_aspects_dict = {'中共党员': 'cpc_dang', '民盟': 'nld', '共青团员': 'league_member', '群众': 'people', '': ''}
political_aspects = political_aspects_dict[row[5].value]
card = row[1].value if row[1].value else None
last_attendance = row[7].value
# if row[6].value:
# dang_data = base_date + timedelta(days=row[6].value - 2) if row[6].value > 0 else base_date
# else:
# dang_data = None
# political_aspects_dict = {'中共党员': 'cpc_dang', '民盟': 'nld', '共青团员': 'league_member', '群众': 'people', '': ''}
# political_aspects = political_aspects_dict[row[5].value]
# card = row[1].value if row[1].value else None
# last_attendance = row[7].value
# if row[2].value:
# date1 = pd.to_datetime(row[2].value, unit='d', origin='1899-12-30')
# else:
yuthon_salary/models/inherit_hr_payslip.py
+1 -1
View File
@@ -9,7 +9,7 @@ class InheritHrPayslip(models.Model):
identification_id = fields.Char(string='证件号码', related='employee_id.identification_id', store=True)
card_type = fields.Char(string='证件类型', store=True, default="居民身份证")
yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储')],
related='employee_id.yuthon_company', string="所属公司")
related='employee_id.yuthon_company', string="所属公司", store=True)
salary_group_id = fields.Many2one(related='employee_id.salary_group_id', string="工资组", store=True, index=True)
performance_bonuses = fields.Float(string='预发绩效奖金', compute='_compute_salary', store=True)
full_attendance_award = fields.Float(string='全勤奖', compute='_compute_salary', store=True)