!2035 添加功能

Merge pull request !2035 from 李鹏宇/dev_zhou

yuthon_salary/models/inherit_hr_payslip.py

@@ -43,13 +43,15 @@ class InheritHrPayslip(models.Model):
     work_injury_insurance = fields.Float(string='工伤保险费', compute='_compute_salary', store=True)
     housing_provident_fund = fields.Float(string='住房公积金', compute='_compute_salary', store=True)
     total_before_tax = fields.Float(string='税前合计', compute='_compute_total_before_tax', store=True)
-    year_compute = fields.Float(string='年度清算', compute='_compute_salary', store=True)
-    year_jie = fields.Float(string='年度结余', compute='_compute_salary', store=True)
-    year_gong = fields.Float(string='年功奖', compute='_compute_salary', store=True)
-    study_on = fields.Float(string='学习进步奖', compute='_compute_salary', store=True)
-    jing_te = fields.Float(string='经营特别奖', compute='_compute_salary', store=True)
+    year_compute = fields.Float(string='年度清算')
+    year_jie = fields.Float(string='年度结余')
+    year_gong = fields.Float(string='年功奖')
+    study_on = fields.Float(string='学习进步奖')
+    jing_te = fields.Float(string='经营特别奖')
+    temporary_performance_bonus = fields.Float(string='临时绩效奖')
     attendance_deduction_total = fields.Float(string='考勤扣款合计')
     assessment_reserved_amount = fields.Float(string='考核保留量')
+    reimburse_performance_bonus = fields.Float(string='上个月多扣绩效补回')
     is_push = fields.Boolean(string='推送')
     is_salary_push = fields.Boolean(string='工资推送')
 
@@ -112,16 +114,6 @@ class InheritHrPayslip(models.Model):
                         rec.work_injury_insurance = line.total
                     if line.name == '住房公积金':
                         rec.housing_provident_fund = line.total
-                    if line.name == '年度清算':
-                        rec.year_compute = line.total
-                    if line.name == '年度结余':
-                        rec.year_jie = line.total
-                    if line.name == '年功奖':
-                        rec.year_gong = line.total
-                    if line.name == '学习进步奖':
-                        rec.study_on = line.total
-                    if line.name == '经营特别奖':
-                        rec.jing_te = line.total
 
 
     def put_payslip(self):

yuthon_salary/views/inherit_hr_payslip_views.xml

@@ -49,6 +49,7 @@
                 <field name="year_gong"/>
                 <field name="study_on"/>
                 <field name="jing_te"/>
+                <field name="reimburse_performance_bonus"/>
                 <field name="is_salary_push" column_invisible="1"/>
             </xpath>
             <xpath expr="//field[@name='state']" position="after">