From e92e5e41a9d013ae9d24c6dd5bd69bba5d865272 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 28 Nov 2024 15:24:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_salary/wizard/yuthon_salary_wizard.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
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
From 171f00ffd411a652d514c9c110adcdc5fb017b04 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 28 Nov 2024 15:25:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_salary/views/inherit_hr_payroll_structure_views.xml | 1 +
1 file changed, 1 insertion(+)
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 @@
+