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

添加功能

Browse Source
This commit is contained in:
zhou
2025-03-26 17:05:40 +08:00
parent e60691d25f
commit 5da964187c
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/views/inherit_hr_employee.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='parent_id']" position="after">
<xpath expr="//field[@name='is_salary']" position="after">
<field name="last_attendance" readonly="0"/>
</xpath>
</field>
yuthon_hr_employee/models/yuthon_hr_employee.py
+9 -5
View File
@@ -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):
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+10 -5
View File
@@ -21,11 +21,6 @@
<xpath expr="//field[@name='work_email']" position="after">
<field name="user_state"/>
<field name="yuthon_company"/>
<field name="salary_group_id"/>
<field name="last_year_salary"/>
<field name="social_base_on"/>
<field name="social_base_off"/>
<field name="is_salary"/>
</xpath>
<xpath expr="//page[@name='personal_information']" position="replace">
<page name="personal_information" string="个人隐私信息">
@@ -139,6 +134,16 @@
</group>
</xpath>
<xpath expr="//page[@name='public']//group[@name='departure']" position="after">
<group string="工资计算分组">
<field name="salary_group_id"/>
<field name="last_year_salary"/>
<field name="social_base_on"/>
<field name="social_base_off"/>
<field name="last_month_attendance_deduction"/>
<field name="last_month_base_salary_deduction"/>
<field name="last_month_performance_deduction"/>
<field name="is_salary"/>
</group>
<group name="overtime" string="加班" col="2">
<group>
<field name="normal_overtime_hours" readonly="1"/>