!3674 1

Merge pull request !3674 from 李鹏宇/dev

yuthon_salary/models/inherit_hr_payslip.py

@@ -129,6 +129,11 @@ class InheritHrPayslip(models.Model):
     retroactive_insurance = fields.Float(string='补扣保险')
     distribution_part = fields.Float(string='扣除环境作业津贴多发放部分')
 
+    # 三家公司
+    add_year_float = fields.Float(string='补年金差额')
+    minus_year_float = fields.Float(string='扣年金差额')
+
+
     performance_deduction = fields.Float(string='扣发绩效奖金', compute='_compute_deduction', store=True)
     commuting_deduction = fields.Float(string='扣发通信补贴', compute='_compute_deduction', store=True)
     base_salary_deduction = fields.Float(string='扣发基本工资', compute='_compute_deduction', store=True)
@@ -353,10 +358,16 @@ class InheritHrPayslip(models.Model):
                 record.duty +
                 record.monthly_overtime +
                 record.annuity +
+
+                record.add_year_float +
+
                 # 新增的物管临时项
                 record.excellent_employees +
                 record.leave_absence -
                 # 扣除项
+
+                record.minus_year_float -
+
                 record.performance_deduction -
                 record.commuting_deduction -
                 record.base_salary_deduction -

yuthon_salary/views/inherit_hr_payslip_views.xml

@@ -287,6 +287,10 @@
                 <field name="year_compute" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
                 <field name="year_jie" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
                 <field name="leave_absence" decoration-danger="1" optional="show" groups="yuthon_salary.group_wg_user"/>
+
+                <field name="add_year_float" decoration-danger="1" optional="show"/>
+                <field name="minus_year_float" decoration-danger="1" optional="show"/>
+
                 <field name="performance_up" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
                 <field name="jing_te" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
                 <field name="year_gong" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>