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

!8286 !8285 添加功能

Browse Source 
Merge pull request !8286 from dev
This commit is contained in:
李鹏宇
2026-01-24 09:25:17 +00:00
committed by Gitee
parent e4c274a78b 8392d82bce
commit 9dc5558178
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/models/yuthon_salary_active.py
+6
View File
@@ -55,6 +55,7 @@ class YuthonSalaryActive(models.Model):
basic_endowment_insurance = fields.Float(string='基本养老保险费')
basic_medical_insurance = fields.Float(string='基本医疗保险费')
unemployment_insurance = fields.Float(string='失业保险费')
insurance = fields.Float(string='保险', compute='_compute_insurance')
housing_fund = fields.Float(string='住房公积金')
enterprise_annuity = fields.Float(string='企业(职业)年金')
personal_payment_total_including_annuity = fields.Float(string='个人缴纳合计（含年金）')
@@ -78,6 +79,11 @@ class YuthonSalaryActive(models.Model):
reimbursed_medical_exam_fee = fields.Float(string='已报销体检费')
remaining_medical_exam_fee = fields.Float(string='剩余体检费')
@api.depends("basic_endowment_insurance", "basic_medical_insurance", "unemployment_insurance",)
def _compute_insurance(self):
for rec in self:
rec.insurance = rec.basic_endowment_insurance + rec.basic_medical_insurance + rec.unemployment_insurance
def salary_confirm(self):
self.write({'confirm_status': 'confirm'})
yuthon_salary/views/yuthon_salary_active_views.xml
+10 -32
View File
@@ -61,7 +61,7 @@
<!-- 最终结算类字段 -->
<field name="trade_union_dues" string="工会会费"/>
<field name="actual_paid_salary" string="实发工资"/>
<field name="actual_paid_salary" string="实发工资" decoration-danger="1" decoration-bf="1"/>
<field name="meal_allowance" string="误餐费"/>
<field name="reimbursed_medical_exam_fee" string="已报销体检费"/>
<field name="remaining_medical_exam_fee" string="剩余体检费"/>
@@ -89,37 +89,15 @@
<tree string="我的薪资" create="false" delete="false" edit="false">
<button name="salary_confirm" string="确认" type="object" class="oe_highlight"/>
<button name="open_archive_record" string="详情" type="object" class="oe_highlight"/>
<field name="basic_salary" string="基本工资"/>
<field name="rank_salary" string="职级工资"/>
<field name="pre_performance_bonus" string="预发绩效奖金"/>
<field name="meal_allowance" string="误餐费"/>
<field name="post_salary" string="岗位工资"/>
<field name="post_salary" string="岗位工资"/>
<field name="communication_subsidy" string="通讯补贴"/>
<field name="seniority_wage" string="工龄工资"/>
<field name="overtime_pay" string="加班费"/>
<field name="full_attendance_bonus" string="全勤奖"/>
<field name="basic_year_end_bonus" string="基础年终奖"/>
<field name="liquidation_salary_leader" string="2024年清算工资（领导）"/>
<field name="balance_salary" string="2025年结余工资"/>
<field name="liquidation_salary_staff" string="2024年清算工资（职工）"/>
<field name="business_special_bonus" string="2025经营特别奖"/>
<!-- 扣发类字段 -->
<field name="deduct_performance_bonus" string="扣发绩效奖金"/>
<field name="deduct_communication_subsidy" string="扣发通讯补贴"/>
<field name="attendance_deduction" string="考勤扣发"/>
<field name="confirm_status"/>
<field name="personal_payment_total_including_annuity" string="个人缴纳合计（含年金）"/>
<field name="tax_adjustment" string="应补（退）税额"/>
<!-- 最终结算类字段 -->
<field name="trade_union_dues" string="工会会费"/>
<field name="actual_paid_salary" string="实发工资"/>
<field name="meal_allowance" string="误餐费"/>
<field name="reimbursed_medical_exam_fee" string="已报销体检费"/>
<field name="remaining_medical_exam_fee" string="剩余体检费"/>
<field name="select_year"/>
<field name="select_time"/>
<field name="actual_paid_salary" string="实发工资" decoration-danger="1" decoration-bf="1"/>
<field name="total_pre_tax_salary" string="工资合计"/>
<field name="insurance"/>
<field name="housing_fund" string="公积金"/>
<field name="enterprise_annuity" string="年金"/>
<field name="trade_union_dues" string="工会费"/>
<field name="meal_allowance"/>
</tree>
</field>
</record>