diff --git a/yuthon_hr_attendance/views/inherit_hr_employee.xml b/yuthon_hr_attendance/views/inherit_hr_employee.xml
index 6b10b84e8..eb134807d 100644
--- a/yuthon_hr_attendance/views/inherit_hr_employee.xml
+++ b/yuthon_hr_attendance/views/inherit_hr_employee.xml
@@ -5,7 +5,7 @@
hr.employee
-
+
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index f504739e5..85fe3f267 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -43,9 +43,6 @@ class YuthonHrEmployee(models.Model):
# 个人信息
user_salary = fields.Float(string="基本工资")
job_lv_salary = fields.Float(string="职级工资")
- salary_group_id = fields.Many2one('yuthon.salary.group', string="工资单分组", store=True, index=True)
- social_base_on = fields.Float(string="1-6月社保薪资基数")
- social_base_off = fields.Float(string="7-12月社保薪资基数")
user_sex = fields.Selection([('girl', '女'), ('boy', '男')], string="性别")
user_state = fields.Selection([('in', '在职'), ('leave', '离职'), ('withdraw', '退休'), ('borrow', '借调'),
('expatriate', '外派'), ('adjunct', '在职(兼职)')],
@@ -84,8 +81,6 @@ class YuthonHrEmployee(models.Model):
interrupt_work_month = fields.Integer(string="中断工作月数")
compute_char = fields.Char(string="工龄", compute='_compute_social_insurance_info')
compute_month = fields.Integer(string="工龄(月)")
- last_year_salary = fields.Float(string="年金基数")
- is_salary = fields.Boolean(string="是否薪资计算", default=True)
social_insurance_date = fields.Date(string="缴纳社保日期")
social_insurance_time = fields.Char(string="社保时长", compute='_compute_social_insurance_info', store=True)
@@ -159,6 +154,15 @@ class YuthonHrEmployee(models.Model):
pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True)
pinyin_min = fields.Char(string='拼音缩写', compute='_compute_pinyin', index=True, store=True)
+ # 工资计算分组
+ salary_group_id = fields.Many2one('yuthon.salary.group', string="工资单分组", store=True, index=True)
+ last_year_salary = fields.Float(string="年金基数")
+ social_base_on = fields.Float(string="1-6月社保薪资基数")
+ social_base_off = fields.Float(string="7-12月社保薪资基数")
+ is_salary = fields.Boolean(string="是否薪资计算", default=True)
+ last_month_attendance_deduction = fields.Float(string="上月考勤扣款")
+ last_month_base_salary_deduction = fields.Float(string="上月基本薪资扣款")
+ last_month_performance_deduction = fields.Float(string="上月绩效扣款")
@api.onchange('job_id')
def _onchange_job_id(self):
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index f5a5d602d..f4d5d8628 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -21,11 +21,6 @@
-
-
-
-
-
@@ -139,6 +134,16 @@
+
+
+
+
+
+
+
+
+
+