diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index 0bda1a3b4..bb97720e7 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -22,6 +22,7 @@
+
diff --git a/yuthon_salary/wizard/yuthon_salary_wizard.py b/yuthon_salary/wizard/yuthon_salary_wizard.py
index d8ee1a0c7..31403fea0 100644
--- a/yuthon_salary/wizard/yuthon_salary_wizard.py
+++ b/yuthon_salary/wizard/yuthon_salary_wizard.py
@@ -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)
\ No newline at end of file