!1808 添加功能

Merge pull request !1808 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-03-14 13:46:39 +00:00
committed by Gitee
7 changed files with 163 additions and 6 deletions
@@ -97,3 +97,33 @@ class YuthonMostRecentWorkDetailLine(models.Model):
work_grades = fields.Char(string='工作内容成绩')
last_training = fields.Char(string='培训')
last_work_reason = fields.Char(string='离职原因')
class ChildCareLine(models.Model):
_name = 'child.care.line'
_description = "婴幼儿照护"
employee_id = fields.Many2one('hr.employee', string="关联员工")
name = fields.Char(string="姓名")
date = fields.Date(string="出生日期")
deduction = fields.Float(string="本人扣除比例")
class ChildEducationLine(models.Model):
_name = 'child.education.line'
_description = "子女教育"
employee_id = fields.Many2one('hr.employee', string="关联员工")
name = fields.Char(string="姓名")
start_date = fields.Date(string="教育开始日期")
end_date = fields.Date(string="教育结束日期")
deduction = fields.Float(string="本人扣除比例")
class ElderlySupportLine(models.Model):
_name = 'elderly.support.line'
_description = "赡养老人"
employee_id = fields.Many2one('hr.employee', string="关联员工")
name = fields.Char(string="姓名")
date = fields.Date(string="出生日期")
deduction = fields.Float(string="本人扣除比例")
@@ -128,6 +128,25 @@ class YuthonHrEmployee(models.Model):
education_experience_ids = fields.One2many('yuthon.education.experience.line', 'employee_id', string="教育经历明细行")
# 技能证书管理
skills_certificates_ids = fields.One2many('yuthon.skills.certificates.line', 'employee_id', string="教育经历明细行")
# 专项扣除
care_line_ids = fields.One2many('child.care.line', 'employee_id', string="婴幼儿照护明细行")
education_line_ids = fields.One2many('child.education.line', 'employee_id', string="子女教育明细行")
support_line_ids = fields.One2many('elderly.support.line', 'employee_id', string="赡养老人明细行")
hospital_name = fields.Char(string="姓名")
hospital_related = fields.Char(string="与纳税人关系")
original_amount = fields.Float(string='个人负担金额')
education_name = fields.Char(string="姓名")
education_end_date = fields.Date(string="结束时间")
education_deduction = fields.Float(string='扣除金额')
loan_name = fields.Char(string="姓名")
loan_end_date = fields.Date(string="结束时间")
loan_deduction = fields.Float(string='扣除金额')
rent_name = fields.Char(string="姓名")
rent_end_date = fields.Date(string="结束时间")
rent_deduction = fields.Float(string='扣除金额')
pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True)
pinyin_min = fields.Char(string='拼音缩写', compute='_compute_pinyin', index=True, store=True)
@@ -19,4 +19,7 @@ access_yuthon_party_setting,yuthon_party_setting,model_yuthon_party_setting,base
access_yuthon_medical_rule,yuthon_medical_rule,model_yuthon_medical_rule,base.group_user,1,1,1,1
access_yuthon_medical_manage,yuthon_medical_manage,model_yuthon_medical_manage,base.group_user,1,1,1,1
access_yuthon_medical_line,yuthon_medical_line,model_yuthon_medical_line,base.group_user,1,1,1,1
access_yuthon_salary_group,yuthon_salary_group,model_yuthon_salary_group,base.group_user,1,1,1,1
access_yuthon_salary_group,yuthon_salary_group,model_yuthon_salary_group,base.group_user,1,1,1,1
access_child_care_line,child_care_line,model_child_care_line,base.group_user,1,1,1,1
access_child_education_line,child_education_line,model_child_education_line,base.group_user,1,1,1,1
access_elderly_support_line,elderly_support_line,model_elderly_support_line,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
19 access_yuthon_medical_rule yuthon_medical_rule model_yuthon_medical_rule base.group_user 1 1 1 1
20 access_yuthon_medical_manage yuthon_medical_manage model_yuthon_medical_manage base.group_user 1 1 1 1
21 access_yuthon_medical_line yuthon_medical_line model_yuthon_medical_line base.group_user 1 1 1 1
22 access_yuthon_salary_group yuthon_salary_group model_yuthon_salary_group base.group_user 1 1 1 1
23 access_child_care_line child_care_line model_child_care_line base.group_user 1 1 1 1
24 access_child_education_line child_education_line model_child_education_line base.group_user 1 1 1 1
25 access_elderly_support_line elderly_support_line model_elderly_support_line base.group_user 1 1 1 1
@@ -6,7 +6,7 @@
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<!-- 源码的信息暂时隐藏 -->
<xpath expr="//form" position="attributes">
<xpath expr="//form" position="attributes">
<attribute name="create">0</attribute>
</xpath>
<xpath expr="//field[@name='parent_id']" position="attributes">
@@ -90,7 +90,8 @@
</group>
<group string="家庭状态">
<field name="marital"/>
<field name="marriage_documents_id" invisible="marital != 'married'" widget="preview_many2one"/>
<field name="marriage_documents_id" invisible="marital != 'married'"
widget="preview_many2one"/>
<field name="spouse_complete_name" invisible="marital not in ['married', 'cohabitant']"/>
<field name="spouse_birthdate" invisible="marital not in ['married', 'cohabitant']"/>
</group>
@@ -177,7 +178,7 @@
</tree>
</field>
</page>
<page name="技能证书管理">
<page name="技能证书管理">
<field name="skills_certificates_ids">
<tree editable="bottom">
<field name="rank_name"/>
@@ -201,6 +202,83 @@
</tree>
</field>
</page>
<page string="专项扣除" name="deduction">
<group string="3岁以下婴幼儿照护">
<field name="care_line_ids" string=" ">
<tree editable="bottom">
<field name="employee_id" column_invisible="1"/>
<field name="name"/>
<field name="date"/>
<field name="deduction"/>
</tree>
</field>
</group>
<group string="子女教育">
<field name="education_line_ids" string=" ">
<tree editable="bottom">
<field name="employee_id" column_invisible="1"/>
<field name="name"/>
<field name="start_date"/>
<field name="start_date"/>
<field name="deduction"/>
</tree>
</field>
</group>
<group string="赡养老人">
<field name="support_line_ids" string=" ">
<tree editable="bottom">
<field name="employee_id" column_invisible="1"/>
<field name="name"/>
<field name="date"/>
<field name="deduction"/>
</tree>
</field>
</group>
<group col="3" string="大病医疗">
<group>
<field name="hospital_name"/>
</group>
<group>
<field name="hospital_related"/>
</group>
<group>
<field name="original_amount"/>
</group>
</group>
<group col="3" string="维续教育">
<group>
<field name="education_name"/>
</group>
<group>
<field name="education_end_date"/>
</group>
<group>
<field name="education_deduction"/>
</group>
</group>
<group col="3" string="住房贷款">
<group>
<field name="loan_name"/>
</group>
<group>
<field name="loan_end_date"/>
</group>
<group>
<field name="loan_deduction"/>
</group>
</group>
<group col="3" string="住房租金">
<group>
<field name="rent_name"/>
</group>
<group>
<field name="rent_end_date"/>
</group>
<group>
<field name="rent_deduction"/>
</group>
</group>
</page>
</xpath>
</field>
</record>
@@ -239,7 +317,7 @@
<field name="retire_date" optional="hide"/>
<field name="birthday_month" optional="hide"/>
<field name="user_type" optional="hide"/>
<!-- <field name="retire_years" optional="hide"/>-->
<!-- <field name="retire_years" optional="hide"/>-->
<field name="political_aspects" optional="hide"/>
<field name="dang_data" optional="hide"/>
<!-- <field name="new_start_contract_data" optional="hide"/>-->
@@ -10,6 +10,14 @@ class InheritHrPayslip(models.Model):
commuting_allowance = fields.Float(string='通信补贴', compute='_compute_salary', store=True)
rank_salary = fields.Float(string='职级工资', compute='_compute_salary', store=True)
account_id = fields.Many2one('yuthon.account.group', string='工资表分组')
housing_loan_interest = fields.Float(string='累计住房贷款利息')
housing_rent = fields.Float(string='累计住房租金')
child_education = fields.Float(string='累计子女教育')
continuing_education = fields.Float(string='累计继续教育')
elderly_support = fields.Float(string='累计赡养老人')
infant_care = fields.Float(string='累计3岁以下婴幼儿照护')
occupational_annuity = fields.Float(string='企业(职业)年金')
@api.depends('line_ids')
def _compute_salary(self):
@@ -48,6 +48,25 @@
<xpath expr="//field[@name='paid_date']" position="attributes">
<attribute name="invisible">1</attribute>
</xpath>
<xpath expr="//page[@name='account_info']" position="after">
<page name="累计专项">
<group col="3">
<group>
<field name="housing_loan_interest"/>
<field name="housing_rent"/>
<field name="child_education"/>
</group>
<group>
<field name="continuing_education"/>
<field name="elderly_support"/>
<field name="infant_care"/>
</group>
<group>
<field name="occupational_annuity"/>
</group>
</group>
</page>
</xpath>
</field>
</record>
<record id="hr_payslip_view_form_inherit" model="ir.ui.view">
@@ -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="//page[@name='hr_settings']" position="after">
<xpath expr="//page[@name='deduction']" position="after">
<page string="固定资产">
<field name="office_supplies_ids">
<tree editable="bottom">