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

!600 zhou

Browse Source 
Merge pull request !600 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2024-11-28 07:26:14 +00:00
committed by Gitee
parent 2095ab6a67 171f00ffd4
commit 22e13e75ae
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+1
View File
@@ -22,6 +22,7 @@
<field name="yuthon_company"/>
<field name="create_time"/>
<field name="end_time"/>
<field name="is_enable"/>
</xpath>
</field>
</record>
yuthon_salary/wizard/yuthon_salary_wizard.py
+6 -4
View File
@@ -74,7 +74,7 @@ class YuthonSalaryWizard(models.Model):
'yuthon_company': yuthon_company,})
yuthon_company = yuthon_company_dict.get(row[10].value)
yuthon_company2 = yuthon_company_dict2.get(row[10].value)
for salary, r in salary_dates,row[3,9]:
for salary, r in zip(salary_dates, row[3:10]):
name_pinyin = pinyin(salary.value, style=Style.FIRST_LETTER)
abbreviation = "".join([p[0][0] for p in name_pinyin]).upper()
salary_date = {
@@ -84,7 +84,7 @@ class YuthonSalaryWizard(models.Model):
'struct_id': structure_id.id,
'yuthon_company': yuthon_company,
'amount_select' : 'fix',
'amount_fix': r
'amount_fix': r.value,
}
salary_name.create(salary_date)
@@ -110,7 +110,7 @@ class YuthonSalaryWizard(models.Model):
'yuthon_company': yuthon_company,})
yuthon_company = yuthon_company_dict.get(row[11].value)
yuthon_company2 = yuthon_company_dict2.get(row[11].value)
for salary in salary_dates:
for salary, r in zip(salary_dates, row[3:11]):
name_pinyin = pinyin(salary.value, style=Style.FIRST_LETTER)
abbreviation = "".join([p[0][0] for p in name_pinyin]).upper()
salary_date = {
@@ -120,6 +120,7 @@ class YuthonSalaryWizard(models.Model):
'struct_id': structure_id.id,
'yuthon_company': yuthon_company,
'amount_select': 'fix',
'amount_fix': r.value,
}
salary_name.create(salary_date)
@@ -145,7 +146,7 @@ class YuthonSalaryWizard(models.Model):
'yuthon_company': yuthon_company, })
yuthon_company = yuthon_company_dict.get(row[16].value)
yuthon_company2 = yuthon_company_dict2.get(row[16].value)
for salary in salary_dates:
for salary, r in zip(salary_dates, row[3:15]):
name_pinyin = pinyin(salary.value, style=Style.FIRST_LETTER)
abbreviation = "".join([p[0][0] for p in name_pinyin]).upper()
salary_date = {
@@ -155,5 +156,6 @@ class YuthonSalaryWizard(models.Model):
'struct_id': structure_id.id,
'yuthon_company': yuthon_company,
'amount_select': 'fix',
'amount_fix': r.value,
}
salary_name.create(salary_date)