!2149 1

Merge pull request !2149 from 李鹏宇/dev

yuthon_salary/models/inherit_hr_payslip.py

@@ -186,7 +186,7 @@ class InheritHrPayslip(models.Model):
             for line in record.line_ids:
                 if line.name in name_list:
                     total += line.total
-            record.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary + record.year_compute + record.year_jie + record.year_gong + record.jing_te
+            record.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary + record.year_compute + record.year_jie + record.year_gong + record.jing_te + record.high_temperature_allowance
 
     def put_button(self):
         for record in self:

yuthon_salary/models/yuthon_payroll_project.py

@@ -189,7 +189,7 @@ class YuthonPayrollInsurances (models.Model):
                     formula_salary = "result = employee.work_injury_insurance_base * " + str(number)
                 if ins.name == '住房公积金':
                     code = 'ZFGJJ'
-                    formula_salary = "result = round((employee.housing_fund_base * " + str(number) + "), 2)"
+                    formula_salary = "result = round((employee.housing_fund_base * 0.12), 2)"
                 if ins.name == '工会会费':
                     code = 'GHHF'
                     formula_salary = "result = round((payslip.base_salary * 0.005), 2)"